From c643397864a0970a55f1c7d4587a0056b15a9aa6 Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Sun, 2 Feb 2014 17:15:41 -0500 Subject: [PATCH] Got items to render in the charger --- .../core/render/RenderItemOverlayTile.java | 10 +-- .../electrical/ClientProxy.java | 90 +++++++++---------- .../mechanical/belt/RenderCharger.java | 2 +- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/main/java/resonantinduction/core/render/RenderItemOverlayTile.java b/src/main/java/resonantinduction/core/render/RenderItemOverlayTile.java index 7510d115..651046bf 100644 --- a/src/main/java/resonantinduction/core/render/RenderItemOverlayTile.java +++ b/src/main/java/resonantinduction/core/render/RenderItemOverlayTile.java @@ -32,7 +32,7 @@ public abstract class RenderItemOverlayTile extends TileEntitySpecialRenderer private final RenderBlocks renderBlocks; private final RenderItem renderItem; - private RenderItemOverlayTile() + public RenderItemOverlayTile() { super(); renderItem = ((RenderItem) RenderManager.instance.getEntityClassRenderObject(EntityItem.class)); @@ -93,7 +93,7 @@ public abstract class RenderItemOverlayTile extends TileEntitySpecialRenderer { renderItemOnSides(tile, itemStack, x, y, z, "No Output"); } - + public void renderItemOnSides(TileEntity tile, ItemStack itemStack, double x, double y, double z, String renderText) { /** Render the Output */ @@ -111,7 +111,7 @@ public abstract class RenderItemOverlayTile extends TileEntitySpecialRenderer { continue; } - this.renderItemOnSide(tile, renderItem, itemStack, direction, x, y, z, renderText, amount); + this.renderItemOnSide(tile, itemStack, direction, x, y, z, renderText, amount); RenderUtility.renderText(renderText, direction, 0.02f, x, y - 0.35f, z); RenderUtility.renderText(amount, direction, 0.02f, x, y - 0.15f, z); } @@ -129,14 +129,14 @@ public abstract class RenderItemOverlayTile extends TileEntitySpecialRenderer amount = Integer.toString(itemStack.stackSize); } - this.renderItemOnSide(tile, renderItem, itemStack, direction, x, y, z, renderText, amount); + this.renderItemOnSide(tile, itemStack, direction, x, y, z, renderText, amount); RenderUtility.renderText(renderText, direction, 0.02f, x, y - 0.35f, z); RenderUtility.renderText(amount, direction, 0.02f, x, y - 0.15f, z); } } - protected void renderItemOnSide(TileEntity tile, RenderItem renderItem, ItemStack itemStack, ForgeDirection direction, double x, double y, double z, String renderText, String amount) + protected void renderItemOnSide(TileEntity tile, ItemStack itemStack, ForgeDirection direction, double x, double y, double z, String renderText, String amount) { this.setupLight(tile, direction.offsetX, direction.offsetZ); diff --git a/src/main/java/resonantinduction/electrical/ClientProxy.java b/src/main/java/resonantinduction/electrical/ClientProxy.java index 0fb7bc1b..08633d8a 100644 --- a/src/main/java/resonantinduction/electrical/ClientProxy.java +++ b/src/main/java/resonantinduction/electrical/ClientProxy.java @@ -7,6 +7,7 @@ import net.minecraftforge.client.MinecraftForgeClient; import resonantinduction.core.render.RenderRIItem; import resonantinduction.electrical.battery.RenderBattery; import resonantinduction.electrical.battery.TileBattery; +import resonantinduction.electrical.charger.TileCharger; import resonantinduction.electrical.encoder.TileEncoder; import resonantinduction.electrical.encoder.gui.GuiEncoderInventory; import resonantinduction.electrical.generator.solar.RenderSolarPanel; @@ -18,6 +19,7 @@ import resonantinduction.electrical.multimeter.PartMultimeter; import resonantinduction.electrical.render.FXElectricBolt; import resonantinduction.electrical.tesla.RenderTesla; import resonantinduction.electrical.tesla.TileTesla; +import resonantinduction.mechanical.belt.RenderCharger; import universalelectricity.api.vector.Vector3; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; @@ -26,58 +28,56 @@ import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -/** - * @author Calclavia - * - */ +/** @author Calclavia */ @SideOnly(Side.CLIENT) public class ClientProxy extends CommonProxy { - @Override - public void preInit() - { - MinecraftForgeClient.registerItemRenderer(Electrical.blockBattery.blockID, RenderRIItem.INSTANCE); - MinecraftForgeClient.registerItemRenderer(Electrical.itemMultimeter.itemID, RenderRIItem.INSTANCE); - MinecraftForgeClient.registerItemRenderer(Electrical.itemTransformer.itemID, RenderRIItem.INSTANCE); - ClientRegistry.bindTileEntitySpecialRenderer(TileTesla.class, new RenderTesla()); - ClientRegistry.bindTileEntitySpecialRenderer(TileLevitator.class, new RenderLevitator()); - ClientRegistry.bindTileEntitySpecialRenderer(TileBattery.class, new RenderBattery()); - ClientRegistry.bindTileEntitySpecialRenderer(TileSolarPanel.class, new RenderSolarPanel()); - } + @Override + public void preInit() + { + MinecraftForgeClient.registerItemRenderer(Electrical.blockBattery.blockID, RenderRIItem.INSTANCE); + MinecraftForgeClient.registerItemRenderer(Electrical.itemMultimeter.itemID, RenderRIItem.INSTANCE); + MinecraftForgeClient.registerItemRenderer(Electrical.itemTransformer.itemID, RenderRIItem.INSTANCE); + ClientRegistry.bindTileEntitySpecialRenderer(TileTesla.class, new RenderTesla()); + ClientRegistry.bindTileEntitySpecialRenderer(TileLevitator.class, new RenderLevitator()); + ClientRegistry.bindTileEntitySpecialRenderer(TileBattery.class, new RenderBattery()); + ClientRegistry.bindTileEntitySpecialRenderer(TileSolarPanel.class, new RenderSolarPanel()); + ClientRegistry.bindTileEntitySpecialRenderer(TileCharger.class, new RenderCharger()); + } - @Override - public void postInit() - { - } + @Override + public void postInit() + { + } - @Override - public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) - { - TileEntity tileEntity = world.getBlockTileEntity(x, y, z); + @Override + public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) + { + TileEntity tileEntity = world.getBlockTileEntity(x, y, z); - if (tileEntity instanceof TileMultipart) - { - TMultiPart part = ((TileMultipart) tileEntity).partMap(id); + if (tileEntity instanceof TileMultipart) + { + TMultiPart part = ((TileMultipart) tileEntity).partMap(id); - if (part instanceof PartMultimeter) - { - return new GuiMultimeter(player.inventory, (PartMultimeter) part); - } - } - else if (tileEntity instanceof TileEncoder) - { - return new GuiEncoderInventory(player.inventory, (TileEncoder) tileEntity); - } + if (part instanceof PartMultimeter) + { + return new GuiMultimeter(player.inventory, (PartMultimeter) part); + } + } + else if (tileEntity instanceof TileEncoder) + { + return new GuiEncoderInventory(player.inventory, (TileEncoder) tileEntity); + } - return null; - } + return null; + } - @Override - public void renderElectricShock(World world, Vector3 start, Vector3 target, float r, float g, float b, boolean split) - { - if (world.isRemote) - { - FMLClientHandler.instance().getClient().effectRenderer.addEffect(new FXElectricBolt(world, start, target, split).setColor(r, g, b)); - } - } + @Override + public void renderElectricShock(World world, Vector3 start, Vector3 target, float r, float g, float b, boolean split) + { + if (world.isRemote) + { + FMLClientHandler.instance().getClient().effectRenderer.addEffect(new FXElectricBolt(world, start, target, split).setColor(r, g, b)); + } + } } diff --git a/src/main/java/resonantinduction/mechanical/belt/RenderCharger.java b/src/main/java/resonantinduction/mechanical/belt/RenderCharger.java index 46157ffd..acddff92 100644 --- a/src/main/java/resonantinduction/mechanical/belt/RenderCharger.java +++ b/src/main/java/resonantinduction/mechanical/belt/RenderCharger.java @@ -12,7 +12,7 @@ public class RenderCharger extends RenderItemOverlayTile { if (tile instanceof TileCharger) { - renderItemOnSides(tile, ((TileCharger) tile).getStackInSlot(0), x, y, z); + this.renderItemSingleSide(tile, x, y, z, ((TileCharger)tile).getStackInSlot(0), ((TileCharger)tile).getDirection(), "IDLE"); } }