Simplify Guard rendering checks

Andromander · Apr 21, 2021 · d1ee3e5 · d1ee3e5
1 parent 800c7d0
commit d1ee3e5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/src/main/java/androsa/gaiadimension/entity/boss/MalachiteGuardEntity.java b/src/main/java/androsa/gaiadimension/entity/boss/MalachiteGuardEntity.java
@@ -391,7 +391,6 @@ public boolean removeWhenFarAway(double distance) {
         return false;
     }
 
-
     @Override
     public void checkDespawn() {
         if (this.level.getDifficulty() == Difficulty.PEACEFUL && this.shouldDespawnInPeaceful()) {
@@ -428,14 +427,6 @@ protected boolean canRide(Entity entity) {
         return false;
     }
 
-    public boolean displayDefenceLayer() {
-        return getPhase() == 0;
-    }
-
-    public boolean displayResistLayer() {
-        return getPhase() == 2;
-    }
-
     class AttackGoal extends MeleeAttackGoal {
 
         /**

diff --git a/src/main/java/androsa/gaiadimension/renderer/layer/MalachiteDefenceLayer.java b/src/main/java/androsa/gaiadimension/renderer/layer/MalachiteDefenceLayer.java
@@ -23,7 +23,7 @@ public MalachiteDefenceLayer(IEntityRenderer<T, M> renderer) {
 
     @Override
     public void render(MatrixStack matrix, IRenderTypeBuffer buffer, int light, T entity, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
-        if (entity.displayDefenceLayer()) {
+        if (entity.getPhase() == 0) {
             float ticks = (float)entity.tickCount + partialTicks;
             EntityModel<T> model = this.getEnergySwirlModel();
             model.prepareMobModel(entity, limbSwing, limbSwingAmount, partialTicks);

diff --git a/src/main/java/androsa/gaiadimension/renderer/layer/MalachiteResistLayer.java b/src/main/java/androsa/gaiadimension/renderer/layer/MalachiteResistLayer.java
@@ -23,7 +23,7 @@ public MalachiteResistLayer(IEntityRenderer<T, M> renderer) {
 
     @Override
     public void render(MatrixStack matrix, IRenderTypeBuffer buffer, int light, T entity, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
-        if (entity.displayResistLayer()) {
+        if (entity.getPhase() == 2) {
             float ticks = (float)entity.tickCount + partialTicks;
             EntityModel<T> model = this.getEnergySwirlModel();
             model.prepareMobModel(entity, limbSwing, limbSwingAmount, partialTicks);