diff --git a/electrical/src/main/java/resonantinduction/electrical/battery/RenderBattery.java b/electrical/src/main/java/resonantinduction/electrical/battery/RenderBattery.java index 7e8fdcbd..66c241b9 100644 --- a/electrical/src/main/java/resonantinduction/electrical/battery/RenderBattery.java +++ b/electrical/src/main/java/resonantinduction/electrical/battery/RenderBattery.java @@ -71,6 +71,7 @@ public class RenderBattery extends TileEntitySpecialRenderer implements ISimpleI { final String[][] partToDisable = new String[][] { new String[] { "bottom" }, new String[] { "top" }, new String[] { "frame1", "frame2" }, new String[] { "frame3", "frame4" }, new String[] { "frame4", "frame1" }, new String[] { "frame2", "frame3" } }; final String[][] connectionPartToEnable = new String[][] { null, null, new String[] { "frame1con", "frame2con" }, new String[] { "frame3con", "frame4con" }, new String[] { "frame4con", "frame1con" }, new String[] { "frame2con", "frame3con" } }; + //final String[][] connectionPartSideToEnable = new String[][] { null, null, new String[] { "frame1conSide", "frame2conSide" }, new String[] { "frame3conSide", "frame4conSide" }, new String[] { "frame4conSide", "frame1conSide" }, new String[] { "frame2conSide", "frame3conSide" } }; GL11.glPushMatrix(); GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); @@ -107,7 +108,10 @@ public class RenderBattery extends TileEntitySpecialRenderer implements ISimpleI if (sideCheck.offsetY == 0) { if (new Vector3(t).translate(sideCheck).getTileEntity(t.worldObj) instanceof TileBattery) + { connectionParts.removeAll(Arrays.asList(connectionPartToEnable[sideCheck.ordinal()])); + //connectionParts.addAll(Arrays.asList(connectionPartSideToEnable[sideCheck.ordinal()])); + } } } diff --git a/electrical/src/main/java/resonantinduction/electrical/battery/TileBattery.java b/electrical/src/main/java/resonantinduction/electrical/battery/TileBattery.java index b877225c..8127962a 100644 --- a/electrical/src/main/java/resonantinduction/electrical/battery/TileBattery.java +++ b/electrical/src/main/java/resonantinduction/electrical/battery/TileBattery.java @@ -48,7 +48,7 @@ public class TileBattery extends TileEnergyDistribution implements IVoltageInput */ public static long getEnergyForTier(int tier) { - return (long) Math.pow(100000000, (tier / (MAX_TIER + 0.25f)) + 1); + return (long) (Math.round(Math.pow(500000000, (tier / (MAX_TIER + 0.7f)) + 1) / (500000000)) * (500000000)); } @Override diff --git a/src/main/resources/assets/resonantinduction/models/battery/battery.tcn b/src/main/resources/assets/resonantinduction/models/battery/battery.tcn index ff57a16f..32cfdde0 100644 Binary files a/src/main/resources/assets/resonantinduction/models/battery/battery.tcn and b/src/main/resources/assets/resonantinduction/models/battery/battery.tcn differ