From 5f3a0d9a5d4a095c0934cc251fcf52a7f58b06a6 Mon Sep 17 00:00:00 2001 From: Lance5057 Date: Tue, 6 Feb 2018 08:35:53 -0600 Subject: More Armor things. Sabatons wont render propery... --- .../core/tools/armor/cloth/TinkersHood.java | 4 ++++ .../core/tools/armor/cloth/TinkersRobe.java | 4 ++++ .../core/tools/armor/cloth/TinkersShawl.java | 4 ++++ .../core/tools/armor/cloth/TinkersShoes.java | 4 ++++ .../core/tools/armor/heavy/TinkersBreastplate.java | 4 ++++ .../core/tools/armor/heavy/TinkersGrieves.java | 4 ++++ .../core/tools/armor/heavy/TinkersHelm.java | 4 ++++ .../core/tools/armor/heavy/TinkersSabatons.java | 4 ++++ .../renderers/heavy/ModelTinkersSabatons.java | 22 ++++++++++----------- .../java/lance5057/tDefense/proxy/ClientProxy.java | 1 - .../java/lance5057/tDefense/proxy/CommonProxy.java | 6 ------ .../textures/armor/Helm/_helm_visor.png | Bin 610 -> 607 bytes .../textures/armor/helm/_helm_plate.png | Bin 1098 -> 1087 bytes src/main/resources/mcmod.info | 2 +- 14 files changed, 44 insertions(+), 19 deletions(-) (limited to 'src/main') diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersHood.java b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersHood.java index 82cd6ee..8a7db4e 100644 --- a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersHood.java +++ b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersHood.java @@ -13,6 +13,8 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.tconstruct.library.tinkering.PartMaterialType; import slimeknights.tconstruct.library.tools.ToolCore; @@ -47,6 +49,7 @@ public class TinkersHood extends ArmorCore return 0; } + @SideOnly(Side.CLIENT) @Override public String getArmorTexture(ItemStack stack, int layer) { @@ -60,6 +63,7 @@ public class TinkersHood extends ArmorCore return s; } + @SideOnly(Side.CLIENT) @Override public ModelBiped getArmorModel(ItemStack stack) { diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersRobe.java b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersRobe.java index 0304cdc..e7ae1d9 100644 --- a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersRobe.java +++ b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersRobe.java @@ -8,6 +8,8 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.tconstruct.library.tinkering.PartMaterialType; public class TinkersRobe extends ArmorCore @@ -42,6 +44,7 @@ public class TinkersRobe extends ArmorCore return 0; } + @SideOnly(Side.CLIENT) @Override public String getArmorTexture(ItemStack stack, int layer) { @@ -55,6 +58,7 @@ public class TinkersRobe extends ArmorCore return s; } + @SideOnly(Side.CLIENT) @Override public ModelBiped getArmorModel(ItemStack stack) { diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShawl.java b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShawl.java index 949c587..e51ab21 100644 --- a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShawl.java +++ b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShawl.java @@ -10,6 +10,8 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.tconstruct.library.tinkering.PartMaterialType; public class TinkersShawl extends ArmorCore @@ -43,6 +45,7 @@ public class TinkersShawl extends ArmorCore return 0; } + @SideOnly(Side.CLIENT) @Override public String getArmorTexture(ItemStack stack, int layer) { @@ -62,6 +65,7 @@ public class TinkersShawl extends ArmorCore return s; } + @SideOnly(Side.CLIENT) @Override public ModelBiped getArmorModel(ItemStack stack) { diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShoes.java b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShoes.java index 1a1e27e..6d2e956 100644 --- a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShoes.java +++ b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShoes.java @@ -10,6 +10,8 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.tconstruct.library.tinkering.PartMaterialType; import slimeknights.tconstruct.tools.TinkerTools; @@ -46,6 +48,7 @@ public class TinkersShoes extends ArmorCore return 0; } + @SideOnly(Side.CLIENT) @Override public String getArmorTexture(ItemStack stack, int layer) { @@ -60,6 +63,7 @@ public class TinkersShoes extends ArmorCore return s; } + @SideOnly(Side.CLIENT) @Override public ModelBiped getArmorModel(ItemStack stack) { diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersBreastplate.java b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersBreastplate.java index a222e79..6b5d20b 100644 --- a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersBreastplate.java +++ b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersBreastplate.java @@ -6,6 +6,8 @@ import lance5057.tDefense.core.tools.armor.renderers.heavy.ModelTinkersBreastpla import lance5057.tDefense.core.tools.bases.ArmorCore; import net.minecraft.client.model.ModelBiped; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.tconstruct.library.tinkering.PartMaterialType; import slimeknights.tconstruct.tools.TinkerTools; @@ -20,6 +22,7 @@ public class TinkersBreastplate extends ArmorCore setUnlocalizedName("tinkersbreastplate"); } + @SideOnly(Side.CLIENT) @Override public String getArmorTexture(ItemStack stack, int layer) { @@ -34,6 +37,7 @@ public class TinkersBreastplate extends ArmorCore return s; } + @SideOnly(Side.CLIENT) @Override public ModelBiped getArmorModel(ItemStack stack) { diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersGrieves.java b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersGrieves.java index 00b08d2..29900c1 100644 --- a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersGrieves.java +++ b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersGrieves.java @@ -7,6 +7,8 @@ import lance5057.tDefense.core.tools.armor.renderers.heavy.ModelTinkersGrieves; import lance5057.tDefense.core.tools.bases.ArmorCore; import net.minecraft.client.model.ModelBiped; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.tconstruct.library.tinkering.PartMaterialType; public class TinkersGrieves extends ArmorCore @@ -20,6 +22,7 @@ public class TinkersGrieves extends ArmorCore setUnlocalizedName("tinkersgrieves"); } + @SideOnly(Side.CLIENT) @Override public String getArmorTexture(ItemStack stack, int layer) { @@ -34,6 +37,7 @@ public class TinkersGrieves extends ArmorCore return s; } + @SideOnly(Side.CLIENT) @Override public ModelBiped getArmorModel(ItemStack stack) { diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersHelm.java b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersHelm.java index dc3548f..4b5d6f1 100644 --- a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersHelm.java +++ b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersHelm.java @@ -6,6 +6,8 @@ import lance5057.tDefense.core.tools.armor.renderers.heavy.ModelTinkersHelm; import lance5057.tDefense.core.tools.bases.ArmorCore; import net.minecraft.client.model.ModelBiped; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.tconstruct.library.tinkering.PartMaterialType; import slimeknights.tconstruct.tools.TinkerTools; @@ -20,6 +22,7 @@ public class TinkersHelm extends ArmorCore setUnlocalizedName("tinkershelm"); } + @SideOnly(Side.CLIENT) @Override public String getArmorTexture(ItemStack stack, int layer) { @@ -34,6 +37,7 @@ public class TinkersHelm extends ArmorCore return s; } + @SideOnly(Side.CLIENT) @Override public ModelBiped getArmorModel(ItemStack stack) { diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersSabatons.java b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersSabatons.java index 1881f18..8ef9f2d 100644 --- a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersSabatons.java +++ b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersSabatons.java @@ -7,6 +7,8 @@ import lance5057.tDefense.core.tools.armor.renderers.heavy.ModelTinkersSabatons; import lance5057.tDefense.core.tools.bases.ArmorCore; import net.minecraft.client.model.ModelBiped; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.tconstruct.library.tinkering.PartMaterialType; public class TinkersSabatons extends ArmorCore @@ -20,6 +22,7 @@ public class TinkersSabatons extends ArmorCore setUnlocalizedName("tinkerssabatons"); } + @SideOnly(Side.CLIENT) @Override public String getArmorTexture(ItemStack stack, int layer) { @@ -34,6 +37,7 @@ public class TinkersSabatons extends ArmorCore return s; } + @SideOnly(Side.CLIENT) @Override public ModelBiped getArmorModel(ItemStack stack) { diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/heavy/ModelTinkersSabatons.java b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/heavy/ModelTinkersSabatons.java index 9755123..d754285 100644 --- a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/heavy/ModelTinkersSabatons.java +++ b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/heavy/ModelTinkersSabatons.java @@ -24,7 +24,7 @@ public class ModelTinkersSabatons extends ArmorRenderer { public ModelRenderer KneeGuardL; public ModelTinkersSabatons(ItemStack stack) { - super(0.25f, 0, 96, 64, stack); + super(10.25f, 0, 96, 64, stack); this.textureWidth = 96; this.textureHeight = 64; @@ -43,59 +43,59 @@ public class ModelTinkersSabatons extends ArmorRenderer { this.LegBackL = new ModelRenderer(this, 64, 40); this.LegBackL.mirror = true; - this.LegBackL.setRotationPoint(-1.9F, 12.0F, 0.0F); + this.LegBackL.setRotationPoint(0.0F, 0.0F, 0.0F); this.LegBackL.addBox(-2.0F, 3.0F, 0.6F, 4, 6, 2, 0.3F); this.setRotateAngle(LegBackL, -0.05759586531581287F, 0.0F, 0.0F); this.bipedLeftLeg.addChild(LegBackL); this.KneeGuardCapL = new ModelRenderer(this, 80, 36); this.KneeGuardCapL.mirror = true; - this.KneeGuardCapL.setRotationPoint(-1.9F, 12.0F, 0.0F); + this.KneeGuardCapL.setRotationPoint(0.0F, 0.0F, 0.0F); this.KneeGuardCapL.addBox(-1.5F, 2.4F, -3.8F, 3, 2, 1, 0.2F); this.setRotateAngle(KneeGuardCapL, 0.17453292519943295F, 0.0F, 0.0F); this.bipedLeftLeg.addChild(KneeGuardCapL); this.KneeGuardR = new ModelRenderer(this, 64, 32); - this.KneeGuardR.setRotationPoint(1.9F, 12.0F, 0.0F); + this.KneeGuardR.setRotationPoint(0.0F, 0.0F, 0.0F); this.KneeGuardR.addBox(-2.0F, 3.0F, -2.5F, 4, 3, 4, 0.31F); this.bipedRightLeg.addChild(KneeGuardR); this.BootR = new ModelRenderer(this, 64, 56); - this.BootR.setRotationPoint(1.9F, 12.0F, 0.1F); + this.BootR.setRotationPoint(0.0F, 0.0F, 0.0F); this.BootR.addBox(-2.0F, 9.0F, -3.0F, 4, 3, 5, 0.31F); this.bipedRightLeg.addChild(BootR); this.ShinGuardR = new ModelRenderer(this, 64, 48); - this.ShinGuardR.setRotationPoint(1.9F, 12.0F, 0.0F); + this.ShinGuardR.setRotationPoint(0.0F, 0.0F, 0.0F); this.ShinGuardR.addBox(-2.0F, 4.0F, -2.5F, 4, 5, 3, 0.26F); this.setRotateAngle(ShinGuardR, 0.05759586531581287F, 0.0F, 0.0F); this.bipedRightLeg.addChild(ShinGuardR); this.KneeGuardL = new ModelRenderer(this, 64, 32); this.KneeGuardL.mirror = true; - this.KneeGuardL.setRotationPoint(-1.9F, 12.0F, 0.0F); + this.KneeGuardL.setRotationPoint(0.0F, 0.0F, 0.0F); this.KneeGuardL.addBox(-2.0F, 3.0F, -2.5F, 4, 3, 4, 0.31F); this.bipedLeftLeg.addChild(KneeGuardL); this.BootCapR = new ModelRenderer(this, 76, 32); - this.BootCapR.setRotationPoint(1.9F, 12.0F, 0.1F); + this.BootCapR.setRotationPoint(0.0F, 0.0F, 0.0F); this.BootCapR.addBox(-1.5F, 10.0F, -4.0F, 3, 2, 2, 0.3F); this.bipedRightLeg.addChild(BootCapR); this.KneeGuardCapR = new ModelRenderer(this, 80, 36); - this.KneeGuardCapR.setRotationPoint(1.9F, 12.0F, 0.0F); + this.KneeGuardCapR.setRotationPoint(0.0F, 0.0F, 0.0F); this.KneeGuardCapR.addBox(-1.5F, 2.4F, -3.8F, 3, 2, 1, 0.2F); this.setRotateAngle(KneeGuardCapR, 0.17453292519943295F, 0.0F, 0.0F); this.bipedRightLeg.addChild(KneeGuardCapR); this.BootCapL = new ModelRenderer(this, 76, 32); this.BootCapL.mirror = true; - this.BootCapL.setRotationPoint(-1.9F, 12.0F, 0.1F); + this.BootCapL.setRotationPoint(0.0F, 0.0F, 0.0F); this.BootCapL.addBox(-1.5F, 10.0F, -4.0F, 3, 2, 2, 0.3F); this.bipedLeftLeg.addChild(BootCapL); this.LegBackR = new ModelRenderer(this, 64, 40); - this.LegBackR.setRotationPoint(1.9F, 12.0F, 0.0F); + this.LegBackR.setRotationPoint(0.0F, 0.0F, 0.0F); this.LegBackR.addBox(-2.0F, 3.0F, 0.6F, 4, 6, 2, 0.3F); this.setRotateAngle(LegBackR, -0.05759586531581287F, 0.0F, 0.0F); this.bipedRightLeg.addChild(LegBackR); diff --git a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java index de1dafd..d1df248 100644 --- a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java +++ b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java @@ -381,7 +381,6 @@ public class ClientProxy extends CommonProxy { new ModelResourceLocation(Reference.MOD_ID + ":" + file, "inventory")); } - @Override public void registerItemColorHandler(IItemColor c, Item i) { ItemColors itemcolors = Minecraft.getMinecraft().getItemColors(); itemcolors.registerItemColorHandler(c, i); diff --git a/src/main/java/lance5057/tDefense/proxy/CommonProxy.java b/src/main/java/lance5057/tDefense/proxy/CommonProxy.java index 8082b43..1830593 100644 --- a/src/main/java/lance5057/tDefense/proxy/CommonProxy.java +++ b/src/main/java/lance5057/tDefense/proxy/CommonProxy.java @@ -6,7 +6,6 @@ import lance5057.tDefense.core.tools.armor.straps.ItemStrapsInv; import lance5057.tDefense.core.tools.armor.straps.StrapsContainer; import lance5057.tDefense.core.tools.armor.straps.StrapsGui; import net.minecraft.block.Block; -import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.util.EnumHand; @@ -97,11 +96,6 @@ public class CommonProxy implements IGuiHandler { } - public void registerItemColorHandler(IItemColor c, Item i) - { - - } - @SubscribeEvent public static void registerItems(RegistryEvent.Register event) { TinkersDefense.mats.registerItems(event); diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_visor.png b/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_visor.png index bbe7f01..fed10d6 100644 Binary files a/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_visor.png and b/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_visor.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/helm/_helm_plate.png b/src/main/resources/assets/tinkersdefense/textures/armor/helm/_helm_plate.png index 7abc400..f29fea3 100644 Binary files a/src/main/resources/assets/tinkersdefense/textures/armor/helm/_helm_plate.png and b/src/main/resources/assets/tinkersdefense/textures/armor/helm/_helm_plate.png differ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 17debc6..a32062b 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "tinkersdefense", "name": "Tinkers' Defense", "description": "A defense related expansion for TConstruct", - "version": "1.4.2.6a", + "version": "1.4.2.7a", "mcversion": "1.12.2", "url": "", "authorList": ["Sir Lance"], -- cgit v1.2.3