diff --git a/src/main/java/resonantinduction/electrical/multimeter/MultimeterNetwork.java b/src/main/java/resonantinduction/electrical/multimeter/MultimeterNetwork.java index 874d8c44..61ce1be2 100644 --- a/src/main/java/resonantinduction/electrical/multimeter/MultimeterNetwork.java +++ b/src/main/java/resonantinduction/electrical/multimeter/MultimeterNetwork.java @@ -49,6 +49,7 @@ public class MultimeterNetwork extends Network conductor = ((IConductor) tileEntity).getInstance(receivingSide.getOpposite()); + IConnector instance = ((IConductor) tileEntity).getInstance(receivingSide); - if (conductor == null) + for (ForgeDirection dir : ForgeDirection.values()) { - conductor = ((IConductor) tileEntity).getInstance(ForgeDirection.UNKNOWN); + if (instance != null) + { + break; + } + + instance = ((IConnector) tileEntity).getInstance(dir); } - if (conductor != null) + if (instance != null) { - // TODO: Conductor may always return null in some cases. - IEnergyNetwork network = conductor.getNetwork(); - getNetwork().energyGraph.queue(network.getLastBuffer()); + + IEnergyNetwork network = instance.getNetwork(); + getNetwork().energyGraph.queue(Math.max(network.getBuffer(), network.getLastBuffer())); } } @@ -263,9 +271,14 @@ public class PartMultimeter extends JCuboidPart implements IConnector 0) { - String str = information.get(0); - str = str + "/" + UnitDisplay.getDisplay(part.getNetwork().energyCapacityGraph.get(0), Unit.JOULES); - information.set(0, str); + information.add("Max: " + UnitDisplay.getDisplay(part.getNetwork().energyCapacityGraph.get(0), Unit.JOULES)); } if (part.getNetwork().torqueGraph.get(0) != 0) @@ -167,14 +165,14 @@ public class RenderMultimeter information.add("Speed: " + UnitDisplay.roundDecimals(part.getNetwork().angularVelocityGraph.get(0))); } - GL11.glTranslatef(0, 0, -0.2f * (information.size() / 2)); + GL11.glTranslatef(0, 0, -0.25f * (information.size() / 2)); for (int i = 0; i < information.size(); i++) { String info = information.get(i); GL11.glPushMatrix(); - GL11.glTranslatef(0, 0, 0.2f * i); + GL11.glTranslatef(0, 0, 0.25f * i); if (dir.offsetX == 0) RenderUtility.renderText(info, (float) (part.getNetwork().size.x * 0.9f), 0.5f); if (dir.offsetZ == 0) @@ -186,5 +184,4 @@ public class RenderMultimeter } } - } \ No newline at end of file