Overflows overflows everywhere (#791)

* Reformat

* Stop energy calcs from overflowing by switching int->long in several places in the new graph code to be consistent with how they're used elsewhere.

6 files changed, 29 insertions, 29 deletions

diff --git a/src/main/java/gregtech/api/graphs/consumers/ConsumerNode.java b/src/main/java/gregtech/api/graphs/consumers/ConsumerNode.java
index 87376008c4..e060c5c094 100644
--- a/src/main/java/gregtech/api/graphs/consumers/ConsumerNode.java
+++ b/src/main/java/gregtech/api/graphs/consumers/ConsumerNode.java
@@ -5,7 +5,7 @@ import net.minecraft.tileentity.TileEntity;
 
 import java.util.ArrayList;
 
-//node attached to a tile entity that can consume stuff from the network
+// node attached to a tile entity that can consume stuff from the network
 public class ConsumerNode extends Node {
     public byte mSide;
     public ConsumerNode(int aNodeValue, TileEntity aTileEntity, byte aSide, ArrayList<ConsumerNode> aConsumers) {
@@ -17,7 +17,7 @@ public class ConsumerNode extends Node {
         return !mTileEntity.isInvalid();
     }
 
-    public int injectEnergy(int aVoltage, int aMaxAmps) {
+    public int injectEnergy(long aVoltage, long aMaxAmps) {
         return 0;
     }
 }
diff --git a/src/main/java/gregtech/api/graphs/consumers/EmptyPowerConsumer.java b/src/main/java/gregtech/api/graphs/consumers/EmptyPowerConsumer.java
index da3d0a757b..29f4fe8893 100644
--- a/src/main/java/gregtech/api/graphs/consumers/EmptyPowerConsumer.java
+++ b/src/main/java/gregtech/api/graphs/consumers/EmptyPowerConsumer.java
@@ -6,7 +6,7 @@ import net.minecraft.tileentity.TileEntity;
 
 import java.util.ArrayList;
 
-//this is here to apply voltage to death ends
+//this is here to apply voltage to dead ends
 public class EmptyPowerConsumer extends ConsumerNode{
     public EmptyPowerConsumer(int aNodeValue, TileEntity aTileEntity, byte aSide, ArrayList<ConsumerNode> aConsumers) {
         super(aNodeValue, aTileEntity, aSide, aConsumers);
@@ -18,7 +18,7 @@ public class EmptyPowerConsumer extends ConsumerNode{
     }
 
     @Override
-    public int injectEnergy(int aVoltage, int aMaxAmps) {
+    public int injectEnergy(long aVoltage, long aMaxAmps) {
         BaseMetaPipeEntity tPipe = (BaseMetaPipeEntity) mTileEntity;
         PowerNodePath tPath =(PowerNodePath) tPipe.getNodePath();
         tPath.applyVoltage(aVoltage,true);
diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyConnected.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyConnected.java
index baff232d94..0b3c8e31fa 100644
--- a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyConnected.java
+++ b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyConnected.java
@@ -16,7 +16,7 @@ public class NodeEnergyConnected extends ConsumerNode {
     }
 
     @Override
-    public int injectEnergy(int aVoltage, int aMaxAmps) {
+    public int injectEnergy(long aVoltage, long aMaxAmps) {
         return (int) ((IEnergyConnected)mTileEntity).injectEnergyUnits(mSide,aVoltage,aMaxAmps);
     }
 }
diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java
index e1f3c3f0e0..1b5e00773b 100644
--- a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java
+++ b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java
@@ -23,7 +23,7 @@ public class NodeEnergyReceiver extends ConsumerNode {
     }
 
     @Override
-    public int injectEnergy(int aVoltage, int aMaxAmps) {
+    public int injectEnergy(long aVoltage, long aMaxAmps) {
         ForgeDirection tDirection = ForgeDirection.getOrientation(mSide);
         int rfOut = GT_Utility.safeInt(aVoltage * GregTech_API.mEUtoRF / 100);
         int ampsUsed = 0;
@@ -48,25 +48,25 @@ public class NodeEnergyReceiver extends ConsumerNode {
         if (aRfOut > 32L * GregTech_API.mEUtoRF / 100L) {
             int aExplosionPower = aRfOut;
             float tStrength =
-                    aExplosionPower < V[0] ? 1.0F :
-                            aExplosionPower < V[1] ? 2.0F :
-                                    aExplosionPower < V[2] ? 3.0F :
-                                            aExplosionPower < V[3] ? 4.0F :
-                                                    aExplosionPower < V[4] ? 5.0F :
-                                                            aExplosionPower < V[4] * 2 ? 6.0F :
-                                                                    aExplosionPower < V[5] ? 7.0F :
-                                                                            aExplosionPower < V[6] ? 8.0F :
-                                                                                    aExplosionPower < V[7] ? 9.0F :
-                                                                                            aExplosionPower < V[8] ? 10.0F :
-                                                                                                    aExplosionPower < V[8] * 2 ? 11.0F :
-                                                                                                            aExplosionPower < V[9] ? 12.0F :
-                                                                                                                    aExplosionPower < V[10] ? 13.0F :
-                                                                                                                            aExplosionPower < V[11] ? 14.0F :
-                                                                                                                                    aExplosionPower < V[12] ? 15.0F :
-                                                                                                                                            aExplosionPower < V[12] * 2 ? 16.0F :
-                                                                                                                                                    aExplosionPower < V[13] ? 17.0F :
-                                                                                                                                                            aExplosionPower < V[14] ? 18.0F :
-                                                                                                                                                                    aExplosionPower < V[15] ? 19.0F : 20.0F;
+                aExplosionPower < V[0] ? 1.0F :
+                aExplosionPower < V[1] ? 2.0F :
+                aExplosionPower < V[2] ? 3.0F :
+                aExplosionPower < V[3] ? 4.0F :
+                aExplosionPower < V[4] ? 5.0F :
+                aExplosionPower < V[4] * 2 ? 6.0F :
+                aExplosionPower < V[5] ? 7.0F :
+                aExplosionPower < V[6] ? 8.0F :
+                aExplosionPower < V[7] ? 9.0F :
+                aExplosionPower < V[8] ? 10.0F :
+                aExplosionPower < V[8] * 2 ? 11.0F :
+                aExplosionPower < V[9] ? 12.0F :
+                aExplosionPower < V[10] ? 13.0F :
+                aExplosionPower < V[11] ? 14.0F :
+                aExplosionPower < V[12] ? 15.0F :
+                aExplosionPower < V[12] * 2 ? 16.0F :
+                aExplosionPower < V[13] ? 17.0F :
+                aExplosionPower < V[14] ? 18.0F :
+                aExplosionPower < V[15] ? 19.0F : 20.0F;
             int tX = mTileEntity.xCoord, tY = mTileEntity.yCoord, tZ = mTileEntity.zCoord;
             World tWorld = mTileEntity.getWorldObj();
             GT_Utility.sendSoundToPlayers(tWorld, GregTech_API.sSoundList.get(209), 1.0F, -1, tX, tY, tZ);
diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeEnergySink.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergySink.java
index 3f93c62010..d2c54e284f 100644
--- a/src/main/java/gregtech/api/graphs/consumers/NodeEnergySink.java
+++ b/src/main/java/gregtech/api/graphs/consumers/NodeEnergySink.java
@@ -6,7 +6,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import java.util.ArrayList;
 
-//consumer for IC2 machines
+// consumer for IC2 machines
 public class NodeEnergySink extends ConsumerNode {
     public NodeEnergySink(int nodeValue, IEnergySink tileEntity, byte side, ArrayList<ConsumerNode> consumers) {
         super(nodeValue, (TileEntity) tileEntity, side, consumers);
@@ -18,7 +18,7 @@ public class NodeEnergySink extends ConsumerNode {
     }
 
     @Override
-    public int injectEnergy(int aVoltage, int aMaxAmps) {
+    public int injectEnergy(long aVoltage, long aMaxAmps) {
         int tUsedAmps = 0;
         while (aMaxAmps > tUsedAmps && ((IEnergySink) mTileEntity).getDemandedEnergy() > 0 &&
                 ((IEnergySink) mTileEntity).injectEnergy(ForgeDirection.getOrientation(mSide), aVoltage, aVoltage) < aVoltage)
diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeGTBaseMetaTile.java b/src/main/java/gregtech/api/graphs/consumers/NodeGTBaseMetaTile.java
index 5c54ee16f9..e9736df7f4 100644
--- a/src/main/java/gregtech/api/graphs/consumers/NodeGTBaseMetaTile.java
+++ b/src/main/java/gregtech/api/graphs/consumers/NodeGTBaseMetaTile.java
@@ -4,14 +4,14 @@ import gregtech.api.interfaces.tileentity.IEnergyConnected;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import java.util.ArrayList;
 
-//consumer for gt machines
+// consumer for gt machines
 public class NodeGTBaseMetaTile extends ConsumerNode {
     public NodeGTBaseMetaTile(int aNodeValue, BaseMetaTileEntity aTileEntity, byte aSide, ArrayList<ConsumerNode> aConsumers) {
         super(aNodeValue, aTileEntity, aSide, aConsumers);
     }
 
     @Override
-    public int injectEnergy(int aVoltage, int aMaxAmps) {
+    public int injectEnergy(long aVoltage, long aMaxAmps) {
         return (int)((IEnergyConnected) mTileEntity).injectEnergyUnits(mSide,aVoltage, aMaxAmps);
     }