diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index ac5b059cf..3cbc6df06 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -84,14 +84,18 @@ public final class LibResources { public static final String MODEL_MANASTEEL_0 = PREFIX_MODEL + "manasteel0.png"; public static final String MODEL_MANASTEEL_1 = PREFIX_MODEL + "manasteel1.png"; public static final String MODEL_MANASTEEL_2 = PREFIX_MODEL + "manasteel2.png"; + public static final String MODEL_MANASTEEL_NEW = PREFIX_MODEL + "manasteelNew.png"; public static final String MODEL_TERRASTEEL_0 = PREFIX_MODEL + "terrasteel0.png"; public static final String MODEL_TERRASTEEL_1 = PREFIX_MODEL + "terrasteel1.png"; public static final String MODEL_TERRASTEEL_2 = PREFIX_MODEL + "terrasteel2.png"; + public static final String MODEL_TERRASTEEL_NEW = PREFIX_MODEL + "terrasteelNew.png"; public static final String MODEL_ELEMENTIUM_0 = PREFIX_MODEL + "elementium0.png"; public static final String MODEL_ELEMENTIUM_1 = PREFIX_MODEL + "elementium1.png"; public static final String MODEL_ELEMENTIUM_2 = PREFIX_MODEL + "elementium2.png"; + public static final String MODEL_ELEMENTIUM_NEW = PREFIX_MODEL + "elementiumNew.png"; public static final String MODEL_MANAWEAVE_0 = PREFIX_MODEL + "manaweave0.png"; public static final String MODEL_MANAWEAVE_1 = PREFIX_MODEL + "manaweave1.png"; + public static final String MODEL_MANAWEAVE_NEW = PREFIX_MODEL + "manaweaveNew.png"; public static final String MODEL_PIXIE = PREFIX_MODEL + "pixie.png"; public static final String MODEL_TINY_POTATO = PREFIX_MODEL + "tinyPotato.png"; public static final String MODEL_TINY_POTATO_GS = PREFIX_MODEL + "tinyPotatoGray.png"; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java new file mode 100644 index 000000000..5f6e67bfc --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java @@ -0,0 +1,266 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [? (GMT)] + */ +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.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumAction; +import net.minecraft.item.ItemStack; + +public class ModelArmorElementium extends ModelBiped { + + public ModelRenderer helm; + public ModelRenderer body; + public ModelRenderer armR; + public ModelRenderer armL; + public ModelRenderer belt; + public ModelRenderer bootR; + public ModelRenderer bootL; + public ModelRenderer helm1; + public ModelRenderer helm2; + public ModelRenderer helm3; + public ModelRenderer fairy; + public ModelRenderer helmWing1; + public ModelRenderer helmWing2; + public ModelRenderer helmWing3; + public ModelRenderer helmWing4; + public ModelRenderer body2; + public ModelRenderer armRpauldron; + public ModelRenderer wing1; + public ModelRenderer wing2; + public ModelRenderer armLpauldron; + public ModelRenderer wing1_1; + public ModelRenderer wing2_1; + public ModelRenderer legR; + public ModelRenderer legL; + public ModelRenderer bootR1; + public ModelRenderer wing1_2; + public ModelRenderer wing2_2; + public ModelRenderer bootL1; + public ModelRenderer wing1_3; + public ModelRenderer wing2_3; + + int slot; + + public ModelArmorElementium(int slot) { + this.slot = slot; + + textureWidth = 64; + textureHeight = 128; + float s = 0.2F; + fairy = new ModelRenderer(this, 34, 32); + fairy.setRotationPoint(0.0F, 0.0F, 0.0F); + fairy.addBox(-2.0F, -8.5F, -7.0F, 4, 4, 4, s); + setRotateAngle(fairy, -0.17453292519943295F, 0.0F, 0.0F); + helm3 = new ModelRenderer(this, 0, 32); + helm3.setRotationPoint(0.0F, 0.0F, 0.0F); + helm3.addBox(-1.0F, -5.5F, -5.5F, 2, 3, 1, s); + setRotateAngle(helm3, -0.17453292519943295F, 0.0F, 0.0F); + wing1_2 = new ModelRenderer(this, 56, 43); + wing1_2.mirror = true; + wing1_2.setRotationPoint(-2.5F, 9.0F, 0.0F); + wing1_2.addBox(0.5F, -2.0F, 0.0F, 0, 2, 3, s); + setRotateAngle(wing1_2, 0.2617993877991494F, -0.7853981633974483F, -0.2617993877991494F); + helm1 = new ModelRenderer(this, 50, 32); + helm1.setRotationPoint(0.0F, 0.0F, 0.0F); + helm1.addBox(-4.0F, -5.0F, -4.5F, 1, 5, 4, s); + legL = new ModelRenderer(this, 12, 79); + legL.mirror = true; + legL.setRotationPoint(1.9F, 12.0F, 0.0F); + legL.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, s); + setRotateAngle(legL, 0.0F, 0.0F, 0F); + armL = new ModelRenderer(this, 0, 79); + armL.mirror = true; + armL.setRotationPoint(5.0F, 2.0F, -0.0F); + armL.addBox(1.5F, 6.0F, -2.0F, 2, 4, 4, s); + setRotateAngle(armL, 0.0F, 0.0F, 0F); + armRpauldron = new ModelRenderer(this, 0, 67); + armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); + armRpauldron.addBox(-4.0F, -2.5F, -3.0F, 5, 6, 6, s); + legR = new ModelRenderer(this, 12, 79); + legR.setRotationPoint(-1.9F, 12.0F, 0.0F); + legR.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, s); + setRotateAngle(legR, 0.0F, 0.0F, 0F); + helmWing2 = new ModelRenderer(this, 46, 45); + helmWing2.mirror = true; + helmWing2.setRotationPoint(-4.0F, -4.0F, -1.0F); + helmWing2.addBox(-0.5F, 0.0F, 0.0F, 1, 3, 4, s); + setRotateAngle(helmWing2, -0.2617993877991494F, -0.2617993877991494F, 0.2617993877991494F); + bootL1 = new ModelRenderer(this, 12, 79); + bootL1.mirror = true; + bootL1.setRotationPoint(0.0F, 0.0F, 0.0F); + bootL1.addBox(-2.0F, 7.0F, -2.0F, 4, 1, 4, s); + armR = new ModelRenderer(this, 0, 79); + armR.setRotationPoint(-5.0F, 2.0F, 0.0F); + armR.addBox(-3.5F, 6.0F, -2.0F, 2, 4, 4, s); + setRotateAngle(armR, 0.0F, 0.0F, 0F); + bootR1 = new ModelRenderer(this, 12, 79); + bootR1.setRotationPoint(0.0F, 0.0F, 0.0F); + bootR1.addBox(-2.0F, 7.0F, -2.0F, 4, 1, 4, s); + bootR = new ModelRenderer(this, 12, 79); + bootR.setRotationPoint(-1.9F, 12.0F, 0.0F); + bootR.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, s); + setRotateAngle(bootR, 0.0F, 0.0F, 0F); + wing2_1 = new ModelRenderer(this, 56, 42); + wing2_1.setRotationPoint(4.5F, 0.0F, 0.0F); + wing2_1.addBox(0.0F, 0.0F, -0.5F, 0, 2, 3, s); + setRotateAngle(wing2_1, 0.08726646259971647F, 0.7853981633974483F, 0.2617993877991494F); + wing2_2 = new ModelRenderer(this, 56, 44); + wing2_2.mirror = true; + wing2_2.setRotationPoint(-2.5F, 9.0F, 0.0F); + wing2_2.addBox(0.5F, 0.0F, 0.0F, 0, 1, 2, s); + setRotateAngle(wing2_2, 0.08726646259971647F, -0.7853981633974483F, -0.2617993877991494F); + bootL = new ModelRenderer(this, 12, 79); + bootL.mirror = true; + bootL.setRotationPoint(1.9F, 12.0F, 0.0F); + bootL.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, s); + setRotateAngle(bootL, 0.0F, 0.0F, 0F); + body = new ModelRenderer(this, 0, 44); + body.setRotationPoint(0.0F, 0.0F, 0.0F); + body.addBox(-4.5F, 0.0F, -4.0F, 9, 5, 7, s); + setRotateAngle(body, 0.08726646259971647F, 0.0F, 0.0F); + belt = new ModelRenderer(this, 22, 56); + belt.setRotationPoint(0.0F, 0.0F, 0.0F); + belt.addBox(-4.5F, 9.5F, -3.0F, 9, 3, 5, s); + helm = new ModelRenderer(this, 0, 32); + helm.setRotationPoint(0.0F, 0.0F, 0.0F); + helm.addBox(-4.0F, -8.0F, -4.5F, 8, 3, 9, s); + setRotateAngle(helm, 0.08726646259971647F, 0.0F, 0.0F); + helmWing4 = new ModelRenderer(this, 46, 45); + helmWing4.setRotationPoint(4.0F, -4.0F, -1.0F); + helmWing4.addBox(-0.5F, 0.0F, 0.0F, 1, 3, 4, s); + setRotateAngle(helmWing4, -0.2617993877991494F, 0.2617993877991494F, -0.2617993877991494F); + armLpauldron = new ModelRenderer(this, 0, 67); + armLpauldron.mirror = true; + armLpauldron.setRotationPoint(0.0F, 0.0F, -0.0F); + armLpauldron.addBox(-1.0F, -2.5F, -3.0F, 5, 6, 6, s); + wing1_1 = new ModelRenderer(this, 56, 41); + wing1_1.setRotationPoint(4.5F, 0.0F, 0.0F); + wing1_1.addBox(0.0F, -3.0F, -0.5F, 0, 3, 4, s); + setRotateAngle(wing1_1, 0.2617993877991494F, 0.7853981633974483F, 0.2617993877991494F); + helm2 = new ModelRenderer(this, 50, 32); + helm2.mirror = true; + helm2.setRotationPoint(0.0F, 0.0F, 0.0F); + helm2.addBox(3.0F, -5.0F, -4.5F, 1, 5, 4, s); + wing2_3 = new ModelRenderer(this, 56, 44); + wing2_3.setRotationPoint(2.5F, 9.0F, 0.0F); + wing2_3.addBox(0.0F, 0.0F, -0.5F, 0, 1, 2, s); + setRotateAngle(wing2_3, 0.08726646259971647F, 0.7853981633974483F, 0.2617993877991494F); + wing1 = new ModelRenderer(this, 56, 41); + wing1.mirror = true; + wing1.setRotationPoint(-4.5F, 0.0F, 0.0F); + wing1.addBox(0.5F, -3.0F, 0.0F, 0, 3, 4, s); + setRotateAngle(wing1, 0.2617993877991494F, -0.7853981633974483F, -0.2617993877991494F); + body2 = new ModelRenderer(this, 0, 56); + body2.setRotationPoint(0.0F, 0.0F, 0.0F); + body2.addBox(-3.0F, 4.0F, -3.0F, 6, 6, 5, s); + setRotateAngle(body2, -0.08726646259971647F, 0.0F, 0.0F); + helmWing3 = new ModelRenderer(this, 32, 45); + helmWing3.setRotationPoint(4.0F, -4.0F, -1.0F); + helmWing3.addBox(-0.5F, -5.0F, 0.0F, 1, 5, 6, s); + setRotateAngle(helmWing3, 0.2617993877991494F, 0.5235987755982988F, 0.08726646259971647F); + helmWing1 = new ModelRenderer(this, 32, 45); + helmWing1.mirror = true; + helmWing1.setRotationPoint(-4.0F, -4.0F, -1.0F); + helmWing1.addBox(-0.5F, -5.0F, 0.0F, 1, 5, 6, s); + setRotateAngle(helmWing1, 0.2617993877991494F, -0.5235987755982988F, -0.08726646259971647F); + wing2 = new ModelRenderer(this, 56, 42); + wing2.mirror = true; + wing2.setRotationPoint(-4.5F, 0.0F, 0.0F); + wing2.addBox(0.5F, 0.0F, 0.0F, 0, 2, 3, s); + setRotateAngle(wing2, 0.08726646259971647F, -0.7853981633974483F, -0.2617993877991494F); + wing1_3 = new ModelRenderer(this, 56, 43); + wing1_3.setRotationPoint(2.5F, 9.0F, 0.0F); + wing1_3.addBox(0.0F, -2.0F, -0.5F, 0, 2, 3, s); + setRotateAngle(wing1_3, 0.2617993877991494F, 0.7853981633974483F, 0.2617993877991494F); + helm.addChild(fairy); + helm.addChild(helm3); + bootR.addChild(wing1_2); + helm.addChild(helm1); + belt.addChild(legL); + armR.addChild(armRpauldron); + belt.addChild(legR); + helm.addChild(helmWing2); + bootL.addChild(bootL1); + bootR.addChild(bootR1); + armLpauldron.addChild(wing2_1); + bootR.addChild(wing2_2); + helm.addChild(helmWing4); + armL.addChild(armLpauldron); + armLpauldron.addChild(wing1_1); + helm.addChild(helm2); + bootL.addChild(wing2_3); + armRpauldron.addChild(wing1); + body.addChild(body2); + helm.addChild(helmWing3); + helm.addChild(helmWing1); + armRpauldron.addChild(wing2); + bootL.addChild(wing1_3); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + helm.showModel = slot == 0; + body.showModel = slot == 1; + armR.showModel = slot == 1; + armL.showModel = slot == 1; + legR.showModel = slot == 2; + legL.showModel = slot == 2; + bootL.showModel = slot == 3; + bootR.showModel = slot == 3; + bipedHeadwear.showModel = false; + + bipedHead = helm; + bipedBody = body; + bipedRightArm = armR; + bipedLeftArm = armL; + if(slot == 2) { + bipedRightLeg = legR; + bipedLeftLeg = legL; + } else { + bipedRightLeg = bootR; + bipedLeftLeg = bootL; + } + + prepareForRender(entity); + super.render(entity, f, f1, f2, f3, f4, f5); + } + + public void prepareForRender(Entity entity) { + EntityLivingBase living = (EntityLivingBase) entity; + isSneak = living != null ? living.isSneaking() : false; + if(living != null && living instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) living; + + ItemStack itemstack = player.inventory.getCurrentItem(); + heldItemRight = itemstack != null ? 1 : 0; + + if (itemstack != null && player.getItemInUseCount() > 0) { + EnumAction enumaction = itemstack.getItemUseAction(); + + if (enumaction == EnumAction.block) + heldItemRight = 3; + else if (enumaction == EnumAction.bow) + aimedBow = true; + } + } + } + + public 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 new file mode 100644 index 000000000..c468620ec --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java @@ -0,0 +1,195 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [? (GMT)] + */ +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.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumAction; +import net.minecraft.item.ItemStack; + +public class ModelArmorManasteel extends ModelBiped { + + public ModelRenderer helm; + public ModelRenderer body; + public ModelRenderer armR; + public ModelRenderer armL; + public ModelRenderer belt; + public ModelRenderer bootR; + public ModelRenderer bootL; + public ModelRenderer helm1; + public ModelRenderer helm2; + public ModelRenderer helm3; + public ModelRenderer helm4; + public ModelRenderer helm5; + public ModelRenderer helm6; + public ModelRenderer helm7; + public ModelRenderer body2; + public ModelRenderer armRpauldron; + public ModelRenderer armLpauldron; + public ModelRenderer legR; + public ModelRenderer legL; + + int slot; + + public ModelArmorManasteel(int slot) { + this.slot = slot; + + textureWidth = 64; + textureHeight = 128; + float s = 0.2F; + armRpauldron = new ModelRenderer(this, 30, 47); + armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); + armRpauldron.addBox(-4.0F, -2.0F, -2.5F, 4, 4, 5, 0.2F); + armL = new ModelRenderer(this, 0, 68); + armL.mirror = true; + armL.setRotationPoint(5.0F, 2.0F, -0.0F); + armL.addBox(1.0F, 3.0F, -2.0F, 2, 6, 4, s); + setRotateAngle(armL, 0.0F, 0.0F, -0.17453292519943295F); + legR = new ModelRenderer(this, 12, 68); + legR.setRotationPoint(-1.9F, 12.0F, 0.0F); + legR.addBox(-2.0F, 0.0F, -2.0F, 4, 8, 4, s); + setRotateAngle(legR, 0.0F, 0.0F, 0F); + helm3 = new ModelRenderer(this, 24, 32); + helm3.setRotationPoint(0.0F, 0.0F, 0.0F); + helm3.addBox(-1.0F, -8.5F, -6.5F, 2, 5, 1, s); + setRotateAngle(helm3, -0.17453292519943295F, 0.0F, 0.0F); + helm7 = new ModelRenderer(this, 24, 32); + helm7.setRotationPoint(0.0F, 0.0F, 0.0F); + helm7.addBox(-1.0F, -8.5F, -6.0F, 2, 3, 1, s); + setRotateAngle(helm7, -0.3490658503988659F, 0.0F, 0.0F); + bootL = new ModelRenderer(this, 28, 68); + bootL.mirror = true; + bootL.setRotationPoint(2.0F, 12.0F, 0.0F); + bootL.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, s); + setRotateAngle(bootL, 0.0F, 0.0F, 0F); + helm4 = new ModelRenderer(this, 0, 39); + helm4.setRotationPoint(0.0F, 0.0F, 0.0F); + helm4.addBox(-4.0F, -8.0F, -0.5F, 1, 3, 5, s); + bootR = new ModelRenderer(this, 28, 68); + bootR.setRotationPoint(-2.0F, 12.0F, 0.0F); + bootR.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, s); + setRotateAngle(bootR, 0.0F, 0.0F, 0F); + legL = new ModelRenderer(this, 12, 68); + legL.mirror = true; + legL.setRotationPoint(1.9F, 12.0F, 0.0F); + legL.addBox(-2.0F, 0.0F, -2.0F, 4, 8, 4, s); + setRotateAngle(legL, 0.0F, 0.0F, 0F); + armR = new ModelRenderer(this, 0, 68); + armR.setRotationPoint(-5.0F, 2.0F, 0.0F); + armR.addBox(-3.0F, 3.0F, -2.0F, 2, 6, 4, s); + setRotateAngle(armR, 0.0F, 0.0F, 0.17453292519943295F); + helm1 = new ModelRenderer(this, 12, 39); + helm1.setRotationPoint(0.0F, 0.0F, 0.0F); + helm1.addBox(-4.0F, -5.0F, -4.5F, 1, 3, 4, s); + helm2 = new ModelRenderer(this, 12, 39); + helm2.mirror = true; + helm2.setRotationPoint(0.0F, 0.0F, 0.0F); + helm2.addBox(3.0F, -5.0F, -4.5F, 1, 3, 4, s); + body2 = new ModelRenderer(this, 0, 59); + body2.setRotationPoint(0.0F, 0.0F, 0.0F); + body2.addBox(-4.0F, 6.0F, -2.5F, 8, 4, 5, s); + setRotateAngle(body2, -0.08726646259971647F, 0.0F, 0.0F); + body = new ModelRenderer(this, 0, 47); + body.setRotationPoint(0.0F, 0.0F, 0.0F); + body.addBox(-4.5F, 0.0F, -3.5F, 9, 6, 6, s); + setRotateAngle(body, 0.08726646259971647F, 0.0F, 0.0F); + helm6 = new ModelRenderer(this, 24, 32); + helm6.setRotationPoint(0.0F, 0.0F, 0.0F); + helm6.addBox(-1.0F, -8.5F, -5.5F, 2, 3, 1, s); + setRotateAngle(helm6, -0.5235987755982988F, 0.0F, 0.0F); + belt = new ModelRenderer(this, 26, 59); + belt.setRotationPoint(0.0F, 0.0F, 0.0F); + belt.addBox(-4.5F, 9.5F, -3.0F, 9, 3, 6, s); + helm = new ModelRenderer(this, 0, 32); + helm.setRotationPoint(0.0F, 0.0F, 0.0F); + helm.addBox(-4.0F, -8.0F, -4.5F, 8, 3, 4, s); + setRotateAngle(helm, 0.08726646259971647F, 0.0F, 0.0F); + armLpauldron = new ModelRenderer(this, 30, 47); + armLpauldron.mirror = true; + armLpauldron.setRotationPoint(0.0F, 0.0F, -0.0F); + armLpauldron.addBox(0.0F, -2.0F, -2.5F, 4, 4, 5, s); + helm5 = new ModelRenderer(this, 0, 39); + helm5.mirror = true; + helm5.setRotationPoint(0.0F, 0.0F, 0.0F); + helm5.addBox(3.0F, -8.0F, -0.5F, 1, 3, 5, s); + + helm.addChild(helm3); + helm.addChild(helm7); + helm.addChild(helm4); + helm.addChild(helm6); + helm.addChild(helm1); + helm.addChild(helm2); + helm.addChild(helm5); + body.addChild(body2); + armL.addChild(armLpauldron); + armR.addChild(armRpauldron); + belt.addChild(legR); + belt.addChild(legL); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + helm.showModel = slot == 0; + body.showModel = slot == 1; + armR.showModel = slot == 1; + armL.showModel = slot == 1; + legR.showModel = slot == 2; + legL.showModel = slot == 2; + bootL.showModel = slot == 3; + bootR.showModel = slot == 3; + bipedHeadwear.showModel = false; + + bipedHead = helm; + bipedBody = body; + bipedRightArm = armR; + bipedLeftArm = armL; + if(slot == 2) { + bipedRightLeg = legR; + bipedLeftLeg = legL; + } else { + bipedRightLeg = bootR; + bipedLeftLeg = bootL; + } + + prepareForRender(entity); + super.render(entity, f, f1, f2, f3, f4, f5); + } + + public void prepareForRender(Entity entity) { + EntityLivingBase living = (EntityLivingBase) entity; + isSneak = living != null ? living.isSneaking() : false; + if(living != null && living instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) living; + + ItemStack itemstack = player.inventory.getCurrentItem(); + heldItemRight = itemstack != null ? 1 : 0; + + if (itemstack != null && player.getItemInUseCount() > 0) { + EnumAction enumaction = itemstack.getItemUseAction(); + + if (enumaction == EnumAction.block) + heldItemRight = 3; + else if (enumaction == EnumAction.bow) + aimedBow = true; + } + } + } + + public 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 new file mode 100644 index 000000000..10e143cc5 --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java @@ -0,0 +1,196 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [? (GMT)] + */ +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.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumAction; +import net.minecraft.item.ItemStack; + +public class ModelArmorManaweave extends ModelBiped { + + public ModelRenderer helm; + public ModelRenderer body; + public ModelRenderer armR; + public ModelRenderer armL; + public ModelRenderer legR; + public ModelRenderer legL; + public ModelRenderer bootR; + public ModelRenderer bootL; + public ModelRenderer helm2; + public ModelRenderer helm3; + public ModelRenderer helm4; + public ModelRenderer helmSeam1; + public ModelRenderer helmSeam2; + public ModelRenderer helmSeam3; + public ModelRenderer helmSeam4; + public ModelRenderer body2; + public ModelRenderer armRpauldron; + public ModelRenderer armLpauldron; + public ModelRenderer skirtR; + public ModelRenderer skirtL; + + int slot; + + public ModelArmorManaweave(int slot) { + this.slot = slot; + + textureWidth = 64; + textureHeight = 128; + float s = 0.2F; + helmSeam3 = new ModelRenderer(this, 26, 61); + helmSeam3.setRotationPoint(0.0F, 0.0F, 0.0F); + helmSeam3.addBox(-0.5F, -9.5F, 5.0F, 1, 11, 1, s); + helmSeam4 = new ModelRenderer(this, 39, 64); + helmSeam4.setRotationPoint(0.0F, 0.0F, 0.0F); + helmSeam4.addBox(-0.5F, 0.5F, -1.0F, 1, 1, 6, s); + skirtL = new ModelRenderer(this, 0, 83); + skirtL.mirror = true; + skirtL.setRotationPoint(0.0F, 0.0F, 0.0F); + skirtL.addBox(-2.0F, -2.0F, -3.5F, 5, 13, 7, s); + setRotateAngle(skirtL, 0.0F, 0F, 0F); + armR = new ModelRenderer(this, 24, 83); + armR.setRotationPoint(-5.0F, 2.0F, 0.0F); + armR.addBox(-3.0F, -1.5F, -2.5F, 4, 10, 5, s); + setRotateAngle(armR, 0.0F, 0.0F, 0F); + armL = new ModelRenderer(this, 24, 83); + armL.mirror = true; + armL.setRotationPoint(5.0F, 2.0F, -0.0F); + armL.addBox(-1.0F, -1.5F, -2.5F, 4, 10, 5, s); + setRotateAngle(armL, 0.0F, 0.0F, 0F); + bootR = new ModelRenderer(this, 0, 103); + bootR.setRotationPoint(-2.0F, 12.0F, 0.0F); + bootR.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, s); + setRotateAngle(bootR, 0.0F, 0.0F, 0F); + legR = new ModelRenderer(this, 42, 81); + legR.setRotationPoint(-2.0F, 12.0F, 0.0F); + legR.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, s); + setRotateAngle(legR, 0.0F, 0.0F, 0F); + helm2 = new ModelRenderer(this, 38, 42); + helm2.setRotationPoint(0.0F, 0.0F, 0.0F); + helm2.addBox(-4.49F, -4.0F, -2.5F, 1, 5, 8, s); + skirtR = new ModelRenderer(this, 0, 83); + skirtR.setRotationPoint(0.0F, 0.0F, 0.0F); + skirtR.addBox(-3.0F, -2.0F, -3.5F, 5, 13, 7, s); + setRotateAngle(skirtR, 0.0F, 0F, 0F); + armRpauldron = new ModelRenderer(this, 0, 72); + armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); + armRpauldron.addBox(-4.0F, -2.0F, -3.0F, 3, 5, 6, s); + setRotateAngle(armRpauldron, 0.0F, 0.0F, 0F); + bootL = new ModelRenderer(this, 0, 103); + bootL.setRotationPoint(2.0F, 12.0F, 0.0F); + bootL.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, s); + setRotateAngle(bootL, 0.0F, 0.0F, 0F); + helmSeam1 = new ModelRenderer(this, 30, 61); + helmSeam1.setRotationPoint(0.0F, 0.0F, 0.0F); + helmSeam1.addBox(-0.5F, -10.5F, -5.0F, 1, 7, 2, s); + helm = new ModelRenderer(this, 0, 32); + helm.setRotationPoint(0.0F, 0.0F, 0.0F); + helm.addBox(-4.5F, -10.0F, -4.5F, 9, 6, 10, s); + setRotateAngle(helm, 0F, 0.0F, 0.0F); + armLpauldron = new ModelRenderer(this, 0, 72); + armLpauldron.mirror = true; + armLpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); + armLpauldron.addBox(1.0F, -2.0F, -3.0F, 3, 5, 6, s); + setRotateAngle(armLpauldron, 0.0F, 0.0F, 0F); + helm4 = new ModelRenderer(this, 38, 32); + helm4.setRotationPoint(0.0F, 0.0F, 0.0F); + helm4.addBox(-3.5F, -4.0F, 0.49F, 7, 5, 5, s); + helmSeam2 = new ModelRenderer(this, 36, 61); + helmSeam2.setRotationPoint(0.0F, 0.0F, 0.0F); + helmSeam2.addBox(-0.5F, -10.5F, -3.0F, 1, 1, 9, s); + legL = new ModelRenderer(this, 42, 81); + legL.mirror = true; + legL.setRotationPoint(2.0F, 12.0F, 0.0F); + legL.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, s); + setRotateAngle(legL, 0.0F, 0.0F, 0F); + body2 = new ModelRenderer(this, 0, 61); + body2.setRotationPoint(0.0F, 0.0F, 0.0F); + body2.addBox(-4.0F, 6.0F, -2.5F, 8, 6, 5, s); + body = new ModelRenderer(this, 0, 48); + body.setRotationPoint(0.0F, 0.0F, 0.0F); + body.addBox(-4.5F, 0.0F, -3.0F, 9, 7, 6, s); + helm3 = new ModelRenderer(this, 38, 42); + helm3.mirror = true; + helm3.setRotationPoint(0.0F, 0.0F, 0F); + helm3.addBox(3.49F, -4.0F, -2.5F, 1, 5, 8, s); + helm.addChild(helmSeam3); + helm.addChild(helmSeam4); + legL.addChild(skirtL); + helm.addChild(helm2); + legR.addChild(skirtR); + armR.addChild(armRpauldron); + helm.addChild(helmSeam1); + armL.addChild(armLpauldron); + helm.addChild(helm4); + helm.addChild(helmSeam2); + body.addChild(body2); + helm.addChild(helm3); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + helm.showModel = slot == 0; + body.showModel = slot == 1; + armR.showModel = slot == 1; + armL.showModel = slot == 1; + legR.showModel = slot == 2; + legL.showModel = slot == 2; + bootL.showModel = slot == 3; + bootR.showModel = slot == 3; + bipedHeadwear.showModel = false; + + bipedHead = helm; + bipedBody = body; + bipedRightArm = armR; + bipedLeftArm = armL; + if(slot == 2) { + bipedRightLeg = legR; + bipedLeftLeg = legL; + } else { + bipedRightLeg = bootR; + bipedLeftLeg = bootL; + } + + prepareForRender(entity); + super.render(entity, f, f1, f2, f3, f4, f5); + } + + public void prepareForRender(Entity entity) { + EntityLivingBase living = (EntityLivingBase) entity; + isSneak = living != null ? living.isSneaking() : false; + if(living != null && living instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) living; + + ItemStack itemstack = player.inventory.getCurrentItem(); + heldItemRight = itemstack != null ? 1 : 0; + + if (itemstack != null && player.getItemInUseCount() > 0) { + EnumAction enumaction = itemstack.getItemUseAction(); + + if (enumaction == EnumAction.block) + heldItemRight = 3; + else if (enumaction == EnumAction.bow) + aimedBow = true; + } + } + } + + public 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 new file mode 100644 index 000000000..70d840f3e --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java @@ -0,0 +1,287 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [? (GMT)] + */ +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.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumAction; +import net.minecraft.item.ItemStack; + +public class ModelArmorTerrasteel extends ModelBiped { + + public ModelRenderer helm; + public ModelRenderer body; + public ModelRenderer armr; + public ModelRenderer armL; + public ModelRenderer belt; + public ModelRenderer bootR; + public ModelRenderer bootL; + public ModelRenderer helm2; + public ModelRenderer helm3; + public ModelRenderer helm4; + public ModelRenderer helmLeaf1; + public ModelRenderer helmLeaf2; + public ModelRenderer helmLeaf3; + public ModelRenderer helmLeaf4; + public ModelRenderer helmLeaf5; + public ModelRenderer helmLeaf6; + public ModelRenderer helmbranch1; + public ModelRenderer helmbranch2; + public ModelRenderer helmbranch3; + public ModelRenderer helmbranch4; + public ModelRenderer body2; + public ModelRenderer armRpauldron; + public ModelRenderer armRbranch1; + public ModelRenderer armRbranch2; + public ModelRenderer armLpauldron; + public ModelRenderer armLbranch1; + public ModelRenderer armLbranch2; + public ModelRenderer legR; + public ModelRenderer legL; + public ModelRenderer bootR1; + public ModelRenderer bootRbranch; + public ModelRenderer bootL2; + public ModelRenderer bootLbranch; + + int slot; + + public ModelArmorTerrasteel(int slot) { + this.slot = slot; + + textureWidth = 64; + textureHeight = 128; + float s = 0.2F; + armr = new ModelRenderer(this, 0, 77); + armr.setRotationPoint(-5.0F, 2.0F, -0.0F); + armr.addBox(-3.0F, 3.0F, -2.0F, 4, 7, 4, s); + setRotateAngle(armr, 0.0F, 0.0F, 0F); + body = new ModelRenderer(this, 0, 44); + body.setRotationPoint(0.0F, 0.0F, 0.0F); + body.addBox(-4.5F, 0.0F, -3.5F, 9, 6, 6, s); + setRotateAngle(body, 0F, 0.0F, 0.0F); + helm4 = new ModelRenderer(this, 56, 32); + helm4.setRotationPoint(0.0F, 0.0F, 0.0F); + helm4.addBox(-1.0F, -7.5F, -6.5F, 2, 6, 2, s); + setRotateAngle(helm4, 0F, 0.0F, 0.0F); + bootR1 = new ModelRenderer(this, 32, 77); + bootR1.setRotationPoint(0.0F, 0.0F, 0.0F); + bootR1.addBox(-2.0F, 6.0F, -2.0F, 4, 2, 4, s); + helmbranch4 = new ModelRenderer(this, 34, 43); + helmbranch4.mirror = true; + helmbranch4.setRotationPoint(0.0F, 0.0F, 0.0F); + helmbranch4.addBox(-2.0F, -8.0F, -4.0F, 1, 2, 7, s); + setRotateAngle(helmbranch4, 0.2617993877991494F, 0.0F, 1.0471975511965976F); + bootL = new ModelRenderer(this, 32, 83); + bootL.mirror = true; + bootL.setRotationPoint(1.9F, 12.0F, 0.0F); + bootL.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, s); + setRotateAngle(bootL, 0.0F, 0.0F, 0F); + bootR = new ModelRenderer(this, 32, 83); + bootR.setRotationPoint(-1.9F, 12.0F, 0.1F); + bootR.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, s); + setRotateAngle(bootR, 0.0F, 0.0F, 0F); + helmLeaf5 = new ModelRenderer(this, 50, 32); + helmLeaf5.mirror = true; + helmLeaf5.setRotationPoint(0.0F, 0.2F, 0.0F); + helmLeaf5.addBox(-1.0F, -11.0F, -4.5F, 2, 5, 1, s); + setRotateAngle(helmLeaf5, -0.5235987755982988F, -0.5235987755982988F, 0.5235987755982988F); + bootLbranch = new ModelRenderer(this, 48, 77); + bootLbranch.mirror = true; + bootLbranch.setRotationPoint(0.0F, 0.0F, 0.0F); + bootLbranch.addBox(8.0F, 1.0F, -2.0F, 1, 2, 5, s); + setRotateAngle(bootLbranch, 0.2617993877991494F, 0.0F, 1.0471975511965976F); + helmLeaf4 = new ModelRenderer(this, 50, 32); + helmLeaf4.mirror = true; + helmLeaf4.setRotationPoint(0.0F, 0.2F, 0.0F); + helmLeaf4.addBox(-1.5F, -9.0F, -6.0F, 2, 3, 1, s); + setRotateAngle(helmLeaf4, -0.2617993877991494F, -0.2617993877991494F, 0.5235987755982988F); + helmLeaf2 = new ModelRenderer(this, 50, 32); + helmLeaf2.setRotationPoint(0.0F, 0.2F, 0.0F); + helmLeaf2.addBox(-1.0F, -11.0F, -4.5F, 2, 5, 1, s); + setRotateAngle(helmLeaf2, -0.5235987755982988F, 0.5235987755982988F, -0.5235987755982988F); + helm = new ModelRenderer(this, 0, 32); + helm.setRotationPoint(0.0F, 0.0F, 0.0F); + helm.addBox(-4.0F, -8.0F, -4.5F, 8, 3, 9, s); + setRotateAngle(helm, 0.08726646259971647F, 0.0F, 0.0F); + helm2 = new ModelRenderer(this, 34, 32); + helm2.setRotationPoint(0.0F, 0.0F, 0.0F); + helm2.addBox(-4.0F, -5.0F, -4.5F, 2, 5, 6, s); + helm3 = new ModelRenderer(this, 34, 32); + helm3.mirror = true; + helm3.setRotationPoint(0.0F, 0.0F, 0.0F); + helm3.addBox(2.0F, -5.0F, -4.5F, 2, 5, 6, s); + helmbranch1 = new ModelRenderer(this, 34, 43); + helmbranch1.mirror = true; + helmbranch1.setRotationPoint(0.0F, 0.0F, 0F); + helmbranch1.addBox(-2.0F, -10.0F, -1.0F, 1, 2, 7, s); + setRotateAngle(helmbranch1, 0.5235987755982988F, 0.0F, -0.08726646259971647F); + bootL2 = new ModelRenderer(this, 32, 77); + bootL2.mirror = true; + bootL2.setRotationPoint(0.0F, 0.0F, 0.0F); + bootL2.addBox(-2.0F, 6.0F, -2.0F, 4, 2, 4, s); + helmbranch2 = new ModelRenderer(this, 34, 43); + helmbranch2.setRotationPoint(0.0F, 0.0F, 0.0F); + helmbranch2.addBox(1.0F, -10.0F, -1.0F, 1, 2, 7, s); + setRotateAngle(helmbranch2, 0.5235987755982988F, 0.0F, 0.08726646259971647F); + legR = new ModelRenderer(this, 16, 77); + legR.setRotationPoint(-1.9F, 12.0F, 0.0F); + legR.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, s); + setRotateAngle(legR, 0.0F, 0.0F, 0F); + helmLeaf6 = new ModelRenderer(this, 50, 32); + helmLeaf6.mirror = true; + helmLeaf6.setRotationPoint(0.0F, 0.2F, 0.0F); + helmLeaf6.addBox(-0.5F, -13.0F, -3.0F, 2, 7, 1, s); + setRotateAngle(helmLeaf6, -0.7853981633974483F, -0.7853981633974483F, 0.7853981633974483F); + armLbranch1 = new ModelRenderer(this, 51, 44); + armLbranch1.mirror = true; + armLbranch1.setRotationPoint(0.0F, 0.0F, -0.0F); + armLbranch1.addBox(2.5F, -5.0F, -1.0F, 1, 5, 2, s); + setRotateAngle(armLbranch1, 0.0F, 0.0F, 0.7853981633974483F); + bootRbranch = new ModelRenderer(this, 48, 77); + bootRbranch.setRotationPoint(0.0F, 0.0F, 0.0F); + bootRbranch.addBox(-9.0F, 1.0F, -2.0F, 1, 2, 5, s); + setRotateAngle(bootRbranch, 0.2617993877991494F, 0.0F, -1.0471975511965976F); + armRbranch2 = new ModelRenderer(this, 50, 43); + armRbranch2.setRotationPoint(0.0F, 0.0F, 0.0F); + armRbranch2.addBox(-1.5F, -5.0F, -1.5F, 1, 5, 3, s); + setRotateAngle(armRbranch2, 0.0F, 0.0F, -0.5235987755982988F); + helmLeaf3 = new ModelRenderer(this, 50, 32); + helmLeaf3.setRotationPoint(0.0F, 0.2F, 0.0F); + helmLeaf3.addBox(-1.5F, -13.0F, -3.0F, 2, 7, 1, s); + setRotateAngle(helmLeaf3, -0.7853981633974483F, 0.7853981633974483F, -0.7853981633974483F); + armRpauldron = new ModelRenderer(this, 0, 66); + armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); + armRpauldron.addBox(-4.0F, -2.0F, -3.0F, 5, 5, 6, s); + armLbranch2 = new ModelRenderer(this, 50, 43); + armLbranch2.mirror = true; + armLbranch2.setRotationPoint(0.0F, 0.0F, -0.0F); + armLbranch2.addBox(0.5F, -5.0F, -1.5F, 1, 5, 3, s); + setRotateAngle(armLbranch2, 0.0F, 0.0F, 0.5235987755982988F); + armL = new ModelRenderer(this, 0, 77); + armL.mirror = true; + armL.setRotationPoint(5.0F, 2.0F, -0.0F); + armL.addBox(-1.0F, 3.0F, -2.0F, 4, 7, 4, s); + setRotateAngle(armL, 0.0F, 0.0F, 0F); + body2 = new ModelRenderer(this, 0, 57); + body2.setRotationPoint(0.0F, 0.0F, 0.0F); + body2.addBox(-4.0F, 6.0F, -2.5F, 8, 4, 5, s); + setRotateAngle(body2, -0.08726646259971647F, 0.0F, 0.0F); + helmbranch3 = new ModelRenderer(this, 34, 43); + helmbranch3.setRotationPoint(0.0F, 0.0F, 0.0F); + helmbranch3.addBox(1.0F, -8.0F, -4.0F, 1, 2, 7, s); + setRotateAngle(helmbranch3, 0.2617993877991494F, 0.0F, -1.0471975511965976F); + armRbranch1 = new ModelRenderer(this, 51, 44); + armRbranch1.setRotationPoint(0.0F, 0.0F, 0.0F); + armRbranch1.addBox(-3.5F, -5.0F, -1.0F, 1, 5, 2, s); + setRotateAngle(armRbranch1, 0.0F, 0.0F, -0.7853981633974483F); + belt = new ModelRenderer(this, 22, 66); + belt.setRotationPoint(0.0F, 0.0F, 0.0F); + belt.addBox(-4.5F, 9.5F, -3.0F, 9, 3, 6, s); + helmLeaf1 = new ModelRenderer(this, 50, 32); + helmLeaf1.setRotationPoint(0.0F, 0.2F, 0.0F); + helmLeaf1.addBox(-0.5F, -9.0F, -6.0F, 2, 3, 1, s); + setRotateAngle(helmLeaf1, -0.2617993877991494F, 0.2617993877991494F, -0.5235987755982988F); + armLpauldron = new ModelRenderer(this, 0, 66); + armLpauldron.mirror = true; + armLpauldron.setRotationPoint(0.0F, 0.0F, -0.0F); + armLpauldron.addBox(-1.0F, -2.0F, -3.0F, 5, 5, 6, s); + legL = new ModelRenderer(this, 16, 77); + legL.mirror = true; + legL.setRotationPoint(1.9F, 12.0F, 0.0F); + legL.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, s); + setRotateAngle(legL, 0.0F, 0.0F, 0F); + + helm.addChild(helm4); + bootR.addChild(bootR1); + helm.addChild(helmbranch4); + helm.addChild(helmLeaf5); + bootL.addChild(bootLbranch); + helm.addChild(helmLeaf4); + helm.addChild(helmLeaf2); + helm.addChild(helm2); + helm.addChild(helm3); + helm.addChild(helmbranch1); + bootL.addChild(bootL2); + helm.addChild(helmbranch2); + belt.addChild(legR); + helm.addChild(helmLeaf6); + armLpauldron.addChild(armLbranch1); + bootR.addChild(bootRbranch); + armRpauldron.addChild(armRbranch2); + helm.addChild(helmLeaf3); + armr.addChild(armRpauldron); + armLpauldron.addChild(armLbranch2); + body.addChild(body2); + helm.addChild(helmbranch3); + armRpauldron.addChild(armRbranch1); + helm.addChild(helmLeaf1); + armL.addChild(armLpauldron); + belt.addChild(legL); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + helm.showModel = slot == 0; + body.showModel = slot == 1; + armr.showModel = slot == 1; + armL.showModel = slot == 1; + legR.showModel = slot == 2; + legL.showModel = slot == 2; + bootL.showModel = slot == 3; + bootR.showModel = slot == 3; + bipedHeadwear.showModel = false; + + bipedHead = helm; + bipedBody = body; + bipedRightArm = armr; + bipedLeftArm = armL; + if(slot == 2) { + bipedRightLeg = legR; + bipedLeftLeg = legL; + } else { + bipedRightLeg = bootR; + bipedLeftLeg = bootL; + } + + prepareForRender(entity); + super.render(entity, f, f1, f2, f3, f4, f5); + } + + public void prepareForRender(Entity entity) { + EntityLivingBase living = (EntityLivingBase) entity; + isSneak = living != null ? living.isSneaking() : false; + if(living != null && living instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) living; + + ItemStack itemstack = player.inventory.getCurrentItem(); + heldItemRight = itemstack != null ? 1 : 0; + + if (itemstack != null && player.getItemInUseCount() > 0) { + EnumAction enumaction = itemstack.getItemUseAction(); + + if (enumaction == EnumAction.block) + heldItemRight = 3; + else if (enumaction == EnumAction.bow) + aimedBow = true; + } + } + } + + public 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/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 991a0ebf3..34577a087 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -48,6 +48,7 @@ public final class ConfigHandler { public static boolean renderBaubles = true; public static boolean enableSeasonalFeatures = true; public static boolean useShiftForQuickLookup = false; + public static boolean enableArmorModels = true; public static int manaBarHeight = 29; public static int glSecondaryTextureUnit = 7; @@ -152,6 +153,9 @@ public final class ConfigHandler { desc = "Set this to true to use Shift instead of Ctrl for the inventory lexica botania quick lookup feature."; useShiftForQuickLookup = loadPropBool("quickLookup.useShift", desc, useShiftForQuickLookup); + desc = "Set this to false to disable custom armor models."; + enableArmorModels = loadPropBool("armorModels.enable", desc, enableArmorModels); + desc = "The height of the mana display bar in above the XP bar. You can change this if you have a mod that changes where the XP bar is."; manaBarHeight = loadPropInt("manaBar.height", desc, manaBarHeight); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java index 521a1ebaa..1809003cf 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -2,12 +2,19 @@ package vazkii.botania.common.item.equipment.armor.elementium; import java.util.List; +import baubles.common.Config; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IPixieSpawner; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.client.model.armor.ModelArmorElementium; +import vazkii.botania.client.model.armor.ModelArmorManasteel; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; @@ -17,9 +24,15 @@ public abstract class ItemElementiumArmor extends ItemManasteelArmor implements super(type, name, BotaniaAPI.elementiumArmorMaterial); } + @SideOnly(Side.CLIENT) + public ModelBiped provideArmorModelForSlot(ItemStack stack, int slot) { + models[slot] = new ModelArmorElementium(slot); + return models[slot]; + } + @Override public String getArmorTextureAfterInk(ItemStack stack, int slot) { - return slot == 2 ? LibResources.MODEL_ELEMENTIUM_1 : LibResources.MODEL_ELEMENTIUM_0; + return ConfigHandler.enableArmorModels ? LibResources.MODEL_ELEMENTIUM_NEW : (slot == 2 ? LibResources.MODEL_ELEMENTIUM_1 : LibResources.MODEL_ELEMENTIUM_0); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 02af5e93a..a35f337e6 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item.equipment.armor.manasteel; import java.util.List; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -32,7 +33,9 @@ import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.client.model.armor.ModelArmorManasteel; import vazkii.botania.common.core.BotaniaCreativeTab; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; @@ -48,6 +51,8 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan private static final String TAG_PHANTOM_INK = "phantomInk"; + protected ModelBiped[] models = new ModelBiped[4]; + public ItemManasteelArmor(int type, String name) { this(type, name, BotaniaAPI.manasteelArmorMaterial); } @@ -110,9 +115,35 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan } public String getArmorTextureAfterInk(ItemStack stack, int slot) { - return slot == 2 ? LibResources.MODEL_MANASTEEL_1 : LibResources.MODEL_MANASTEEL_0; + return ConfigHandler.enableArmorModels ? LibResources.MODEL_MANASTEEL_NEW : (slot == 2 ? LibResources.MODEL_MANASTEEL_1 : LibResources.MODEL_MANASTEEL_0); } - + + @Override + @SideOnly(Side.CLIENT) + public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { + if(ConfigHandler.enableArmorModels) { + ModelBiped model = getArmorModelForSlot(entityLiving, itemStack, armorSlot); +// if(model == null) + model = provideArmorModelForSlot(itemStack, armorSlot); + + if(model != null) + return model; + } + + return super.getArmorModel(entityLiving, itemStack, armorSlot); + } + + @SideOnly(Side.CLIENT) + public ModelBiped getArmorModelForSlot(EntityLivingBase entity, ItemStack stack, int slot) { + return models[slot]; + } + + @SideOnly(Side.CLIENT) + public ModelBiped provideArmorModelForSlot(ItemStack stack, int slot) { + models[slot] = new ModelArmorManasteel(slot); + return models[slot]; + } + @Override public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index 2c406ac29..7e98e576d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item.equipment.armor.manaweave; import java.util.List; +import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -19,20 +20,30 @@ import net.minecraft.stats.Achievement; import net.minecraft.util.StatCollector; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.client.model.armor.ModelArmorManaweave; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchievement { public ItemManaweaveArmor(int type, String name) { super(type, name, BotaniaAPI.manaweaveArmorMaterial); } + + @SideOnly(Side.CLIENT) + public ModelBiped provideArmorModelForSlot(ItemStack stack, int slot) { + models[slot] = new ModelArmorManaweave(slot); + return models[slot]; + } @Override public String getArmorTextureAfterInk(ItemStack stack, int slot) { - return slot == 2 ? LibResources.MODEL_MANAWEAVE_1 : LibResources.MODEL_MANAWEAVE_0; + return ConfigHandler.enableArmorModels ? LibResources.MODEL_MANAWEAVE_NEW : (slot == 2 ? LibResources.MODEL_MANAWEAVE_1 : LibResources.MODEL_MANAWEAVE_0); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index b79ab33c1..5dc841814 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -12,13 +12,18 @@ package vazkii.botania.common.item.equipment.armor.terrasteel; import java.util.List; +import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.client.model.armor.ModelArmorTerrasteel; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemTerrasteelArmor extends ItemManasteelArmor { @@ -26,9 +31,15 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { super(type, name, BotaniaAPI.terrasteelArmorMaterial); } + @SideOnly(Side.CLIENT) + public ModelBiped provideArmorModelForSlot(ItemStack stack, int slot) { + models[slot] = new ModelArmorTerrasteel(slot); + return models[slot]; + } + @Override public String getArmorTextureAfterInk(ItemStack stack, int slot) { - return slot == 2 ? LibResources.MODEL_TERRASTEEL_1 : LibResources.MODEL_TERRASTEEL_0; + return ConfigHandler.enableArmorModels ? LibResources.MODEL_TERRASTEEL_NEW : ( slot == 2 ? LibResources.MODEL_TERRASTEEL_1 : LibResources.MODEL_TERRASTEEL_0); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index c7e1e1b75..26e7dc5f0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -120,7 +120,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); GL11.glRotatef(90F, 0F, 1F, 0F); GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glTranslatef(-0.26F, 0.3F, -0.29F); + GL11.glTranslatef(-0.26F, 0.15F, -0.39F); GL11.glScalef(0.5F, 0.5F, 0.5F); ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, willIcon.getIconWidth(), willIcon.getIconHeight(), 1F / 16F); GL11.glPopMatrix(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index 9ba9c19bc..161bf42f4 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -56,9 +56,9 @@ public class ItemKnockbackBelt extends ItemBaubleModifier implements IBaubleRend Minecraft.getMinecraft().renderEngine.bindTexture(texture); Helper.rotateIfSneaking(event.entityPlayer); boolean armor = event.entityPlayer.getCurrentArmor(1) != null; - GL11.glTranslatef(0F, 0.1F, 0F); + GL11.glTranslatef(0F, 0.2F, 0F); - float s = (armor ? 1.3F : 1.05F) / 16F; + float s = 1.05F / 16F; GL11.glScalef(s, s, s); if(model == null) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index f303905c6..8eb097cbb 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -140,9 +140,9 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs Minecraft.getMinecraft().renderEngine.bindTexture(getRenderTexture()); Helper.rotateIfSneaking(event.entityPlayer); boolean armor = event.entityPlayer.getCurrentArmor(1) != null; - GL11.glTranslatef(0F, 0.1F, 0F); + GL11.glTranslatef(0F, 0.2F, 0F); - float s = (armor ? 1.3F : 1.05F) / 16F; + float s = 1.05F / 16F; GL11.glScalef(s, s, s); if(model == null) model = new ModelBiped(); diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java index 1167c3cb9..7fdb8e56c 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java @@ -15,6 +15,7 @@ import net.minecraft.item.ItemStack; import thaumcraft.api.IGoggles; import thaumcraft.api.nodes.IRevealer; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm; import vazkii.botania.common.lib.LibItemNames; import cpw.mods.fml.common.Optional; @@ -40,7 +41,7 @@ public class ItemElementiumHelmRevealing extends ItemElementiumHelm implements I @Override public String getArmorTextureAfterInk(ItemStack stack, int slot) { - return LibResources.MODEL_ELEMENTIUM_2; + return ConfigHandler.enableArmorModels ? LibResources.MODEL_ELEMENTIUM_NEW : LibResources.MODEL_ELEMENTIUM_2; } } diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java index 5f002d8f7..dd9b80dea 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java @@ -17,6 +17,7 @@ import net.minecraftforge.oredict.RecipeSorter.Category; import thaumcraft.api.IGoggles; import thaumcraft.api.nodes.IRevealer; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.crafting.recipe.HelmRevealingRecipe; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelHelm; import vazkii.botania.common.lib.LibItemNames; @@ -46,7 +47,7 @@ public class ItemManasteelHelmRevealing extends ItemManasteelHelm implements IGo @Override public String getArmorTextureAfterInk(ItemStack stack, int slot) { - return LibResources.MODEL_MANASTEEL_2; + return ConfigHandler.enableArmorModels ? LibResources.MODEL_MANASTEEL_NEW : LibResources.MODEL_MANASTEEL_2; } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java index b99e34dfd..c266bfad0 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java @@ -15,6 +15,7 @@ import net.minecraft.item.ItemStack; import thaumcraft.api.IGoggles; import thaumcraft.api.nodes.IRevealer; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; import vazkii.botania.common.lib.LibItemNames; import cpw.mods.fml.common.Optional; @@ -40,7 +41,7 @@ public class ItemTerrasteelHelmRevealing extends ItemTerrasteelHelm implements I @Override public String getArmorTextureAfterInk(ItemStack stack, int slot) { - return LibResources.MODEL_TERRASTEEL_2; + return ConfigHandler.enableArmorModels ? LibResources.MODEL_TERRASTEEL_NEW : LibResources.MODEL_TERRASTEEL_2; } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/model/armorElementium.java b/src/main/resources/assets/botania/textures/model/armorElementium.java deleted file mode 100644 index 07b073ffd..000000000 --- a/src/main/resources/assets/botania/textures/model/armorElementium.java +++ /dev/null @@ -1,218 +0,0 @@ -/*package model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -/** - * armor_elementium - wiiv - * Created using Tabula 4.1.1 - */ - /* -public class armorElementium extends ModelBase { - public ModelRenderer helm; - public ModelRenderer body; - public ModelRenderer armR; - public ModelRenderer armL; - public ModelRenderer belt; - public ModelRenderer bootR; - public ModelRenderer bootL; - public ModelRenderer helm1; - public ModelRenderer helm2; - public ModelRenderer helm3; - public ModelRenderer fairy; - public ModelRenderer helmWing1; - public ModelRenderer helmWing2; - public ModelRenderer helmWing3; - public ModelRenderer helmWing4; - public ModelRenderer body2; - public ModelRenderer armRpauldron; - public ModelRenderer wing1; - public ModelRenderer wing2; - public ModelRenderer armLpauldron; - public ModelRenderer wing1_1; - public ModelRenderer wing2_1; - public ModelRenderer legR; - public ModelRenderer legL; - public ModelRenderer bootR1; - public ModelRenderer wing1_2; - public ModelRenderer wing2_2; - public ModelRenderer bootL1; - public ModelRenderer wing1_3; - public ModelRenderer wing2_3; - - public armorElementium() { - this.textureWidth = 64; - this.textureHeight = 128; - this.fairy = new ModelRenderer(this, 34, 32); - this.fairy.setRotationPoint(0.0F, 0.0F, 0.0F); - this.fairy.addBox(-2.0F, -8.5F, -7.0F, 4, 4, 4, 0.0F); - this.setRotateAngle(fairy, -0.17453292519943295F, 0.0F, 0.0F); - this.helm3 = new ModelRenderer(this, 0, 32); - this.helm3.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm3.addBox(-1.0F, -5.5F, -5.5F, 2, 3, 1, 0.0F); - this.setRotateAngle(helm3, -0.17453292519943295F, 0.0F, 0.0F); - this.wing1_2 = new ModelRenderer(this, 56, 43); - this.wing1_2.mirror = true; - this.wing1_2.setRotationPoint(-2.5F, 9.0F, 0.0F); - this.wing1_2.addBox(0.5F, -2.0F, 0.0F, 0, 2, 3, 0.0F); - this.setRotateAngle(wing1_2, 0.2617993877991494F, -0.7853981633974483F, -0.2617993877991494F); - this.helm1 = new ModelRenderer(this, 50, 32); - this.helm1.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm1.addBox(-4.0F, -5.0F, -4.5F, 1, 5, 4, 0.0F); - this.legL = new ModelRenderer(this, 12, 79); - this.legL.mirror = true; - this.legL.setRotationPoint(1.9F, 12.0F, 0.0F); - this.legL.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, 0.0F); - this.setRotateAngle(legL, 0.0F, 0.0F, -0.17453292519943295F); - this.armL = new ModelRenderer(this, 0, 79); - this.armL.mirror = true; - this.armL.setRotationPoint(5.0F, 2.0F, -0.0F); - this.armL.addBox(1.5F, 6.0F, -2.0F, 2, 4, 4, 0.2F); - this.setRotateAngle(armL, 0.0F, 0.0F, -0.17453292519943295F); - this.armRpauldron = new ModelRenderer(this, 0, 67); - this.armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armRpauldron.addBox(-4.0F, -2.5F, -3.0F, 5, 6, 6, 0.0F); - this.legR = new ModelRenderer(this, 12, 79); - this.legR.setRotationPoint(-1.9F, 12.0F, 0.0F); - this.legR.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, 0.0F); - this.setRotateAngle(legR, 0.0F, 0.0F, 0.17453292519943295F); - this.helmWing2 = new ModelRenderer(this, 46, 45); - this.helmWing2.mirror = true; - this.helmWing2.setRotationPoint(-4.0F, -4.0F, -1.0F); - this.helmWing2.addBox(-0.5F, 0.0F, 0.0F, 1, 3, 4, 0.0F); - this.setRotateAngle(helmWing2, -0.2617993877991494F, -0.2617993877991494F, 0.2617993877991494F); - this.bootL1 = new ModelRenderer(this, 12, 79); - this.bootL1.mirror = true; - this.bootL1.setRotationPoint(0.0F, 0.0F, 0.0F); - this.bootL1.addBox(-2.0F, 7.0F, -2.0F, 4, 1, 4, 0.0F); - this.armR = new ModelRenderer(this, 0, 79); - this.armR.setRotationPoint(-5.0F, 2.0F, 0.0F); - this.armR.addBox(-3.5F, 6.0F, -2.0F, 2, 4, 4, 0.2F); - this.setRotateAngle(armR, 0.0F, 0.0F, 0.17453292519943295F); - this.bootR1 = new ModelRenderer(this, 12, 79); - this.bootR1.setRotationPoint(0.0F, 0.0F, 0.0F); - this.bootR1.addBox(-2.0F, 7.0F, -2.0F, 4, 1, 4, 0.0F); - this.bootR = new ModelRenderer(this, 12, 79); - this.bootR.setRotationPoint(-1.9F, 12.0F, 0.0F); - this.bootR.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, 0.0F); - this.setRotateAngle(bootR, 0.0F, 0.0F, 0.17453292519943295F); - this.wing2_1 = new ModelRenderer(this, 56, 42); - this.wing2_1.setRotationPoint(4.5F, 0.0F, 0.0F); - this.wing2_1.addBox(0.0F, 0.0F, -0.5F, 0, 2, 3, 0.0F); - this.setRotateAngle(wing2_1, 0.08726646259971647F, 0.7853981633974483F, 0.2617993877991494F); - this.wing2_2 = new ModelRenderer(this, 56, 44); - this.wing2_2.mirror = true; - this.wing2_2.setRotationPoint(-2.5F, 9.0F, 0.0F); - this.wing2_2.addBox(0.5F, 0.0F, 0.0F, 0, 1, 2, 0.0F); - this.setRotateAngle(wing2_2, 0.08726646259971647F, -0.7853981633974483F, -0.2617993877991494F); - this.bootL = new ModelRenderer(this, 12, 79); - this.bootL.mirror = true; - this.bootL.setRotationPoint(1.9F, 12.0F, 0.0F); - this.bootL.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, 0.0F); - this.setRotateAngle(bootL, 0.0F, 0.0F, -0.17453292519943295F); - this.body = new ModelRenderer(this, 0, 44); - this.body.setRotationPoint(0.0F, 0.0F, 0.0F); - this.body.addBox(-4.5F, 0.0F, -4.0F, 9, 5, 7, 0.0F); - this.setRotateAngle(body, 0.08726646259971647F, 0.0F, 0.0F); - this.belt = new ModelRenderer(this, 22, 56); - this.belt.setRotationPoint(0.0F, 0.0F, 0.0F); - this.belt.addBox(-4.5F, 9.5F, -3.0F, 9, 3, 5, 0.1F); - this.helm = new ModelRenderer(this, 0, 32); - this.helm.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm.addBox(-4.0F, -8.0F, -4.5F, 8, 3, 9, 0.0F); - this.setRotateAngle(helm, 0.08726646259971647F, 0.0F, 0.0F); - this.helmWing4 = new ModelRenderer(this, 46, 45); - this.helmWing4.setRotationPoint(4.0F, -4.0F, -1.0F); - this.helmWing4.addBox(-0.5F, 0.0F, 0.0F, 1, 3, 4, 0.0F); - this.setRotateAngle(helmWing4, -0.2617993877991494F, 0.2617993877991494F, -0.2617993877991494F); - this.armLpauldron = new ModelRenderer(this, 0, 67); - this.armLpauldron.mirror = true; - this.armLpauldron.setRotationPoint(0.0F, 0.0F, -0.0F); - this.armLpauldron.addBox(-1.0F, -2.5F, -3.0F, 5, 6, 6, 0.0F); - this.wing1_1 = new ModelRenderer(this, 56, 41); - this.wing1_1.setRotationPoint(4.5F, 0.0F, 0.0F); - this.wing1_1.addBox(0.0F, -3.0F, -0.5F, 0, 3, 4, 0.0F); - this.setRotateAngle(wing1_1, 0.2617993877991494F, 0.7853981633974483F, 0.2617993877991494F); - this.helm2 = new ModelRenderer(this, 50, 32); - this.helm2.mirror = true; - this.helm2.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm2.addBox(3.0F, -5.0F, -4.5F, 1, 5, 4, 0.0F); - this.wing2_3 = new ModelRenderer(this, 56, 44); - this.wing2_3.setRotationPoint(2.5F, 9.0F, 0.0F); - this.wing2_3.addBox(0.0F, 0.0F, -0.5F, 0, 1, 2, 0.0F); - this.setRotateAngle(wing2_3, 0.08726646259971647F, 0.7853981633974483F, 0.2617993877991494F); - this.wing1 = new ModelRenderer(this, 56, 41); - this.wing1.mirror = true; - this.wing1.setRotationPoint(-4.5F, 0.0F, 0.0F); - this.wing1.addBox(0.5F, -3.0F, 0.0F, 0, 3, 4, 0.0F); - this.setRotateAngle(wing1, 0.2617993877991494F, -0.7853981633974483F, -0.2617993877991494F); - this.body2 = new ModelRenderer(this, 0, 56); - this.body2.setRotationPoint(0.0F, 0.0F, 0.0F); - this.body2.addBox(-3.0F, 4.0F, -3.0F, 6, 6, 5, 0.0F); - this.setRotateAngle(body2, -0.08726646259971647F, 0.0F, 0.0F); - this.helmWing3 = new ModelRenderer(this, 32, 45); - this.helmWing3.setRotationPoint(4.0F, -4.0F, -1.0F); - this.helmWing3.addBox(-0.5F, -5.0F, 0.0F, 1, 5, 6, 0.0F); - this.setRotateAngle(helmWing3, 0.2617993877991494F, 0.5235987755982988F, 0.08726646259971647F); - this.helmWing1 = new ModelRenderer(this, 32, 45); - this.helmWing1.mirror = true; - this.helmWing1.setRotationPoint(-4.0F, -4.0F, -1.0F); - this.helmWing1.addBox(-0.5F, -5.0F, 0.0F, 1, 5, 6, 0.0F); - this.setRotateAngle(helmWing1, 0.2617993877991494F, -0.5235987755982988F, -0.08726646259971647F); - this.wing2 = new ModelRenderer(this, 56, 42); - this.wing2.mirror = true; - this.wing2.setRotationPoint(-4.5F, 0.0F, 0.0F); - this.wing2.addBox(0.5F, 0.0F, 0.0F, 0, 2, 3, 0.0F); - this.setRotateAngle(wing2, 0.08726646259971647F, -0.7853981633974483F, -0.2617993877991494F); - this.wing1_3 = new ModelRenderer(this, 56, 43); - this.wing1_3.setRotationPoint(2.5F, 9.0F, 0.0F); - this.wing1_3.addBox(0.0F, -2.0F, -0.5F, 0, 2, 3, 0.0F); - this.setRotateAngle(wing1_3, 0.2617993877991494F, 0.7853981633974483F, 0.2617993877991494F); - this.helm.addChild(this.fairy); - this.helm.addChild(this.helm3); - this.bootR.addChild(this.wing1_2); - this.helm.addChild(this.helm1); - this.belt.addChild(this.legL); - this.armR.addChild(this.armRpauldron); - this.belt.addChild(this.legR); - this.helm.addChild(this.helmWing2); - this.bootL.addChild(this.bootL1); - this.bootR.addChild(this.bootR1); - this.armLpauldron.addChild(this.wing2_1); - this.bootR.addChild(this.wing2_2); - this.helm.addChild(this.helmWing4); - this.armL.addChild(this.armLpauldron); - this.armLpauldron.addChild(this.wing1_1); - this.helm.addChild(this.helm2); - this.bootL.addChild(this.wing2_3); - this.armRpauldron.addChild(this.wing1); - this.body.addChild(this.body2); - this.helm.addChild(this.helmWing3); - this.helm.addChild(this.helmWing1); - this.armRpauldron.addChild(this.wing2); - this.bootL.addChild(this.wing1_3); - } - - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - this.armL.render(f5); - this.armR.render(f5); - this.bootR.render(f5); - this.bootL.render(f5); - this.body.render(f5); - this.belt.render(f5); - this.helm.render(f5); - } - - /** - * This is a helper function from Tabula to set the rotation of model parts - */ - /* - public 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/resources/assets/botania/textures/model/armorManasteel.java b/src/main/resources/assets/botania/textures/model/armorManasteel.java deleted file mode 100644 index 865b6096f..000000000 --- a/src/main/resources/assets/botania/textures/model/armorManasteel.java +++ /dev/null @@ -1,146 +0,0 @@ -/*package model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -/** - * armor_manasteel - wiiv - * Created using Tabula 4.1.1 - */ - /* -public class armorManasteel extends ModelBase { - public ModelRenderer helm; - public ModelRenderer body; - public ModelRenderer armR; - public ModelRenderer armL; - public ModelRenderer belt; - public ModelRenderer bootR; - public ModelRenderer bootL; - public ModelRenderer helm1; - public ModelRenderer helm2; - public ModelRenderer helm3; - public ModelRenderer helm4; - public ModelRenderer helm5; - public ModelRenderer helm6; - public ModelRenderer helm7; - public ModelRenderer body2; - public ModelRenderer armRpauldron; - public ModelRenderer armLpauldron; - public ModelRenderer legR; - public ModelRenderer legL; - - public armorManasteel() { - this.textureWidth = 64; - this.textureHeight = 128; - this.armRpauldron = new ModelRenderer(this, 30, 47); - this.armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armRpauldron.addBox(-4.0F, -2.0F, -2.5F, 4, 4, 5, 0.0F); - this.armL = new ModelRenderer(this, 0, 68); - this.armL.mirror = true; - this.armL.setRotationPoint(5.0F, 2.0F, -0.0F); - this.armL.addBox(1.0F, 3.0F, -2.0F, 2, 6, 4, 0.0F); - this.setRotateAngle(armL, 0.0F, 0.0F, -0.17453292519943295F); - this.legR = new ModelRenderer(this, 12, 68); - this.legR.setRotationPoint(-1.9F, 12.0F, 0.0F); - this.legR.addBox(-2.0F, 0.0F, -2.0F, 4, 8, 4, 0.0F); - this.setRotateAngle(legR, 0.0F, 0.0F, 0.17453292519943295F); - this.helm3 = new ModelRenderer(this, 24, 32); - this.helm3.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm3.addBox(-1.0F, -8.5F, -6.5F, 2, 5, 1, 0.0F); - this.setRotateAngle(helm3, -0.17453292519943295F, 0.0F, 0.0F); - this.helm7 = new ModelRenderer(this, 24, 32); - this.helm7.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm7.addBox(-1.0F, -8.5F, -6.0F, 2, 3, 1, 0.0F); - this.setRotateAngle(helm7, -0.3490658503988659F, 0.0F, 0.0F); - this.bootL = new ModelRenderer(this, 28, 68); - this.bootL.mirror = true; - this.bootL.setRotationPoint(2.0F, 12.0F, 0.0F); - this.bootL.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, 0.0F); - this.setRotateAngle(bootL, 0.0F, 0.0F, -0.17453292519943295F); - this.helm4 = new ModelRenderer(this, 0, 39); - this.helm4.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm4.addBox(-4.0F, -8.0F, -0.5F, 1, 3, 5, 0.0F); - this.bootR = new ModelRenderer(this, 28, 68); - this.bootR.setRotationPoint(-2.0F, 12.0F, 0.0F); - this.bootR.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, 0.0F); - this.setRotateAngle(bootR, 0.0F, 0.0F, 0.17453292519943295F); - this.legL = new ModelRenderer(this, 12, 68); - this.legL.mirror = true; - this.legL.setRotationPoint(1.9F, 12.0F, 0.0F); - this.legL.addBox(-2.0F, 0.0F, -2.0F, 4, 8, 4, 0.0F); - this.setRotateAngle(legL, 0.0F, 0.0F, -0.17453292519943295F); - this.armR = new ModelRenderer(this, 0, 68); - this.armR.setRotationPoint(-5.0F, 2.0F, 0.0F); - this.armR.addBox(-3.0F, 3.0F, -2.0F, 2, 6, 4, 0.0F); - this.setRotateAngle(armR, 0.0F, 0.0F, 0.17453292519943295F); - this.helm1 = new ModelRenderer(this, 12, 39); - this.helm1.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm1.addBox(-4.0F, -5.0F, -4.5F, 1, 3, 4, 0.0F); - this.helm2 = new ModelRenderer(this, 12, 39); - this.helm2.mirror = true; - this.helm2.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm2.addBox(3.0F, -5.0F, -4.5F, 1, 3, 4, 0.0F); - this.body2 = new ModelRenderer(this, 0, 59); - this.body2.setRotationPoint(0.0F, 0.0F, 0.0F); - this.body2.addBox(-4.0F, 6.0F, -2.5F, 8, 4, 5, 0.0F); - this.setRotateAngle(body2, -0.08726646259971647F, 0.0F, 0.0F); - this.body = new ModelRenderer(this, 0, 47); - this.body.setRotationPoint(0.0F, 0.0F, 0.0F); - this.body.addBox(-4.5F, 0.0F, -3.5F, 9, 6, 6, 0.0F); - this.setRotateAngle(body, 0.08726646259971647F, 0.0F, 0.0F); - this.helm6 = new ModelRenderer(this, 24, 32); - this.helm6.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm6.addBox(-1.0F, -8.5F, -5.5F, 2, 3, 1, 0.0F); - this.setRotateAngle(helm6, -0.5235987755982988F, 0.0F, 0.0F); - this.belt = new ModelRenderer(this, 26, 59); - this.belt.setRotationPoint(0.0F, 0.0F, 0.0F); - this.belt.addBox(-4.5F, 9.5F, -3.0F, 9, 3, 6, 0.0F); - this.helm = new ModelRenderer(this, 0, 32); - this.helm.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm.addBox(-4.0F, -8.0F, -4.5F, 8, 3, 4, 0.0F); - this.setRotateAngle(helm, 0.08726646259971647F, 0.0F, 0.0F); - this.armLpauldron = new ModelRenderer(this, 30, 47); - this.armLpauldron.mirror = true; - this.armLpauldron.setRotationPoint(0.0F, 0.0F, -0.0F); - this.armLpauldron.addBox(0.0F, -2.0F, -2.5F, 4, 4, 5, 0.0F); - this.helm5 = new ModelRenderer(this, 0, 39); - this.helm5.mirror = true; - this.helm5.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm5.addBox(3.0F, -8.0F, -0.5F, 1, 3, 5, 0.0F); - this.armR.addChild(this.armRpauldron); - this.belt.addChild(this.legR); - this.helm.addChild(this.helm3); - this.helm.addChild(this.helm7); - this.helm.addChild(this.helm4); - this.belt.addChild(this.legL); - this.helm.addChild(this.helm1); - this.helm.addChild(this.helm2); - this.body.addChild(this.body2); - this.helm.addChild(this.helm6); - this.armL.addChild(this.armLpauldron); - this.helm.addChild(this.helm5); - } - - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - this.armL.render(f5); - this.bootL.render(f5); - this.bootR.render(f5); - this.armR.render(f5); - this.body.render(f5); - this.belt.render(f5); - this.helm.render(f5); - } - - /** - * This is a helper function from Tabula to set the rotation of model parts - */ - /* - public 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/resources/assets/botania/textures/model/armorManaweave.java b/src/main/resources/assets/botania/textures/model/armorManaweave.java deleted file mode 100644 index d704165c9..000000000 --- a/src/main/resources/assets/botania/textures/model/armorManaweave.java +++ /dev/null @@ -1,149 +0,0 @@ -/*package model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -/** - * armor_manaweave - wiiv - * Created using Tabula 4.1.1 - */ - /* -public class armorManaweave extends ModelBase { - public ModelRenderer helm; - public ModelRenderer body; - public ModelRenderer armR; - public ModelRenderer armL; - public ModelRenderer legR; - public ModelRenderer legL; - public ModelRenderer bootR; - public ModelRenderer bootL; - public ModelRenderer helm2; - public ModelRenderer helm3; - public ModelRenderer helm4; - public ModelRenderer helmSeam1; - public ModelRenderer helmSeam2; - public ModelRenderer helmSeam3; - public ModelRenderer helmSeam4; - public ModelRenderer body2; - public ModelRenderer armRpauldron; - public ModelRenderer armLpauldron; - public ModelRenderer skirtR; - public ModelRenderer skirtL; - - public armorManaweave() { - this.textureWidth = 64; - this.textureHeight = 128; - this.helmSeam3 = new ModelRenderer(this, 26, 61); - this.helmSeam3.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helmSeam3.addBox(-0.5F, -9.5F, 5.0F, 1, 11, 1, 0.0F); - this.helmSeam4 = new ModelRenderer(this, 39, 64); - this.helmSeam4.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helmSeam4.addBox(-0.5F, 0.5F, -1.0F, 1, 1, 6, 0.0F); - this.skirtL = new ModelRenderer(this, 0, 83); - this.skirtL.mirror = true; - this.skirtL.setRotationPoint(0.0F, 0.0F, 0.0F); - this.skirtL.addBox(-2.0F, -2.0F, -3.5F, 5, 13, 7, 0.0F); - this.setRotateAngle(skirtL, 0.0F, -0.17453292519943295F, -0.2617993877991494F); - this.armR = new ModelRenderer(this, 24, 83); - this.armR.setRotationPoint(-5.0F, 2.0F, 0.0F); - this.armR.addBox(-3.0F, -1.5F, -2.5F, 4, 10, 5, 0.0F); - this.setRotateAngle(armR, 0.0F, 0.0F, 0.17453292519943295F); - this.armL = new ModelRenderer(this, 24, 83); - this.armL.mirror = true; - this.armL.setRotationPoint(5.0F, 2.0F, -0.0F); - this.armL.addBox(-1.0F, -1.5F, -2.5F, 4, 10, 5, 0.0F); - this.setRotateAngle(armL, 0.0F, 0.0F, -0.17453292519943295F); - this.bootR = new ModelRenderer(this, 0, 103); - this.bootR.setRotationPoint(-2.0F, 12.0F, 0.0F); - this.bootR.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, 0.0F); - this.setRotateAngle(bootR, 0.0F, 0.0F, 0.08726646259971647F); - this.legR = new ModelRenderer(this, 42, 81); - this.legR.setRotationPoint(-2.0F, 12.0F, 0.0F); - this.legR.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, 0.0F); - this.setRotateAngle(legR, 0.0F, 0.0F, 0.08726646259971647F); - this.helm2 = new ModelRenderer(this, 38, 42); - this.helm2.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm2.addBox(-4.49F, -4.0F, -2.5F, 1, 5, 8, 0.0F); - this.skirtR = new ModelRenderer(this, 0, 83); - this.skirtR.setRotationPoint(0.0F, 0.0F, 0.0F); - this.skirtR.addBox(-3.0F, -2.0F, -3.5F, 5, 13, 7, 0.0F); - this.setRotateAngle(skirtR, 0.0F, 0.17453292519943295F, 0.2617993877991494F); - this.armRpauldron = new ModelRenderer(this, 0, 72); - this.armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armRpauldron.addBox(-4.0F, -2.0F, -3.0F, 3, 5, 6, 0.0F); - this.setRotateAngle(armRpauldron, 0.0F, 0.0F, 0.17453292519943295F); - this.bootL = new ModelRenderer(this, 0, 103); - this.bootL.setRotationPoint(2.0F, 12.0F, 0.0F); - this.bootL.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, 0.0F); - this.setRotateAngle(bootL, 0.0F, 0.0F, -0.08726646259971647F); - this.helmSeam1 = new ModelRenderer(this, 30, 61); - this.helmSeam1.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helmSeam1.addBox(-0.5F, -10.5F, -5.0F, 1, 7, 2, 0.0F); - this.helm = new ModelRenderer(this, 0, 32); - this.helm.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm.addBox(-4.5F, -10.0F, -4.5F, 9, 6, 10, 0.0F); - this.setRotateAngle(helm, 0.08726646259971647F, 0.0F, 0.0F); - this.armLpauldron = new ModelRenderer(this, 0, 72); - this.armLpauldron.mirror = true; - this.armLpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armLpauldron.addBox(1.0F, -2.0F, -3.0F, 3, 5, 6, 0.0F); - this.setRotateAngle(armLpauldron, 0.0F, 0.0F, -0.17453292519943295F); - this.helm4 = new ModelRenderer(this, 38, 32); - this.helm4.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm4.addBox(-3.5F, -4.0F, 0.49F, 7, 5, 5, 0.0F); - this.helmSeam2 = new ModelRenderer(this, 36, 61); - this.helmSeam2.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helmSeam2.addBox(-0.5F, -10.5F, -3.0F, 1, 1, 9, 0.0F); - this.legL = new ModelRenderer(this, 42, 81); - this.legL.mirror = true; - this.legL.setRotationPoint(2.0F, 12.0F, 0.0F); - this.legL.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, 0.0F); - this.setRotateAngle(legL, 0.0F, 0.0F, -0.08726646259971647F); - this.body2 = new ModelRenderer(this, 0, 61); - this.body2.setRotationPoint(0.0F, 0.0F, 0.0F); - this.body2.addBox(-4.0F, 6.0F, -2.5F, 8, 6, 5, 0.0F); - this.body = new ModelRenderer(this, 0, 48); - this.body.setRotationPoint(0.0F, 0.0F, 0.0F); - this.body.addBox(-4.5F, 0.0F, -3.0F, 9, 7, 6, 0.0F); - this.helm3 = new ModelRenderer(this, 38, 42); - this.helm3.mirror = true; - this.helm3.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm3.addBox(3.49F, -4.0F, -2.5F, 1, 5, 8, 0.0F); - this.helm.addChild(this.helmSeam3); - this.helm.addChild(this.helmSeam4); - this.legL.addChild(this.skirtL); - this.helm.addChild(this.helm2); - this.legR.addChild(this.skirtR); - this.armR.addChild(this.armRpauldron); - this.helm.addChild(this.helmSeam1); - this.armL.addChild(this.armLpauldron); - this.helm.addChild(this.helm4); - this.helm.addChild(this.helmSeam2); - this.body.addChild(this.body2); - this.helm.addChild(this.helm3); - } - - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - this.armR.render(f5); - this.armL.render(f5); - this.bootR.render(f5); - this.legR.render(f5); - this.bootL.render(f5); - this.helm.render(f5); - this.legL.render(f5); - this.body.render(f5); - } - - /** - * This is a helper function from Tabula to set the rotation of model parts - */ - /* - public 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/resources/assets/botania/textures/model/armorTerrasteel.java b/src/main/resources/assets/botania/textures/model/armorTerrasteel.java deleted file mode 100644 index db3b1443f..000000000 --- a/src/main/resources/assets/botania/textures/model/armorTerrasteel.java +++ /dev/null @@ -1,238 +0,0 @@ -/*package model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -/** - * armor_terrasteel - wiiv - * Created using Tabula 4.1.1 - */ - /* -public class armorTerrasteel extends ModelBase { - public ModelRenderer helm; - public ModelRenderer body; - public ModelRenderer armr; - public ModelRenderer armL; - public ModelRenderer belt; - public ModelRenderer bootR; - public ModelRenderer bootL; - public ModelRenderer helm2; - public ModelRenderer helm3; - public ModelRenderer helm4; - public ModelRenderer helmLeaf1; - public ModelRenderer helmLeaf2; - public ModelRenderer helmLeaf3; - public ModelRenderer helmLeaf4; - public ModelRenderer helmLeaf5; - public ModelRenderer helmLeaf6; - public ModelRenderer helmbranch1; - public ModelRenderer helmbranch2; - public ModelRenderer helmbranch3; - public ModelRenderer helmbranch4; - public ModelRenderer body2; - public ModelRenderer armRpauldron; - public ModelRenderer armRbranch1; - public ModelRenderer armRbranch2; - public ModelRenderer armLpauldron; - public ModelRenderer armLbranch1; - public ModelRenderer armLbranch2; - public ModelRenderer legR; - public ModelRenderer legL; - public ModelRenderer bootR1; - public ModelRenderer bootRbranch; - public ModelRenderer bootL2; - public ModelRenderer bootLbranch; - - public armorTerrasteel() { - this.textureWidth = 64; - this.textureHeight = 128; - this.armr = new ModelRenderer(this, 0, 77); - this.armr.setRotationPoint(-5.0F, 2.0F, -0.0F); - this.armr.addBox(-3.0F, 3.0F, -2.0F, 4, 7, 4, 0.0F); - this.setRotateAngle(armr, 0.0F, 0.0F, 0.17453292519943295F); - this.body = new ModelRenderer(this, 0, 44); - this.body.setRotationPoint(0.0F, 0.0F, 0.0F); - this.body.addBox(-4.5F, 0.0F, -3.5F, 9, 6, 6, 0.0F); - this.setRotateAngle(body, 0.08726646259971647F, 0.0F, 0.0F); - this.helm4 = new ModelRenderer(this, 56, 32); - this.helm4.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm4.addBox(-1.0F, -7.5F, -6.5F, 2, 6, 2, 0.0F); - this.setRotateAngle(helm4, -0.17453292519943295F, 0.0F, 0.0F); - this.bootR1 = new ModelRenderer(this, 32, 77); - this.bootR1.setRotationPoint(0.0F, 0.0F, 0.0F); - this.bootR1.addBox(-2.0F, 6.0F, -2.0F, 4, 2, 4, 0.0F); - this.helmbranch4 = new ModelRenderer(this, 34, 43); - this.helmbranch4.mirror = true; - this.helmbranch4.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helmbranch4.addBox(-2.0F, -8.0F, -4.0F, 1, 2, 7, 0.0F); - this.setRotateAngle(helmbranch4, 0.2617993877991494F, 0.0F, 1.0471975511965976F); - this.bootL = new ModelRenderer(this, 32, 83); - this.bootL.mirror = true; - this.bootL.setRotationPoint(1.9F, 12.0F, 0.0F); - this.bootL.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, 0.0F); - this.setRotateAngle(bootL, 0.0F, 0.0F, -0.17453292519943295F); - this.bootR = new ModelRenderer(this, 32, 83); - this.bootR.setRotationPoint(-1.9F, 12.0F, 0.1F); - this.bootR.addBox(-2.0F, 8.0F, -3.0F, 4, 4, 5, 0.0F); - this.setRotateAngle(bootR, 0.0F, 0.0F, 0.17453292519943295F); - this.helmLeaf5 = new ModelRenderer(this, 50, 32); - this.helmLeaf5.mirror = true; - this.helmLeaf5.setRotationPoint(0.0F, 0.2F, 0.0F); - this.helmLeaf5.addBox(-1.0F, -11.0F, -4.5F, 2, 5, 1, 0.0F); - this.setRotateAngle(helmLeaf5, -0.5235987755982988F, -0.5235987755982988F, 0.5235987755982988F); - this.bootLbranch = new ModelRenderer(this, 48, 77); - this.bootLbranch.mirror = true; - this.bootLbranch.setRotationPoint(0.0F, 0.0F, 0.0F); - this.bootLbranch.addBox(8.0F, 1.0F, -2.0F, 1, 2, 5, 0.0F); - this.setRotateAngle(bootLbranch, 0.2617993877991494F, 0.0F, 1.0471975511965976F); - this.helmLeaf4 = new ModelRenderer(this, 50, 32); - this.helmLeaf4.mirror = true; - this.helmLeaf4.setRotationPoint(0.0F, 0.2F, 0.0F); - this.helmLeaf4.addBox(-1.5F, -9.0F, -6.0F, 2, 3, 1, 0.0F); - this.setRotateAngle(helmLeaf4, -0.2617993877991494F, -0.2617993877991494F, 0.5235987755982988F); - this.helmLeaf2 = new ModelRenderer(this, 50, 32); - this.helmLeaf2.setRotationPoint(0.0F, 0.2F, 0.0F); - this.helmLeaf2.addBox(-1.0F, -11.0F, -4.5F, 2, 5, 1, 0.0F); - this.setRotateAngle(helmLeaf2, -0.5235987755982988F, 0.5235987755982988F, -0.5235987755982988F); - this.helm = new ModelRenderer(this, 0, 32); - this.helm.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm.addBox(-4.0F, -8.0F, -4.5F, 8, 3, 9, 0.0F); - this.setRotateAngle(helm, 0.08726646259971647F, 0.0F, 0.0F); - this.helm2 = new ModelRenderer(this, 34, 32); - this.helm2.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm2.addBox(-4.0F, -5.0F, -4.5F, 2, 5, 6, 0.0F); - this.helm3 = new ModelRenderer(this, 34, 32); - this.helm3.mirror = true; - this.helm3.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm3.addBox(2.0F, -5.0F, -4.5F, 2, 5, 6, 0.0F); - this.helmbranch1 = new ModelRenderer(this, 34, 43); - this.helmbranch1.mirror = true; - this.helmbranch1.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helmbranch1.addBox(-2.0F, -10.0F, -1.0F, 1, 2, 7, 0.0F); - this.setRotateAngle(helmbranch1, 0.5235987755982988F, 0.0F, -0.08726646259971647F); - this.bootL2 = new ModelRenderer(this, 32, 77); - this.bootL2.mirror = true; - this.bootL2.setRotationPoint(0.0F, 0.0F, 0.0F); - this.bootL2.addBox(-2.0F, 6.0F, -2.0F, 4, 2, 4, 0.0F); - this.helmbranch2 = new ModelRenderer(this, 34, 43); - this.helmbranch2.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helmbranch2.addBox(1.0F, -10.0F, -1.0F, 1, 2, 7, 0.0F); - this.setRotateAngle(helmbranch2, 0.5235987755982988F, 0.0F, 0.08726646259971647F); - this.legR = new ModelRenderer(this, 16, 77); - this.legR.setRotationPoint(-1.9F, 12.0F, 0.0F); - this.legR.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, 0.0F); - this.setRotateAngle(legR, 0.0F, 0.0F, 0.17453292519943295F); - this.helmLeaf6 = new ModelRenderer(this, 50, 32); - this.helmLeaf6.mirror = true; - this.helmLeaf6.setRotationPoint(0.0F, 0.2F, 0.0F); - this.helmLeaf6.addBox(-0.5F, -13.0F, -3.0F, 2, 7, 1, 0.0F); - this.setRotateAngle(helmLeaf6, -0.7853981633974483F, -0.7853981633974483F, 0.7853981633974483F); - this.armLbranch1 = new ModelRenderer(this, 51, 44); - this.armLbranch1.mirror = true; - this.armLbranch1.setRotationPoint(0.0F, 0.0F, -0.0F); - this.armLbranch1.addBox(2.5F, -5.0F, -1.0F, 1, 5, 2, 0.0F); - this.setRotateAngle(armLbranch1, 0.0F, 0.0F, 0.7853981633974483F); - this.bootRbranch = new ModelRenderer(this, 48, 77); - this.bootRbranch.setRotationPoint(0.0F, 0.0F, 0.0F); - this.bootRbranch.addBox(-9.0F, 1.0F, -2.0F, 1, 2, 5, 0.0F); - this.setRotateAngle(bootRbranch, 0.2617993877991494F, 0.0F, -1.0471975511965976F); - this.armRbranch2 = new ModelRenderer(this, 50, 43); - this.armRbranch2.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armRbranch2.addBox(-1.5F, -5.0F, -1.5F, 1, 5, 3, 0.0F); - this.setRotateAngle(armRbranch2, 0.0F, 0.0F, -0.5235987755982988F); - this.helmLeaf3 = new ModelRenderer(this, 50, 32); - this.helmLeaf3.setRotationPoint(0.0F, 0.2F, 0.0F); - this.helmLeaf3.addBox(-1.5F, -13.0F, -3.0F, 2, 7, 1, 0.0F); - this.setRotateAngle(helmLeaf3, -0.7853981633974483F, 0.7853981633974483F, -0.7853981633974483F); - this.armRpauldron = new ModelRenderer(this, 0, 66); - this.armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armRpauldron.addBox(-4.0F, -2.0F, -3.0F, 5, 5, 6, 0.0F); - this.armLbranch2 = new ModelRenderer(this, 50, 43); - this.armLbranch2.mirror = true; - this.armLbranch2.setRotationPoint(0.0F, 0.0F, -0.0F); - this.armLbranch2.addBox(0.5F, -5.0F, -1.5F, 1, 5, 3, 0.0F); - this.setRotateAngle(armLbranch2, 0.0F, 0.0F, 0.5235987755982988F); - this.armL = new ModelRenderer(this, 0, 77); - this.armL.mirror = true; - this.armL.setRotationPoint(5.0F, 2.0F, -0.0F); - this.armL.addBox(-1.0F, 3.0F, -2.0F, 4, 7, 4, 0.0F); - this.setRotateAngle(armL, 0.0F, 0.0F, -0.17453292519943295F); - this.body2 = new ModelRenderer(this, 0, 57); - this.body2.setRotationPoint(0.0F, 0.0F, 0.0F); - this.body2.addBox(-4.0F, 6.0F, -2.5F, 8, 4, 5, 0.0F); - this.setRotateAngle(body2, -0.08726646259971647F, 0.0F, 0.0F); - this.helmbranch3 = new ModelRenderer(this, 34, 43); - this.helmbranch3.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helmbranch3.addBox(1.0F, -8.0F, -4.0F, 1, 2, 7, 0.0F); - this.setRotateAngle(helmbranch3, 0.2617993877991494F, 0.0F, -1.0471975511965976F); - this.armRbranch1 = new ModelRenderer(this, 51, 44); - this.armRbranch1.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armRbranch1.addBox(-3.5F, -5.0F, -1.0F, 1, 5, 2, 0.0F); - this.setRotateAngle(armRbranch1, 0.0F, 0.0F, -0.7853981633974483F); - this.belt = new ModelRenderer(this, 22, 66); - this.belt.setRotationPoint(0.0F, 0.0F, 0.0F); - this.belt.addBox(-4.5F, 9.5F, -3.0F, 9, 3, 6, 0.0F); - this.helmLeaf1 = new ModelRenderer(this, 50, 32); - this.helmLeaf1.setRotationPoint(0.0F, 0.2F, 0.0F); - this.helmLeaf1.addBox(-0.5F, -9.0F, -6.0F, 2, 3, 1, 0.0F); - this.setRotateAngle(helmLeaf1, -0.2617993877991494F, 0.2617993877991494F, -0.5235987755982988F); - this.armLpauldron = new ModelRenderer(this, 0, 66); - this.armLpauldron.mirror = true; - this.armLpauldron.setRotationPoint(0.0F, 0.0F, -0.0F); - this.armLpauldron.addBox(-1.0F, -2.0F, -3.0F, 5, 5, 6, 0.0F); - this.legL = new ModelRenderer(this, 16, 77); - this.legL.mirror = true; - this.legL.setRotationPoint(1.9F, 12.0F, 0.0F); - this.legL.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, 0.0F); - this.setRotateAngle(legL, 0.0F, 0.0F, -0.17453292519943295F); - this.helm.addChild(this.helm4); - this.bootR.addChild(this.bootR1); - this.helm.addChild(this.helmbranch4); - this.helm.addChild(this.helmLeaf5); - this.bootL.addChild(this.bootLbranch); - this.helm.addChild(this.helmLeaf4); - this.helm.addChild(this.helmLeaf2); - this.helm.addChild(this.helm2); - this.helm.addChild(this.helm3); - this.helm.addChild(this.helmbranch1); - this.bootL.addChild(this.bootL2); - this.helm.addChild(this.helmbranch2); - this.belt.addChild(this.legR); - this.helm.addChild(this.helmLeaf6); - this.armLpauldron.addChild(this.armLbranch1); - this.bootR.addChild(this.bootRbranch); - this.armRpauldron.addChild(this.armRbranch2); - this.helm.addChild(this.helmLeaf3); - this.armr.addChild(this.armRpauldron); - this.armLpauldron.addChild(this.armLbranch2); - this.body.addChild(this.body2); - this.helm.addChild(this.helmbranch3); - this.armRpauldron.addChild(this.armRbranch1); - this.helm.addChild(this.helmLeaf1); - this.armL.addChild(this.armLpauldron); - this.belt.addChild(this.legL); - } - - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - this.armr.render(f5); - this.body.render(f5); - this.bootL.render(f5); - this.bootR.render(f5); - this.helm.render(f5); - this.armL.render(f5); - this.belt.render(f5); - } - - /** - * This is a helper function from Tabula to set the rotation of model parts - */ - /* - public 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/resources/assets/botania/textures/model/armorElementium.png b/src/main/resources/assets/botania/textures/model/elementiumNew.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/armorElementium.png rename to src/main/resources/assets/botania/textures/model/elementiumNew.png diff --git a/src/main/resources/assets/botania/textures/model/armorManasteel.png b/src/main/resources/assets/botania/textures/model/manasteelNew.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/armorManasteel.png rename to src/main/resources/assets/botania/textures/model/manasteelNew.png diff --git a/src/main/resources/assets/botania/textures/model/armorManaweave.png b/src/main/resources/assets/botania/textures/model/manaweaveNew.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/armorManaweave.png rename to src/main/resources/assets/botania/textures/model/manaweaveNew.png diff --git a/src/main/resources/assets/botania/textures/model/armorTerrasteel.png b/src/main/resources/assets/botania/textures/model/terrasteelNew.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/armorTerrasteel.png rename to src/main/resources/assets/botania/textures/model/terrasteelNew.png