support for notenoughanimations on forge

TeamGalena · Sep 4, 2023 · c379fea · c379fea
1 parent 53b3b8c
commit c379fea
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/common/src/main/java/galena/thigh_highs_etc/client/ThighHighsLayer.java b/common/src/main/java/galena/thigh_highs_etc/client/ThighHighsLayer.java
@@ -5,6 +5,7 @@
 import galena.thigh_highs_etc.THEConstants;
 import galena.thigh_highs_etc.index.THEItems;
 import net.minecraft.client.model.EntityModel;
+import net.minecraft.client.model.HumanoidModel;
 import net.minecraft.client.model.geom.ModelLayerLocation;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
@@ -56,7 +57,13 @@ public void render(PoseStack poseStack, MultiBufferSource multiBufferSource, int
 
             VertexConsumer vertexconsumer = ItemRenderer.getArmorFoilBuffer(multiBufferSource, RenderType.armorCutoutNoCull(texture), false, stack.hasFoil());
             model.prepareMobModel(entity, f, g, h);
-            model.setupAnim(entity, f, g, h, i, j);
+
+            if (getParentModel() instanceof HumanoidModel<?> parent) {
+                model.copyPropertiesFrom((HumanoidModel<T>) parent);
+            } else {
+                model.setupAnim(entity, f, g, h, i, j);
+            }
+
             model.renderToBuffer(poseStack, vertexconsumer, i, OverlayTexture.NO_OVERLAY, 1.0F, 1.0F, 1.0F, 1.0F);
         }
     }

diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -6,6 +6,7 @@ val jei_version: String by extra
 val etc_fabric_version: String by extra
 val authme_version: String by extra
 val cloth_config_version: String by extra
+val animations_fabric_version: String by extra
 
 fabric {
     enableMixins()
@@ -22,6 +23,7 @@ dependencies {
         modRuntimeOnly("mezz.jei:jei-${mc_version}-fabric:${jei_version}")
         modRuntimeOnly("maven.modrinth:auth-me:${authme_version}")
         modRuntimeOnly("maven.modrinth:cloth-config:${cloth_config_version}")
+        modRuntimeOnly("maven.modrinth:not-enough-animations:${animations_fabric_version}")
     }
 }
 

diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -4,6 +4,7 @@ val mc_version: String by extra
 val registrate_forge_version: String by extra
 val jei_version: String by extra
 val etc_forge_version: String by extra
+val animations_forge_version: String by extra
 
 forge {
     enableMixins()
@@ -17,6 +18,7 @@ dependencies {
 
     if (!env.isCI) {
         modRuntimeOnly("mezz.jei:jei-${mc_version}-forge:${jei_version}")
+        modRuntimeOnly("maven.modrinth:not-enough-animations:${animations_forge_version}")
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -28,6 +28,8 @@ etc_fabric_version=42Dm5geR
 jei_version=15.2.0.25
 authme_version=RiTU8rGC
 cloth_config_version=s7VTKfLA
+animations_fabric_version=6auoqhMp
+animations_forge_version=QWDLTMMa
 
 # Publishing
 repository=pssbletrngle/thighhighsetc