Fix slugger animation

Author: evanbones

common/src/main/java/org/infernalstudios/enemyexp/client/entity/model/SluggerModel.java

@@ -3,6 +3,7 @@
 import net.minecraft.resources.ResourceLocation;
 import org.infernalstudios.enemyexp.EEMod;
 import org.infernalstudios.enemyexp.content.entity.SluggerEntity;
+import software.bernie.geckolib.core.animation.AnimationState;
 import software.bernie.geckolib.model.DefaultedEntityGeoModel;
 
 public class SluggerModel extends DefaultedEntityGeoModel<SluggerEntity> {
@@ -14,4 +15,11 @@ public SluggerModel() {
     public ResourceLocation getTextureResource(SluggerEntity animatable) {
         return EEMod.location("textures/entity/" + animatable.getTexture() + ".png");
     }
-}
+
+    @Override
+    public void setCustomAnimations(SluggerEntity animatable, long instanceId, AnimationState<SluggerEntity> animationState) {
+        if (!animatable.isCharging()) {
+            super.setCustomAnimations(animatable, instanceId, animationState);
+        }
+    }
+}

common/src/main/java/org/infernalstudios/enemyexp/content/entity/SluggerEntity.java

@@ -3,7 +3,9 @@
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.network.syncher.SynchedEntityData;
-import net.minecraft.world.entity.*;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.entity.ai.goal.*;
@@ -16,7 +18,6 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.damagesource.DamageSource;
 import org.infernalstudios.enemyexp.core.mixin.RandomLookAroundGoalAccessor;
 import org.infernalstudios.enemyexp.core.util.AnimUtils;
 import org.jetbrains.annotations.NotNull;
@@ -33,26 +34,32 @@
 import java.util.List;
 
 public class SluggerEntity extends Zombie implements GeoEntity {
-    private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
     private static final EntityDataAccessor<Integer> CHARGE_TIME = SynchedEntityData.defineId(SluggerEntity.class, EntityDataSerializers.INT);
     private static final EntityDataAccessor<Float> CHARGE_DIR_X = SynchedEntityData.defineId(SluggerEntity.class, EntityDataSerializers.FLOAT);
     private static final EntityDataAccessor<Float> CHARGE_DIR_Z = SynchedEntityData.defineId(SluggerEntity.class, EntityDataSerializers.FLOAT);
     private static final EntityDataAccessor<String> TEXTURE = SynchedEntityData.defineId(SluggerEntity.class, EntityDataSerializers.STRING);
-
     private static final String NORMAL_TEXTURE = "slugger";
     private static final String STAGGERED_CHARGE = "slugger_charge";
     private static final String DASHING_TEXTURE = "slugger_dashing";
-
     private static final int CHARGE_DURATION = 17;
     private static final int CHARGE_WINDUP = 10;
     private static final float CHARGE_SPEED = 0.7F;
     private static final float CHARGE_DAMAGE = 6.0F;
     private static final float CHARGE_KNOCKBACK = 1.5F;
+    private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
 
     public SluggerEntity(EntityType<? extends Zombie> entityType, Level level) {
         super(entityType, level);
     }
 
+    public static AttributeSupplier.@NotNull Builder createAttributes() {
+        return Zombie.createAttributes()
+                .add(Attributes.MOVEMENT_SPEED, 0.2D).add(Attributes.FOLLOW_RANGE, 32.0D)
+                .add(Attributes.ATTACK_DAMAGE, 4.0D).add(Attributes.MAX_HEALTH, 8.0D)
+                .add(Attributes.ARMOR, 16.0D).add(Attributes.KNOCKBACK_RESISTANCE, 3.0D)
+                .add(Attributes.ATTACK_KNOCKBACK, 0.3D);
+    }
+
     @Override
     protected void registerGoals() {
         this.goalSelector.addGoal(1, new SluggerChargeGoal(this));
@@ -68,14 +75,6 @@ protected void registerGoals() {
         this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
     }
 
-    public static AttributeSupplier.@NotNull Builder createAttributes() {
-        return Zombie.createAttributes()
-                .add(Attributes.MOVEMENT_SPEED, 0.2D).add(Attributes.FOLLOW_RANGE, 32.0D)
-                .add(Attributes.ATTACK_DAMAGE, 4.0D).add(Attributes.MAX_HEALTH, 8.0D)
-                .add(Attributes.ARMOR, 16.0D).add(Attributes.KNOCKBACK_RESISTANCE, 3.0D)
-                .add(Attributes.ATTACK_KNOCKBACK, 0.3D);
-    }
-
     @Override
     protected void defineSynchedData() {
         super.defineSynchedData();
@@ -89,6 +88,7 @@ private void lockRotationDuringCharge() {
         this.setYRot(this.yRotO);
         this.yHeadRot = this.yRotO;
         this.yBodyRot = this.yRotO;
+        this.setXRot(this.xRotO);
     }
 
     @Override
@@ -152,12 +152,12 @@ public void setTexture(String texture) {
     }
 
     @Override
-    public void setBaby(boolean childZombie) {
+    public boolean isBaby() {
+        return false;
     }
 
     @Override
-    public boolean isBaby() {
-        return false;
+    public void setBaby(boolean childZombie) {
     }
 
     @Override