diff --git a/src/main/java/storagecraft/proxy/ClientProxy.java b/src/main/java/storagecraft/proxy/ClientProxy.java index 73b929436..1a3a41d99 100755 --- a/src/main/java/storagecraft/proxy/ClientProxy.java +++ b/src/main/java/storagecraft/proxy/ClientProxy.java @@ -13,12 +13,10 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import storagecraft.StorageCraftBlocks; import storagecraft.StorageCraftItems; -import storagecraft.block.BlockController; import storagecraft.block.EnumControllerType; import storagecraft.block.EnumGridType; import storagecraft.item.*; import storagecraft.render.BlockCableRenderer; -import storagecraft.render.ItemCableRenderer; import storagecraft.tile.TileCable; public class ClientProxy extends CommonProxy @@ -69,8 +67,6 @@ public class ClientProxy extends CommonProxy ); ClientRegistry.bindTileEntitySpecialRenderer(TileCable.class, new BlockCableRenderer()); - - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(StorageCraftBlocks.CABLE), new ItemCableRenderer()); } @Override diff --git a/src/main/java/storagecraft/render/ItemCableRenderer.java b/src/main/java/storagecraft/render/ItemCableRenderer.java deleted file mode 100755 index 975c03785..000000000 --- a/src/main/java/storagecraft/render/ItemCableRenderer.java +++ /dev/null @@ -1,33 +0,0 @@ -package storagecraft.render; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.IItemRenderer; -import org.lwjgl.opengl.GL11; -import storagecraft.render.model.CableModel; - -public class ItemCableRenderer implements IItemRenderer -{ - public static final CableModel CABLE_MODEL = new CableModel(); - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) - { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) - { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) - { - GL11.glPushMatrix(); - - CABLE_MODEL.render(item, 0.0625F); - - GL11.glPopMatrix(); - } -} diff --git a/src/main/java/storagecraft/render/model/CableModel.java b/src/main/java/storagecraft/render/model/CableModel.java index 1a465cb6d..a333cc0db 100755 --- a/src/main/java/storagecraft/render/model/CableModel.java +++ b/src/main/java/storagecraft/render/model/CableModel.java @@ -53,28 +53,6 @@ public class CableModel extends ModelBase west.setTextureSize(16, 16); } - public void render(ItemStack cable, float x) - { - if (cable.getItemDamage() == 1) - { - Minecraft.getMinecraft().renderEngine.bindTexture(CABLE_UNPOWERED_RESOURCE); - } - else - { - Minecraft.getMinecraft().renderEngine.bindTexture(CABLE_RESOURCE); - } - - core.render(x); - - if (cable.getItemDamage() == 1) - { - Minecraft.getMinecraft().renderEngine.bindTexture(CABLE_RESOURCE); - } - - north.render(x); - south.render(x); - } - public void render(TileCable cable, float x) { if (cable.isSensitiveCable())