Fix for mob animations going superspeed

Author: OpenBagTwo

src/client/java/io/github/openbagtwo/lighterend/mobs/models/CubozoaModel.java

@@ -72,9 +72,9 @@ public CubozoaModel(ModelPart modelPart) {
   @Override
   public void setAngles(CubozoaRenderState renderState) {
     super.setAngles(renderState);
-    float sin = MathHelper.sin(renderState.animationProgress * 0.13F);
+    float sin = MathHelper.sin(renderState.age * 0.13F);
     scaleY = sin * 0.1F + 0.9F;
-    scaleXZ = MathHelper.sin(renderState.animationProgress * 0.13F + 3.14F) * 0.1F + 0.9F;
+    scaleXZ = MathHelper.sin(renderState.age * 0.13F + 3.14F) * 0.1F + 0.9F;
 
     for (int i = 0; i < TENTACLE_COUNT; i++) {
       tentacle[i].pitch = sin * 0.15f;

src/client/java/io/github/openbagtwo/lighterend/mobs/models/DragonflyModel.java

@@ -1,6 +1,5 @@
 package io.github.openbagtwo.lighterend.mobs.models;
 
-import io.github.openbagtwo.lighterend.mobs.states.DragonflyRenderState;
 import net.minecraft.client.model.ModelData;
 import net.minecraft.client.model.ModelPart;
 import net.minecraft.client.model.ModelPartBuilder;
@@ -9,8 +8,9 @@
 import net.minecraft.client.model.TexturedModelData;
 import net.minecraft.client.render.entity.model.EntityModel;
 import net.minecraft.client.render.entity.model.EntityModelPartNames;
+import net.minecraft.client.render.entity.state.LivingEntityRenderState;
 
-public class DragonflyModel extends EntityModel<DragonflyRenderState> {
+public class DragonflyModel extends EntityModel<LivingEntityRenderState> {
 
   private final ModelPart model;
   private final ModelPart head;
@@ -106,16 +106,16 @@ public DragonflyModel(ModelPart modelPart) {
   }
 
   @Override
-  public void setAngles(DragonflyRenderState renderState) {
-    float progress = renderState.animationProgress * 2F;
+  public void setAngles(LivingEntityRenderState state) {
+    float progress = state.age * 2F;
 
     wing_1.roll = 0.3491F + (float) Math.sin(progress) * 0.3491F;
     wing_2.roll = -wing_1.roll;
 
     wing_3.roll = 0.3491F + (float) Math.cos(progress) * 0.3491F;
     wing_4.roll = -wing_3.roll;
 
-    progress = renderState.animationProgress * 0.05F;
+    progress = state.age * 0.05F;
 
     head.pitch = 0.3491F + (float) Math.sin(progress * 0.7F) * 0.1F;
     tail.pitch = (float) Math.cos(progress) * 0.05F - 0.05F;

src/client/java/io/github/openbagtwo/lighterend/mobs/models/EndFishModel.java

@@ -75,9 +75,9 @@ public EndFishModel(ModelPart modelPart) {
   }
 
   @Override
-  public void setAngles(EndFishRenderState renderState) {
-    float s1 = (float) Math.sin(renderState.animationProgress * 0.1);
-    float s2 = (float) Math.sin(renderState.animationProgress * 0.05);
+  public void setAngles(EndFishRenderState state) {
+    float s1 = (float) Math.sin(state.age * 0.1);
+    float s2 = (float) Math.sin(state.age * 0.05);
     flipper.yaw = s1 * 0.3F;
     fin_top.pitch = s2 * 0.02F - 0.6981F;
     fin_bottom.pitch = 0.6981F - s2 * 0.02F;

src/client/java/io/github/openbagtwo/lighterend/mobs/models/SilkMothModel.java

@@ -1,6 +1,5 @@
 package io.github.openbagtwo.lighterend.mobs.models;
 
-import io.github.openbagtwo.lighterend.mobs.states.SilkMothRenderState;
 import java.util.Set;
 import net.minecraft.client.model.ModelData;
 import net.minecraft.client.model.ModelPart;
@@ -12,9 +11,10 @@
 import net.minecraft.client.render.entity.model.EntityModel;
 import net.minecraft.client.render.entity.model.EntityModelPartNames;
 import net.minecraft.client.render.entity.model.ModelTransformer;
+import net.minecraft.client.render.entity.state.LivingEntityRenderState;
 import net.minecraft.util.math.MathHelper;
 
-public class SilkMothModel extends EntityModel<SilkMothRenderState> {
+public class SilkMothModel extends EntityModel<LivingEntityRenderState> {
 
   public static final ModelTransformer BABY_TRANSFORMER = new BabyModelTransformer(
       true,
@@ -157,14 +157,14 @@ public SilkMothModel(ModelPart modelPart) {
   }
 
   @Override
-  public void setAngles(SilkMothRenderState renderState) {
-    wingR_r1.roll = MathHelper.sin(renderState.animationProgress * 2F) * 0.4F + 0.3927F;
+  public void setAngles(LivingEntityRenderState state) {
+    wingR_r1.roll = MathHelper.sin(state.age * 2F) * 0.4F + 0.3927F;
     wingL_r1.roll = -wingR_r1.roll;
-    head_pivot.pitch = MathHelper.sin(renderState.animationProgress * 0.03F) * 0.1F;
-    tendril_r_r1.roll = MathHelper.sin(renderState.animationProgress * 0.07F) * 0.2F + 0.3927F;
+    head_pivot.pitch = MathHelper.sin(state.age * 0.03F) * 0.1F;
+    tendril_r_r1.roll = MathHelper.sin(state.age * 0.07F) * 0.2F + 0.3927F;
     tendril_r_r2.roll = -tendril_r_r1.roll;
-    abdomen_r1.pitch = MathHelper.sin(renderState.animationProgress * 0.05F) * 0.1F - 0.3927F;
-    legsR.roll = MathHelper.sin(renderState.animationProgress * 0.07F) * 0.1F - 0.6545F;
+    abdomen_r1.pitch = MathHelper.sin(state.age * 0.05F) * 0.1F - 0.3927F;
+    legsR.roll = MathHelper.sin(state.age * 0.07F) * 0.1F - 0.6545F;
     legsL.roll = -legsR.roll;
   }
 }

src/client/java/io/github/openbagtwo/lighterend/mobs/renderers/CubozoaRenderer.java

@@ -77,6 +77,5 @@ public Identifier getTexture(CubozoaRenderState state) {
   public void updateRenderState(Cubozoa fish, CubozoaRenderState state, float f) {
     super.updateRenderState(fish, state, f);
     state.variant = fish.getVariant();
-    state.animationProgress += f / 2;
   }
 }

src/client/java/io/github/openbagtwo/lighterend/mobs/renderers/DragonflyRenderer.java

@@ -4,15 +4,15 @@
 import io.github.openbagtwo.lighterend.mobs.Dragonfly;
 import io.github.openbagtwo.lighterend.mobs.EntityModels;
 import io.github.openbagtwo.lighterend.mobs.models.DragonflyModel;
-import io.github.openbagtwo.lighterend.mobs.states.DragonflyRenderState;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.entity.EntityRendererFactory;
 import net.minecraft.client.render.entity.MobEntityRenderer;
 import net.minecraft.client.render.entity.feature.EyesFeatureRenderer;
+import net.minecraft.client.render.entity.state.LivingEntityRenderState;
 import net.minecraft.util.Identifier;
 
 public class DragonflyRenderer extends
-    MobEntityRenderer<Dragonfly, DragonflyRenderState, DragonflyModel> {
+    MobEntityRenderer<Dragonfly, LivingEntityRenderState, DragonflyModel> {
 
   private static final Identifier TEXTURE = LighterEnd.of("textures/entity/dragonfly.png");
   private static final RenderLayer GLOW = RenderLayer.getEyes(
@@ -30,18 +30,12 @@ public RenderLayer getEyesTexture() {
   }
 
   @Override
-  public DragonflyRenderState createRenderState() {
-    return new DragonflyRenderState();
+  public LivingEntityRenderState createRenderState() {
+    return new LivingEntityRenderState();
   }
 
   @Override
-  public Identifier getTexture(DragonflyRenderState state) {
+  public Identifier getTexture(LivingEntityRenderState state) {
     return TEXTURE;
   }
-
-  @Override
-  public void updateRenderState(Dragonfly fly, DragonflyRenderState state, float f) {
-    super.updateRenderState(fly, state, f);
-    state.animationProgress += f / 2;
-  }
 }

src/client/java/io/github/openbagtwo/lighterend/mobs/renderers/EndFishRenderer.java

@@ -96,6 +96,5 @@ public Identifier getTexture(EndFishRenderState state) {
   public void updateRenderState(EndFish fish, EndFishRenderState state, float f) {
     super.updateRenderState(fish, state, f);
     state.variant = fish.getVariant();
-    state.animationProgress += f / 2;
   }
 }

src/client/java/io/github/openbagtwo/lighterend/mobs/renderers/SilkMothRenderer.java

@@ -4,13 +4,13 @@
 import io.github.openbagtwo.lighterend.mobs.EntityModels;
 import io.github.openbagtwo.lighterend.mobs.SilkMoth;
 import io.github.openbagtwo.lighterend.mobs.models.SilkMothModel;
-import io.github.openbagtwo.lighterend.mobs.states.SilkMothRenderState;
 import net.minecraft.client.render.entity.AgeableMobEntityRenderer;
 import net.minecraft.client.render.entity.EntityRendererFactory;
+import net.minecraft.client.render.entity.state.LivingEntityRenderState;
 import net.minecraft.util.Identifier;
 
 public class SilkMothRenderer extends
-    AgeableMobEntityRenderer<SilkMoth, SilkMothRenderState, SilkMothModel> {
+    AgeableMobEntityRenderer<SilkMoth, LivingEntityRenderState, SilkMothModel> {
 
   private static final Identifier TEXTURE = LighterEnd.of("textures/entity/silk_moth.png");
 
@@ -24,18 +24,12 @@ public SilkMothRenderer(EntityRendererFactory.Context ctx) {
   }
 
   @Override
-  public SilkMothRenderState createRenderState() {
-    return new SilkMothRenderState();
+  public LivingEntityRenderState createRenderState() {
+    return new LivingEntityRenderState();
   }
 
   @Override
-  public Identifier getTexture(SilkMothRenderState state) {
+  public Identifier getTexture(LivingEntityRenderState state) {
     return TEXTURE;
   }
-
-  @Override
-  public void updateRenderState(SilkMoth moth, SilkMothRenderState state, float f) {
-    super.updateRenderState(moth, state, f);
-    state.animationProgress += f / 2;
-  }
 }

src/client/java/io/github/openbagtwo/lighterend/mobs/states/CubozoaRenderState.java

@@ -5,5 +5,4 @@
 public class CubozoaRenderState extends LivingEntityRenderState {
 
   public int variant = 0;
-  public float animationProgress;
 }