diff --git a/build.gradle b/build.gradle index 40ce2b4..5713d98 100644 --- a/build.gradle +++ b/build.gradle @@ -74,6 +74,7 @@ allprojects { } java { + toolchain.languageVersion = JavaLanguageVersion.of(java_version) withSourcesJar() } diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/ModelMixin_playerAnim.java b/common/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/ModelMixin_playerAnim.java index 397c858..4fbed65 100644 --- a/common/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/ModelMixin_playerAnim.java +++ b/common/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/ModelMixin_playerAnim.java @@ -25,7 +25,7 @@ public abstract class ModelMixin_playerAnim { PlayerAnimManager manager = this instanceof IMutableModel mutable ? mutable.bc$getAnimation() : null; palActive.set(manager != null && manager.isActive()); - if (palActive.get()) model.parts.forEach(modelPart -> ((SodiumHelper)modelPart).bc$useSodiumRendering(true)); + if (palActive.get()) model.parts.forEach(modelPart -> ((SodiumHelper)modelPart).bc$useSodiumRendering(false)); } } diff --git a/common/src/main/resources/bendable_cuboids.accesswidener b/common/src/main/resources/bendable_cuboids.accesswidener index 9175be9..20dead6 100644 --- a/common/src/main/resources/bendable_cuboids.accesswidener +++ b/common/src/main/resources/bendable_cuboids.accesswidener @@ -9,5 +9,5 @@ accessible field net/minecraft/client/model/geom/builders/CubeDeformation growY accessible field net/minecraft/client/model/geom/builders/CubeDeformation growZ F accessible field net/minecraft/client/model/geom/builders/MaterialDefinition xTexSize I accessible field net/minecraft/client/model/geom/builders/MaterialDefinition yTexSize I -accessible field net/minecraft/client/model/geom/builders/CubeDefinition dimensions Lorg/joml/Vector3fc; -accessible field net/minecraft/client/model/PlayerModel parts Ljava/util/List; \ No newline at end of file +accessible field net/minecraft/client/model/geom/builders/CubeDefinition dimensions Lorg/joml/Vector3f; +accessible field net/minecraft/client/model/PlayerModel parts Ljava/util/List; diff --git a/forge/build.gradle b/forge/build.gradle index 2159991..834dde9 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -21,6 +21,7 @@ configurations { dependencies { neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}" modImplementation "com.zigythebird.playeranim:PlayerAnimationLibNeo:${rootProject.player_anim_version}" + forgeRuntimeLibrary "org.javassist:javassist:3.30.2-GA" common(project(path: ":common", configuration: "namedElements")) { transitive = false } } diff --git a/forge/src/main/java/com/zigythebird/bendable_cuboids/neoforge/BendableCuboidsModNeo.java b/forge/src/main/java/com/zigythebird/bendable_cuboids/neoforge/BendableCuboidsModNeo.java index 695fdfe..8564062 100644 --- a/forge/src/main/java/com/zigythebird/bendable_cuboids/neoforge/BendableCuboidsModNeo.java +++ b/forge/src/main/java/com/zigythebird/bendable_cuboids/neoforge/BendableCuboidsModNeo.java @@ -8,6 +8,6 @@ @Mod(value = "bendable_cuboids", dist = Dist.CLIENT) public class BendableCuboidsModNeo extends BendableCuboidsMod { public BendableCuboidsModNeo() { - if (FMLLoader.getCurrent().getLoadingModList().getModFileById("skinlayers3d") != null) setupSkinLayersTransformer(); + if (FMLLoader.getLoadingModList().getModFileById("skinlayers3d") != null) setupSkinLayersTransformer(); } } diff --git a/gradle.properties b/gradle.properties index 7fbbaee..4740412 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,4 @@ java_version = 21 # Dependencies fabric_loader_version = 0.16.9 neoforge_version = 21.1.89 -player_anim_version = 1.1.4+mc.1.21.1 +player_anim_version = 1.1.6+mc.1.21.1