From 5b1a07066409f190fa6af099bd2a191f45398cb5 Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Mon, 5 Aug 2013 13:16:39 -0400 Subject: [PATCH] Cells now render dynamically on battery --- .../textures/gui/batterybox_gui.png | Bin 5863 -> 5889 bytes src/resonantinduction/ResonantInduction.java | 2 +- .../battery/BlockBattery.java | 2 +- .../multimeter/BlockMultimeter.java | 2 +- .../render/RenderBattery.java | 14 +++++++++----- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/resources/assets/resonantinduction/textures/gui/batterybox_gui.png b/resources/assets/resonantinduction/textures/gui/batterybox_gui.png index b0e31bbc0e0319a9af28da6ebb60aef7b012d9e4..c4b64bbd845afe7c14e27600ccedc436b90648c1 100644 GIT binary patch delta 4826 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 delta 4800 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 diff --git a/src/resonantinduction/ResonantInduction.java b/src/resonantinduction/ResonantInduction.java index 50a6e902..ec87bbd8 100644 --- a/src/resonantinduction/ResonantInduction.java +++ b/src/resonantinduction/ResonantInduction.java @@ -62,7 +62,7 @@ public class ResonantInduction public static final String VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + REVISION_VERSION; @Instance(ID) - public static ResonantInduction INSTNACE; + public static ResonantInduction INSTANCE; @SidedProxy(clientSide = ID + ".ClientProxy", serverSide = ID + ".CommonProxy") public static CommonProxy proxy; diff --git a/src/resonantinduction/battery/BlockBattery.java b/src/resonantinduction/battery/BlockBattery.java index ccc3b70a..26659af6 100644 --- a/src/resonantinduction/battery/BlockBattery.java +++ b/src/resonantinduction/battery/BlockBattery.java @@ -100,7 +100,7 @@ public class BlockBattery extends BlockBase implements ITileEntityProvider if(!world.isRemote) { - entityPlayer.openGui(ResonantInduction.INSTNACE, 0, world, x, y, z); + entityPlayer.openGui(ResonantInduction.INSTANCE, 0, world, x, y, z); } return true; diff --git a/src/resonantinduction/multimeter/BlockMultimeter.java b/src/resonantinduction/multimeter/BlockMultimeter.java index a0927087..3b353304 100644 --- a/src/resonantinduction/multimeter/BlockMultimeter.java +++ b/src/resonantinduction/multimeter/BlockMultimeter.java @@ -47,7 +47,7 @@ public class BlockMultimeter extends BlockBase implements ITileEntityProvider } else { - entityPlayer.openGui(ResonantInduction.INSTNACE, 0, world, x, y, z); + entityPlayer.openGui(ResonantInduction.INSTANCE, 0, world, x, y, z); } return true; diff --git a/src/resonantinduction/render/RenderBattery.java b/src/resonantinduction/render/RenderBattery.java index faa3b3a1..0f549ddc 100644 --- a/src/resonantinduction/render/RenderBattery.java +++ b/src/resonantinduction/render/RenderBattery.java @@ -71,9 +71,13 @@ public class RenderBattery extends TileEntitySpecialRenderer MODEL.render(0.0625f); GL11.glPopMatrix(); - int renderAmount = 16; - - itemRender: + int renderAmount = Math.min(((TileEntityBattery)t).clientCells, 16); + + if(renderAmount == 0) + { + return; + } + for (int i = 2; i < 6; i++) { ForgeDirection direction = ForgeDirection.getOrientation(i); @@ -130,9 +134,9 @@ public class RenderBattery extends TileEntitySpecialRenderer this.renderItemSimple(this.fakeBattery); GL11.glPopMatrix(); - if (renderAmount-- <= 0) + if (--renderAmount == 0) { - break itemRender; + return; } } }