diff --git a/src/main/java/tconstruct/items/tools/BattleSign.java b/src/main/java/tconstruct/items/tools/BattleSign.java index dcf3ca33..1c829c22 100644 --- a/src/main/java/tconstruct/items/tools/BattleSign.java +++ b/src/main/java/tconstruct/items/tools/BattleSign.java @@ -36,13 +36,6 @@ public class BattleSign extends Weapon return null; } - @SideOnly(Side.CLIENT) - @Override - public int getRenderPasses (int metadata) - { - return 8; - } - @Override public int getPartAmount () { diff --git a/src/main/java/tconstruct/items/tools/Battleaxe.java b/src/main/java/tconstruct/items/tools/Battleaxe.java index b1ce85cd..db60aa6a 100644 --- a/src/main/java/tconstruct/items/tools/Battleaxe.java +++ b/src/main/java/tconstruct/items/tools/Battleaxe.java @@ -103,13 +103,6 @@ public class Battleaxe extends AOEHarvestTool implements IBattlegearWeapon return 2.5f; } - @SideOnly(Side.CLIENT) - @Override - public int getRenderPasses (int metadata) - { - return 10; - } - @Override public int getPartAmount () { diff --git a/src/main/java/tconstruct/items/tools/BowBase.java b/src/main/java/tconstruct/items/tools/BowBase.java index 7d8bf8a2..456d2966 100644 --- a/src/main/java/tconstruct/items/tools/BowBase.java +++ b/src/main/java/tconstruct/items/tools/BowBase.java @@ -33,13 +33,6 @@ public abstract class BowBase extends ToolCore return 2; } - @SideOnly(Side.CLIENT) - @Override - public int getRenderPasses (int metadata) - { - return 10; - } - /* Bow usage */ @Override public void onPlayerStoppedUsing (ItemStack stack, World world, EntityPlayer player, int useRemaining) @@ -222,13 +215,6 @@ public abstract class BowBase extends ToolCore return stack; } - @SideOnly(Side.CLIENT) - @Override - public boolean requiresMultipleRenderPasses () - { - return true; - } - /* Rendering */ @Override public void registerIcons (IIconRegister iconRegister) diff --git a/src/main/java/tconstruct/items/tools/Chisel.java b/src/main/java/tconstruct/items/tools/Chisel.java index 3084bc5d..d7efa760 100644 --- a/src/main/java/tconstruct/items/tools/Chisel.java +++ b/src/main/java/tconstruct/items/tools/Chisel.java @@ -157,13 +157,6 @@ public class Chisel extends ToolCore return EnumAction.eat; } - @SideOnly(Side.CLIENT) - @Override - public int getRenderPasses (int metadata) - { - return 8; - } - @Override public int getPartAmount () { diff --git a/src/main/java/tconstruct/items/tools/Cleaver.java b/src/main/java/tconstruct/items/tools/Cleaver.java index ed9de6c7..4f4523f0 100644 --- a/src/main/java/tconstruct/items/tools/Cleaver.java +++ b/src/main/java/tconstruct/items/tools/Cleaver.java @@ -71,13 +71,6 @@ public class Cleaver extends Weapon return 1.4f; } - @SideOnly(Side.CLIENT) - @Override - public int getRenderPasses (int metadata) - { - return 10; - } - @Override public int getPartAmount () { diff --git a/src/main/java/tconstruct/items/tools/Excavator.java b/src/main/java/tconstruct/items/tools/Excavator.java index e300a794..ea19b967 100644 --- a/src/main/java/tconstruct/items/tools/Excavator.java +++ b/src/main/java/tconstruct/items/tools/Excavator.java @@ -85,13 +85,6 @@ public class Excavator extends AOEHarvestTool return 1; } - @SideOnly(Side.CLIENT) - @Override - public int getRenderPasses (int metadata) - { - return 10; - } - @Override public int getPartAmount () { diff --git a/src/main/java/tconstruct/items/tools/FryingPan.java b/src/main/java/tconstruct/items/tools/FryingPan.java index 3f366a97..07d743c0 100644 --- a/src/main/java/tconstruct/items/tools/FryingPan.java +++ b/src/main/java/tconstruct/items/tools/FryingPan.java @@ -146,13 +146,6 @@ public class FryingPan extends Weapon return null; } - @SideOnly(Side.CLIENT) - @Override - public int getRenderPasses (int metadata) - { - return 8; - } - @Override public int getPartAmount () { diff --git a/src/main/java/tconstruct/items/tools/Hammer.java b/src/main/java/tconstruct/items/tools/Hammer.java index cd68347a..d0d2a2a9 100644 --- a/src/main/java/tconstruct/items/tools/Hammer.java +++ b/src/main/java/tconstruct/items/tools/Hammer.java @@ -29,13 +29,6 @@ public class Hammer extends AOEHarvestTool this.setUnlocalizedName("InfiTool.Hammer"); } - @SideOnly(Side.CLIENT) - @Override - public int getRenderPasses (int metadata) - { - return 10; - } - @Override public int getPartAmount () { diff --git a/src/main/java/tconstruct/items/tools/Hatchet.java b/src/main/java/tconstruct/items/tools/Hatchet.java index 0b90bc92..2ec097d8 100644 --- a/src/main/java/tconstruct/items/tools/Hatchet.java +++ b/src/main/java/tconstruct/items/tools/Hatchet.java @@ -52,13 +52,6 @@ public class Hatchet extends HarvestTool return null; } - @SideOnly(Side.CLIENT) - @Override - public int getRenderPasses (int metadata) - { - return 8; - } - @Override public int getPartAmount () { diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java index 260ad91e..2d7cc4c4 100644 --- a/src/main/java/tconstruct/items/tools/LumberAxe.java +++ b/src/main/java/tconstruct/items/tools/LumberAxe.java @@ -223,13 +223,6 @@ public class LumberAxe extends AOEHarvestTool return TinkerTools.toughBinding; } - @SideOnly(Side.CLIENT) - @Override - public int getRenderPasses (int metadata) - { - return 10; - } - @Override public int getPartAmount () { diff --git a/src/main/java/tconstruct/items/tools/Scythe.java b/src/main/java/tconstruct/items/tools/Scythe.java index baf53b8f..26731541 100644 --- a/src/main/java/tconstruct/items/tools/Scythe.java +++ b/src/main/java/tconstruct/items/tools/Scythe.java @@ -67,13 +67,6 @@ public class Scythe extends Weapon return TinkerTools.toughRod; } - @SideOnly(Side.CLIENT) - @Override - public int getRenderPasses (int metadata) - { - return 10; - } - @Override public int getPartAmount () { diff --git a/src/main/java/tconstruct/items/tools/Shovel.java b/src/main/java/tconstruct/items/tools/Shovel.java index bcbda3c5..2ec2fc08 100644 --- a/src/main/java/tconstruct/items/tools/Shovel.java +++ b/src/main/java/tconstruct/items/tools/Shovel.java @@ -40,13 +40,6 @@ public class Shovel extends HarvestTool return null; } - @SideOnly(Side.CLIENT) - @Override - public int getRenderPasses (int metadata) - { - return 8; - } - @Override public int getPartAmount () { diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index 6bd4960e..45ae2c9b 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -142,12 +142,12 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq @Override public boolean requiresMultipleRenderPasses () { - return true; + return false; } @SideOnly(Side.CLIENT) @Override - public int getRenderPasses (int metadata) + public final int getRenderPasses (int metadata) { return 0; } diff --git a/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java b/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java index 0ea3e427..8cf9fdff 100644 --- a/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java +++ b/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java @@ -58,6 +58,8 @@ public class WeaponryClientProxy extends WeaponryCommonProxy { MinecraftForgeClient.registerItemRenderer(TinkerWeaponry.arrowAmmo, renderer); MinecraftForgeClient.registerItemRenderer(TinkerWeaponry.boltAmmo, renderer); + + //MinecraftForgeClient.registerItemRenderer(TinkerWeaponry.boneana, ); } private void registerEntityRendering() diff --git a/src/main/java/tconstruct/weaponry/items/Boneana.java b/src/main/java/tconstruct/weaponry/items/Boneana.java index b5d6391c..ae8f4aa3 100644 --- a/src/main/java/tconstruct/weaponry/items/Boneana.java +++ b/src/main/java/tconstruct/weaponry/items/Boneana.java @@ -33,6 +33,11 @@ public class Boneana extends Broadsword { return itemIcon; } + @Override + public IIcon getIconIndex(ItemStack stack) { + return getIcon(stack, 0); + } + @Override public String getLocalizedToolName() { return "Bonæna";