diff options
Diffstat (limited to 'src/main/java/lance5057/tDefense/armor')
18 files changed, 98 insertions, 31 deletions
diff --git a/src/main/java/lance5057/tDefense/armor/ArmorCore.java b/src/main/java/lance5057/tDefense/armor/ArmorCore.java index 87188f5..1c63062 100644 --- a/src/main/java/lance5057/tDefense/armor/ArmorCore.java +++ b/src/main/java/lance5057/tDefense/armor/ArmorCore.java @@ -16,12 +16,10 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; -import net.minecraftforge.common.MinecraftForge; import org.lwjgl.opengl.GL11; import tconstruct.library.TConstructRegistry; -import tconstruct.library.event.ToolCraftEvent.NormalTool; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.CustomMaterial; import tconstruct.library.tools.ToolCore; @@ -29,7 +27,6 @@ import thaumcraft.api.IRunicArmor; import vazkii.botania.api.item.IPixieSpawner; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -51,7 +48,7 @@ public abstract class ArmorCore extends ToolCore implements ISpecialArmor, IRuni this.slot = slot; - MinecraftForge.EVENT_BUS.register(this); + //MinecraftForge.EVENT_BUS.register(this); } @Override @@ -243,6 +240,7 @@ public abstract class ArmorCore extends ToolCore implements ISpecialArmor, IRuni } } + @SideOnly(Side.CLIENT) public void renderArmor(Entity entity, float f, float f1, float f2, float f3, float f4, float f5, String[] colors, ItemStack stack, int pass) { @@ -259,6 +257,7 @@ public abstract class ArmorCore extends ToolCore implements ISpecialArmor, IRuni } + @SideOnly(Side.CLIENT) public String getTexture(int pass, ItemStack stack) { final NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); @@ -307,30 +306,4 @@ public abstract class ArmorCore extends ToolCore implements ISpecialArmor, IRuni final float chance = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("ElementiumCore") * 5 / 100f; return chance; } - - @SubscribeEvent - public void ToolCraftedEvent(NormalTool event) - { - if(event.tool instanceof ArmorCore) - { - final ArmorCore armor = (ArmorCore) event.tool; - final ArmorRenderer render = armor.getRenderer(); - final NBTTagCompound tooltags = event.toolTag; - final NBTTagCompound tags = render.defaultTags;//stack.setTagCompound(); - - // for(int i = 0; i < render.defaultTags.; i++) - // { - // final String rendertag = ((ModelRenderer) render.boxList.get(i)).boxName; - // if(rendertag != null) - // { - // tags.setBoolean(rendertag, ((ModelRenderer) render.boxList.get(i)).isHidden); - // } - // } - - if(!tags.hasNoTags()) - { - tooltags.setTag("ArmorRenderer", tags); - } - } - } } diff --git a/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java b/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java index 2aca64c..98223ce 100644 --- a/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java +++ b/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java @@ -4,6 +4,8 @@ import lance5057.tDefense.TinkersDefense; import lance5057.tDefense.armor.blocks.GlowstoneCrumbs; import lance5057.tDefense.armor.blocks.UnstableBlock; import lance5057.tDefense.armor.blocks.UnstableItemBlock; +import lance5057.tDefense.armor.events.ArmorModEvents; +import lance5057.tDefense.armor.events.ArmorRenderEvent; import lance5057.tDefense.armor.items.Sheath; import lance5057.tDefense.armor.items.TinkersGauntlets; import lance5057.tDefense.armor.items.cloth.TinkersHood; @@ -23,6 +25,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.common.MinecraftForge; import tconstruct.client.FlexibleToolRenderer; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; @@ -32,6 +35,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; public class TDArmorAddon { @@ -75,6 +79,13 @@ public class TDArmorAddon }; + if(e.getSide() == Side.CLIENT) + { + MinecraftForge.EVENT_BUS.register(new ArmorRenderEvent()); + } + + MinecraftForge.EVENT_BUS.register(new ArmorModEvents()); + armor_TinkerHelm = new TinkersHelm(); armor_TinkerBreastplate = new TinkersBreastplate(); armor_TinkerGrieves = new TinkersGrieves(); diff --git a/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java b/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java index fd15b98..c2ee519 100644 --- a/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java +++ b/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java @@ -2,6 +2,7 @@ package lance5057.tDefense.armor.events; import lance5057.tDefense.TinkersDefense; import lance5057.tDefense.armor.ArmorCore; +import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -9,10 +10,40 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraftforge.event.entity.living.LivingHurtEvent; +import tconstruct.library.event.ToolCraftEvent.NormalTool; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ArmorModEvents { + @SideOnly(Side.CLIENT) + @SubscribeEvent + public void ToolCraftedEvent(NormalTool event) + { + if(event.tool instanceof ArmorCore) + { + final ArmorCore armor = (ArmorCore) event.tool; + final ArmorRenderer render = armor.getRenderer(); + final NBTTagCompound tooltags = event.toolTag; + final NBTTagCompound tags = armor.getRenderer().defaultTags;//stack.setTagCompound(); + + // for(int i = 0; i < render.defaultTags.; i++) + // { + // final String rendertag = ((ModelRenderer) render.boxList.get(i)).boxName; + // if(rendertag != null) + // { + // tags.setBoolean(rendertag, ((ModelRenderer) render.boxList.get(i)).isHidden); + // } + // } + + if(!tags.hasNoTags()) + { + tooltags.setTag("ArmorRenderer", tags); + } + } + } + @SubscribeEvent public void AddProtections(LivingHurtEvent event) { diff --git a/src/main/java/lance5057/tDefense/armor/items/Sheath.java b/src/main/java/lance5057/tDefense/armor/items/Sheath.java index ca4b44e..165c187 100644 --- a/src/main/java/lance5057/tDefense/armor/items/Sheath.java +++ b/src/main/java/lance5057/tDefense/armor/items/Sheath.java @@ -96,6 +96,7 @@ public class Sheath extends ArmorCore implements IAccessory } @Override + @SideOnly(Side.CLIENT) public ArmorRenderer getRenderer() { // TODO Auto-generated method stub diff --git a/src/main/java/lance5057/tDefense/armor/items/TinkersGauntlets.java b/src/main/java/lance5057/tDefense/armor/items/TinkersGauntlets.java index 91f10f1..f516225 100644 --- a/src/main/java/lance5057/tDefense/armor/items/TinkersGauntlets.java +++ b/src/main/java/lance5057/tDefense/armor/items/TinkersGauntlets.java @@ -9,6 +9,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import tconstruct.library.accessory.IAccessory; import tconstruct.tools.TinkerTools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TinkersGauntlets extends ArmorCore implements IAccessory { @@ -111,6 +113,7 @@ public class TinkersGauntlets extends ArmorCore implements IAccessory // } @Override + @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { return "tinkersdefense:textures/armor/Tinkersgauntlet.png"; @@ -123,6 +126,7 @@ public class TinkersGauntlets extends ArmorCore implements IAccessory } @Override + @SideOnly(Side.CLIENT) public ArmorRenderer getRenderer() { return ClientProxy.gauntlets; diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java index 7259d48..756237d 100644 --- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java +++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java @@ -19,6 +19,8 @@ import vazkii.botania.api.mana.IManaDiscountArmor; import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles; import WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge; import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true)}) public class TinkersHood extends ArmorCore implements IRevealer, IGoggles, ILPGauge, IAlchemyGoggles, IVisDiscountGear, IManaDiscountArmor @@ -115,6 +117,7 @@ public class TinkersHood extends ArmorCore implements IRevealer, IGoggles, ILPGa // } @Override + @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { return "tinkersdefense:textures/armor/TinkersHood.png"; @@ -140,6 +143,7 @@ public class TinkersHood extends ArmorCore implements IRevealer, IGoggles, ILPGa } @Override + @SideOnly(Side.CLIENT) public ArmorRenderer getRenderer() { return ClientProxy.hood; diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java index 28027cd..bad02bd 100644 --- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java +++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java @@ -12,6 +12,8 @@ import thaumcraft.api.IVisDiscountGear; import thaumcraft.api.aspects.Aspect; import vazkii.botania.api.mana.IManaDiscountArmor; import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true)}) public class TinkersRobe extends ArmorCore implements IVisDiscountGear, IManaDiscountArmor @@ -108,6 +110,7 @@ public class TinkersRobe extends ArmorCore implements IVisDiscountGear, IManaDis // } @Override + @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { return "tinkersdefense:textures/armor/TinkersRobe.png"; @@ -134,6 +137,7 @@ public class TinkersRobe extends ArmorCore implements IVisDiscountGear, IManaDis } @Override + @SideOnly(Side.CLIENT) public ArmorRenderer getRenderer() { return ClientProxy.robe; diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java index 8df9b42..17b84a2 100644 --- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java +++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java @@ -12,6 +12,8 @@ import thaumcraft.api.IVisDiscountGear; import thaumcraft.api.aspects.Aspect; import vazkii.botania.api.mana.IManaDiscountArmor; import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true)}) public class TinkersShawl extends ArmorCore implements IVisDiscountGear, IManaDiscountArmor @@ -109,6 +111,7 @@ public class TinkersShawl extends ArmorCore implements IVisDiscountGear, IManaDi // } @Override + @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { return "tinkersdefense:textures/armor/TinkersShawl.png"; @@ -135,6 +138,7 @@ public class TinkersShawl extends ArmorCore implements IVisDiscountGear, IManaDi } @Override + @SideOnly(Side.CLIENT) public ArmorRenderer getRenderer() { // TODO Auto-generated method stub diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java index 8f4f795..a0c77ff 100644 --- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java +++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java @@ -12,6 +12,8 @@ import thaumcraft.api.IVisDiscountGear; import thaumcraft.api.aspects.Aspect; import vazkii.botania.api.mana.IManaDiscountArmor; import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true)}) public class TinkersShoes extends ArmorCore implements IVisDiscountGear, IManaDiscountArmor @@ -108,6 +110,7 @@ public class TinkersShoes extends ArmorCore implements IVisDiscountGear, IManaDi // } @Override + @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { return "tinkersdefense:textures/armor/TinkersShoes.png"; @@ -133,6 +136,7 @@ public class TinkersShoes extends ArmorCore implements IVisDiscountGear, IManaDi } @Override + @SideOnly(Side.CLIENT) public ArmorRenderer getRenderer() { return ClientProxy.shoes; diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersBreastplate.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersBreastplate.java index fa1c2e5..af6ccfb 100644 --- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersBreastplate.java +++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersBreastplate.java @@ -8,6 +8,8 @@ import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import tconstruct.tools.TinkerTools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TinkersBreastplate extends ArmorCore { @@ -106,6 +108,7 @@ public class TinkersBreastplate extends ArmorCore } @Override + @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { return "tinkersdefense:textures/armor/Tinkersbreastplate.png"; @@ -118,6 +121,7 @@ public class TinkersBreastplate extends ArmorCore } @Override + @SideOnly(Side.CLIENT) public ArmorRenderer getRenderer() { return ClientProxy.breastplate; diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java index 7bfa98c..3a019c8 100644 --- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java +++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java @@ -8,6 +8,8 @@ import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import tconstruct.tools.TinkerTools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TinkersGrieves extends ArmorCore { @@ -113,6 +115,7 @@ public class TinkersGrieves extends ArmorCore // } @Override + @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { return "tinkersdefense:textures/armor/TinkersGrieves.png"; @@ -125,6 +128,7 @@ public class TinkersGrieves extends ArmorCore } @Override + @SideOnly(Side.CLIENT) public ArmorRenderer getRenderer() { return ClientProxy.grieves; diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java index 12fed96..02754bf 100644 --- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java +++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java @@ -16,6 +16,8 @@ import thaumcraft.api.nodes.IRevealer; import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles; import WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge; import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles", striprefs = true)}) public class TinkersHelm extends ArmorCore implements IRevealer, IGoggles, ILPGauge, IAlchemyGoggles @@ -122,6 +124,7 @@ public class TinkersHelm extends ArmorCore implements IRevealer, IGoggles, ILPGa // } @Override + @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { return "tinkersdefense:textures/armor/TinkersHelm.png"; @@ -134,6 +137,7 @@ public class TinkersHelm extends ArmorCore implements IRevealer, IGoggles, ILPGa } @Override + @SideOnly(Side.CLIENT) public ArmorRenderer getRenderer() { return ClientProxy.helm; diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java index 35a3348..c7f83d0 100644 --- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java +++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java @@ -8,6 +8,8 @@ import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import tconstruct.tools.TinkerTools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TinkersSabatons extends ArmorCore { @@ -113,6 +115,7 @@ public class TinkersSabatons extends ArmorCore // } @Override + @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { return "tinkersdefense:textures/armor/TinkersSabatons.png"; @@ -125,6 +128,7 @@ public class TinkersSabatons extends ArmorCore } @Override + @SideOnly(Side.CLIENT) public ArmorRenderer getRenderer() { return ClientProxy.sabatons; diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java index f84bc3e..4043a06 100644 --- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java +++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java @@ -8,6 +8,8 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TinkersBoots extends ArmorCore { @@ -105,6 +107,7 @@ public class TinkersBoots extends ArmorCore // } @Override + @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { return "tinkersdefense:textures/armor/TinkersBoots.png"; @@ -123,6 +126,7 @@ public class TinkersBoots extends ArmorCore } @Override + @SideOnly(Side.CLIENT) public ArmorRenderer getRenderer() { return ClientProxy.boots; diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java index a088f54..3786d7f 100644 --- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java +++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java @@ -10,6 +10,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TinkersChausses extends ArmorCore { @@ -107,6 +109,7 @@ public class TinkersChausses extends ArmorCore // } @Override + @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { return "tinkersdefense:textures/armor/TinkersChausses.png"; @@ -133,6 +136,7 @@ public class TinkersChausses extends ArmorCore } @Override + @SideOnly(Side.CLIENT) public ArmorRenderer getRenderer() { return ClientProxy.chausses; diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java index 5014bf9..4489fdf 100644 --- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java +++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java @@ -17,6 +17,8 @@ import thaumcraft.api.nodes.IRevealer; import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles; import WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge; import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles", striprefs = true)}) public class TinkersCoif extends ArmorCore implements IRevealer, IGoggles, ILPGauge, IAlchemyGoggles @@ -115,6 +117,7 @@ public class TinkersCoif extends ArmorCore implements IRevealer, IGoggles, ILPGa // } @Override + @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { return "tinkersdefense:textures/armor/TinkersCoif.png"; @@ -141,6 +144,7 @@ public class TinkersCoif extends ArmorCore implements IRevealer, IGoggles, ILPGa } @Override + @SideOnly(Side.CLIENT) public ArmorRenderer getRenderer() { // TODO Auto-generated method stub diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java index 490e649..94c2b5f 100644 --- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java +++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java @@ -9,6 +9,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import tconstruct.tools.TinkerTools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TinkersHauberk extends ArmorCore { @@ -106,6 +108,7 @@ public class TinkersHauberk extends ArmorCore // } @Override + @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { return "tinkersdefense:textures/armor/TinkersHauberk.png"; @@ -124,6 +127,7 @@ public class TinkersHauberk extends ArmorCore } @Override + @SideOnly(Side.CLIENT) public ArmorRenderer getRenderer() { return ClientProxy.hauberk; diff --git a/src/main/java/lance5057/tDefense/armor/renderers/ArmorRenderer.java b/src/main/java/lance5057/tDefense/armor/renderers/ArmorRenderer.java index 6ffce2f..2cace5c 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/ArmorRenderer.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/ArmorRenderer.java @@ -23,7 +23,6 @@ public class ArmorRenderer extends ModelBiped private final int[] order = new int[] {1, 2, 3, 0, 4, 5, 6, 7, 8, 9}; public List<ModelRenderer> boxes = new ArrayList<ModelRenderer>(); - public NBTTagCompound defaultTags = new NBTTagCompound(); public ArmorRenderer(float a, float b, int c, int d) |