From ea24ca751c75a2ad6b593504f5149e8f8abab767 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 13 Mar 2017 12:57:37 -0500 Subject: [PATCH] Fix armor 'breathing' on armor stands. Closes #2191 --- .../client/model/armor/ModelArmor.java | 55 +++++++++++++++++++ .../model/armor/ModelArmorElementium.java | 20 +------ .../model/armor/ModelArmorManasteel.java | 20 +------ .../model/armor/ModelArmorManaweave.java | 19 +------ .../model/armor/ModelArmorTerrasteel.java | 19 +------ 5 files changed, 63 insertions(+), 70 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/model/armor/ModelArmor.java diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmor.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmor.java new file mode 100644 index 000000000..bd4c3e355 --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmor.java @@ -0,0 +1,55 @@ +package vazkii.botania.client.model.armor; + +import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityArmorStand; +import net.minecraft.inventory.EntityEquipmentSlot; + +public class ModelArmor extends ModelBiped { + protected final EntityEquipmentSlot slot; + + public ModelArmor(EntityEquipmentSlot slot) { + this.slot = slot; + } + + // [VanillaCopy] ModelArmorStandArmor.setRotationAngles because armor stands are dumb + // This fixes the armor "breathing" and helmets always facing south on armor stands + @Override + public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor, Entity entityIn) + { + if (entityIn instanceof EntityArmorStand) + { + EntityArmorStand entityarmorstand = (EntityArmorStand)entityIn; + this.bipedHead.rotateAngleX = 0.017453292F * entityarmorstand.getHeadRotation().getX(); + this.bipedHead.rotateAngleY = 0.017453292F * entityarmorstand.getHeadRotation().getY(); + this.bipedHead.rotateAngleZ = 0.017453292F * entityarmorstand.getHeadRotation().getZ(); + this.bipedHead.setRotationPoint(0.0F, 1.0F, 0.0F); + this.bipedBody.rotateAngleX = 0.017453292F * entityarmorstand.getBodyRotation().getX(); + this.bipedBody.rotateAngleY = 0.017453292F * entityarmorstand.getBodyRotation().getY(); + this.bipedBody.rotateAngleZ = 0.017453292F * entityarmorstand.getBodyRotation().getZ(); + this.bipedLeftArm.rotateAngleX = 0.017453292F * entityarmorstand.getLeftArmRotation().getX(); + this.bipedLeftArm.rotateAngleY = 0.017453292F * entityarmorstand.getLeftArmRotation().getY(); + this.bipedLeftArm.rotateAngleZ = 0.017453292F * entityarmorstand.getLeftArmRotation().getZ(); + this.bipedRightArm.rotateAngleX = 0.017453292F * entityarmorstand.getRightArmRotation().getX(); + this.bipedRightArm.rotateAngleY = 0.017453292F * entityarmorstand.getRightArmRotation().getY(); + this.bipedRightArm.rotateAngleZ = 0.017453292F * entityarmorstand.getRightArmRotation().getZ(); + this.bipedLeftLeg.rotateAngleX = 0.017453292F * entityarmorstand.getLeftLegRotation().getX(); + this.bipedLeftLeg.rotateAngleY = 0.017453292F * entityarmorstand.getLeftLegRotation().getY(); + this.bipedLeftLeg.rotateAngleZ = 0.017453292F * entityarmorstand.getLeftLegRotation().getZ(); + this.bipedLeftLeg.setRotationPoint(1.9F, 11.0F, 0.0F); + this.bipedRightLeg.rotateAngleX = 0.017453292F * entityarmorstand.getRightLegRotation().getX(); + this.bipedRightLeg.rotateAngleY = 0.017453292F * entityarmorstand.getRightLegRotation().getY(); + this.bipedRightLeg.rotateAngleZ = 0.017453292F * entityarmorstand.getRightLegRotation().getZ(); + this.bipedRightLeg.setRotationPoint(-1.9F, 11.0F, 0.0F); + copyModelAngles(this.bipedHead, this.bipedHeadwear); + } else super.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scaleFactor, entityIn); + // Botania - defer to super if not an armor stand + } + + protected void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java index 30075a380..3998ccf2d 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java @@ -18,8 +18,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.inventory.EntityEquipmentSlot; -public class ModelArmorElementium extends ModelBiped { - +public class ModelArmorElementium extends ModelArmor { private final ModelRenderer helm; public final ModelRenderer body; private final ModelRenderer armR; @@ -51,10 +50,8 @@ public class ModelArmorElementium extends ModelBiped { private final ModelRenderer wing1_3; private final ModelRenderer wing2_3; - private final EntityEquipmentSlot slot; - public ModelArmorElementium(EntityEquipmentSlot slot) { - this.slot = slot; + super(slot); textureWidth = 64; textureHeight = 128; @@ -211,12 +208,6 @@ public class ModelArmorElementium extends ModelBiped { @Override public void render(@Nonnull Entity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { - - if(entity instanceof EntityArmorStand) { - // Hack so helmets look right on armor stand - netHeadYaw = 0; - } - helm.showModel = slot == EntityEquipmentSlot.HEAD; body.showModel = slot == EntityEquipmentSlot.CHEST; armR.showModel = slot == EntityEquipmentSlot.CHEST; @@ -241,11 +232,4 @@ public class ModelArmorElementium extends ModelBiped { super.render(entity, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale); } - - private void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } - } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java index ada5da866..547826ec0 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java @@ -18,9 +18,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.inventory.EntityEquipmentSlot; -public class ModelArmorManasteel extends ModelBiped { - - +public class ModelArmorManasteel extends ModelArmor { private final ModelRenderer helm; public final ModelRenderer body; private final ModelRenderer armR; @@ -41,10 +39,8 @@ public class ModelArmorManasteel extends ModelBiped { private final ModelRenderer legR; private final ModelRenderer legL; - private final EntityEquipmentSlot slot; - public ModelArmorManasteel(EntityEquipmentSlot slot) { - this.slot = slot; + super(slot); textureWidth = 64; textureHeight = 128; @@ -141,11 +137,6 @@ public class ModelArmorManasteel extends ModelBiped { @Override public void render(@Nonnull Entity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { - if(entity instanceof EntityArmorStand) { - // Hack so helmets look right on armor stand - netHeadYaw = 0; - } - helm.showModel = slot == EntityEquipmentSlot.HEAD; body.showModel = slot == EntityEquipmentSlot.CHEST; armR.showModel = slot == EntityEquipmentSlot.CHEST; @@ -170,11 +161,4 @@ public class ModelArmorManasteel extends ModelBiped { super.render(entity, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale); } - - private void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } - } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java index 9aa4876c3..06cf0a059 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java @@ -18,8 +18,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.inventory.EntityEquipmentSlot; -public class ModelArmorManaweave extends ModelBiped { - +public class ModelArmorManaweave extends ModelArmor { private final ModelRenderer helm; public final ModelRenderer body; private final ModelRenderer armR; @@ -41,10 +40,8 @@ public class ModelArmorManaweave extends ModelBiped { private final ModelRenderer skirtR; private final ModelRenderer skirtL; - private final EntityEquipmentSlot slot; - public ModelArmorManaweave(EntityEquipmentSlot slot) { - this.slot = slot; + super(slot); textureWidth = 64; textureHeight = 128; @@ -141,11 +138,6 @@ public class ModelArmorManaweave extends ModelBiped { @Override public void render(@Nonnull Entity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { - if(entity instanceof EntityArmorStand) { - // Hack so helmets look right on armor stand - netHeadYaw = 0; - } - helm.showModel = slot == EntityEquipmentSlot.HEAD; body.showModel = slot == EntityEquipmentSlot.CHEST; armR.showModel = slot == EntityEquipmentSlot.CHEST; @@ -170,11 +162,4 @@ public class ModelArmorManaweave extends ModelBiped { super.render(entity, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale); } - - private void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } - } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java index bfe4a97c2..0b552afa5 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java @@ -18,8 +18,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.inventory.EntityEquipmentSlot; -public class ModelArmorTerrasteel extends ModelBiped { - +public class ModelArmorTerrasteel extends ModelArmor { private final ModelRenderer helm; public final ModelRenderer body; private final ModelRenderer armr; @@ -54,10 +53,8 @@ public class ModelArmorTerrasteel extends ModelBiped { private final ModelRenderer bootL2; private final ModelRenderer bootLbranch; - private final EntityEquipmentSlot slot; - public ModelArmorTerrasteel(EntityEquipmentSlot slot) { - this.slot = slot; + super(slot); textureWidth = 64; textureHeight = 128; @@ -232,11 +229,6 @@ public class ModelArmorTerrasteel extends ModelBiped { @Override public void render(@Nonnull Entity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { - if(entity instanceof EntityArmorStand) { - // Hack so helmets look right on armor stand - netHeadYaw = 0; - } - helm.showModel = slot == EntityEquipmentSlot.HEAD; body.showModel = slot == EntityEquipmentSlot.CHEST; armr.showModel = slot == EntityEquipmentSlot.CHEST; @@ -261,11 +253,4 @@ public class ModelArmorTerrasteel extends ModelBiped { super.render(entity, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale); } - - private void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } - }