aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkorneel vandamme <Krampus.sack.never@gmail.com>2021-06-22 20:42:30 +0200
committerkorneel vandamme <Krampus.sack.never@gmail.com>2021-06-22 20:42:30 +0200
commit69e5bbc25bb80418c1939d897fdf0055d280837e (patch)
treec5d34866bbb6f310958821452527296c83865852
parentd512e0e5fd70cc6ef0555b3c089e3e6bc3b57e8b (diff)
downloadGT5-Unofficial-69e5bbc25bb80418c1939d897fdf0055d280837e.tar.gz
GT5-Unofficial-69e5bbc25bb80418c1939d897fdf0055d280837e.tar.bz2
GT5-Unofficial-69e5bbc25bb80418c1939d897fdf0055d280837e.zip
change side to from int to byte
-rw-r--r--src/main/java/gregtech/api/graphs/GenerateNodeMap.java22
-rw-r--r--src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java8
-rw-r--r--src/main/java/gregtech/api/graphs/consumers/ConsumerNode.java4
-rw-r--r--src/main/java/gregtech/api/graphs/consumers/EmptyPowerConsumer.java2
-rw-r--r--src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java2
-rw-r--r--src/main/java/gregtech/api/graphs/consumers/NodeEnergySink.java2
-rw-r--r--src/main/java/gregtech/api/graphs/consumers/NodeGTBaseMetaTile.java4
7 files changed, 22 insertions, 22 deletions
diff --git a/src/main/java/gregtech/api/graphs/GenerateNodeMap.java b/src/main/java/gregtech/api/graphs/GenerateNodeMap.java
index d61d818dbe..60a820cdd1 100644
--- a/src/main/java/gregtech/api/graphs/GenerateNodeMap.java
+++ b/src/main/java/gregtech/api/graphs/GenerateNodeMap.java
@@ -39,7 +39,7 @@ abstract public class GenerateNodeMap {
}
//gets the next node
- protected void generateNextNode(BaseMetaPipeEntity aPipe, Node aPipeNode, int aInvalidSide, int aNextNodeVale,
+ protected void generateNextNode(BaseMetaPipeEntity aPipe, Node aPipeNode, byte aInvalidSide, int aNextNodeVale,
ArrayList<ConsumerNode> tConsumers, HashSet<Node> tNodeMap) {
MetaPipeEntity tMetaPipe = (MetaPipeEntity) aPipe.getMetaTileEntity();
for (byte i = 0;i<6;i++) {
@@ -67,8 +67,8 @@ abstract public class GenerateNodeMap {
protected Node generateNode(TileEntity aTileEntity, Node aPreviousNode, int aNextNodeVale, ArrayList<MetaPipeEntity> aPipes,
int aSide, ArrayList<ConsumerNode> aConsumers, HashSet<Node> aNodeMap) {
if (aTileEntity.isInvalid()) return null;
- int tSideOp = getOppositeSide(aSide);
- int tInvalidSide = aPreviousNode == null ? -1 : tSideOp;
+ byte tSideOp = getOppositeSide(aSide);
+ byte tInvalidSide = aPreviousNode == null ? -1 : tSideOp;
Node tThisNode = null;
if (isPipe(aTileEntity)){
BaseMetaPipeEntity tPipe = (BaseMetaPipeEntity) aTileEntity;
@@ -103,7 +103,7 @@ abstract public class GenerateNodeMap {
}
//go over the pipes until we see a valid tileentity that needs a node
- protected Pair getNextValidTileEntity(TileEntity aTileEntity, ArrayList<MetaPipeEntity> aPipes, int aSide, HashSet<Node> aNodeMap) {
+ protected Pair getNextValidTileEntity(TileEntity aTileEntity, ArrayList<MetaPipeEntity> aPipes, byte aSide, HashSet<Node> aNodeMap) {
if (isPipe(aTileEntity)) {
BaseMetaPipeEntity tPipe = (BaseMetaPipeEntity) aTileEntity;
MetaPipeEntity tMetaPipe = (MetaPipeEntity) tPipe.getMetaTileEntity();
@@ -114,7 +114,7 @@ abstract public class GenerateNodeMap {
}
int tConections = getNumberOfConections(tMetaPipe);
if (tConections == 2) {
- int tSideOp = getOppositeSide(aSide);
+ byte tSideOp = getOppositeSide(aSide);
for (byte i = 0;i<6;i++) {
if (i == tSideOp || !(tMetaPipe.isConnectedAtSide(i))) continue;
TileEntity tNewTileEntity = tPipe.getTileEntityAtSide(i);
@@ -135,10 +135,10 @@ abstract public class GenerateNodeMap {
return null;
}
- private class Pair {
- public int mSide;
+ private static class Pair {
+ public byte mSide;
public TileEntity mTileEntity;
- public Pair(TileEntity aTileEntity, int aSide) {
+ public Pair(TileEntity aTileEntity, byte aSide) {
this.mTileEntity = aTileEntity;
this.mSide = aSide;
}
@@ -149,17 +149,17 @@ abstract public class GenerateNodeMap {
return aTileEntity instanceof BaseMetaPipeEntity;
}
//checks if the tileentity is a consumer and add to the list
- abstract protected boolean addConsumer(TileEntity aTileEntity, int aSide, int aNodeValue, ArrayList<ConsumerNode> aConsumers);
+ abstract protected boolean addConsumer(TileEntity aTileEntity, byte aSide, int aNodeValue, ArrayList<ConsumerNode> aConsumers);
//get correct pathClass that you need for your node network
protected abstract NodePath getNewPath(MetaPipeEntity[] aPipes);
//used for if you need to use death ends for somthing
//can be null
- protected Node getEmptyNode(int aNodeValue, int aSide, TileEntity aTileEntity, ArrayList<ConsumerNode> aConsumers) {
+ protected Node getEmptyNode(int aNodeValue, byte aSide, TileEntity aTileEntity, ArrayList<ConsumerNode> aConsumers) {
return null;
}
//get correct node type you need for your network
- protected Node getPipeNode(int aNodeValue, int aSide, TileEntity aTileEntity, ArrayList<ConsumerNode> aConsumers) {
+ protected Node getPipeNode(int aNodeValue, byte aSide, TileEntity aTileEntity, ArrayList<ConsumerNode> aConsumers) {
return new Node(aNodeValue,aTileEntity,aConsumers);
}
diff --git a/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java b/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java
index 41de33080c..c4b9b59a1b 100644
--- a/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java
+++ b/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java
@@ -35,22 +35,22 @@ public class GenerateNodeMapPower extends GenerateNodeMap {
//used to apply voltage on death ends
@Override
- protected Node getEmptyNode(int aNodeValue, int aSide, TileEntity aTileEntity, ArrayList<ConsumerNode> aConsumers) {
+ protected Node getEmptyNode(int aNodeValue, byte aSide, TileEntity aTileEntity, ArrayList<ConsumerNode> aConsumers) {
Node tNode = new EmptyPowerConsumer(aNodeValue, aTileEntity, aSide, aConsumers);
aConsumers.add((ConsumerNode) tNode);
return tNode;
}
@Override
- protected Node getPipeNode(int aNodeValue, int aSide, TileEntity aTileEntity, ArrayList<ConsumerNode> aConsumers) {
+ protected Node getPipeNode(int aNodeValue, byte aSide, TileEntity aTileEntity, ArrayList<ConsumerNode> aConsumers) {
return new PowerNode(aNodeValue, aTileEntity, aConsumers);
}
@Override
- protected boolean addConsumer(TileEntity aTileEntity, int aSide, int aNodeValue, ArrayList<ConsumerNode> aConsumers) {
+ protected boolean addConsumer(TileEntity aTileEntity, byte aSide, int aNodeValue, ArrayList<ConsumerNode> aConsumers) {
if (aTileEntity instanceof BaseMetaTileEntity) {
BaseMetaTileEntity tBaseTileEntity = (BaseMetaTileEntity) aTileEntity;
- if (tBaseTileEntity.inputEnergyFrom((byte) aSide,false)) {
+ if (tBaseTileEntity.inputEnergyFrom(aSide,false)) {
ConsumerNode tConsumerNode = new NodeGTBaseMetaTile(aNodeValue,tBaseTileEntity, aSide, aConsumers);
aConsumers.add(tConsumerNode);
return true;
diff --git a/src/main/java/gregtech/api/graphs/consumers/ConsumerNode.java b/src/main/java/gregtech/api/graphs/consumers/ConsumerNode.java
index 74aa14f5c9..d2be4d94f1 100644
--- a/src/main/java/gregtech/api/graphs/consumers/ConsumerNode.java
+++ b/src/main/java/gregtech/api/graphs/consumers/ConsumerNode.java
@@ -7,8 +7,8 @@ import java.util.ArrayList;
//node atached to a tileentity that can consume stuff from the network
public class ConsumerNode extends Node {
- public int mSide;
- public ConsumerNode(int aNodeValue, TileEntity aTileEntity, int aSide, ArrayList<ConsumerNode> aConsumers) {
+ public byte mSide;
+ public ConsumerNode(int aNodeValue, TileEntity aTileEntity, byte aSide, ArrayList<ConsumerNode> aConsumers) {
super(aNodeValue,aTileEntity,aConsumers);
this.mSide = aSide;
}
diff --git a/src/main/java/gregtech/api/graphs/consumers/EmptyPowerConsumer.java b/src/main/java/gregtech/api/graphs/consumers/EmptyPowerConsumer.java
index 4961e77daf..47e3bca144 100644
--- a/src/main/java/gregtech/api/graphs/consumers/EmptyPowerConsumer.java
+++ b/src/main/java/gregtech/api/graphs/consumers/EmptyPowerConsumer.java
@@ -8,7 +8,7 @@ import java.util.ArrayList;
//this is here to aply voltage to death ends
public class EmptyPowerConsumer extends ConsumerNode{
- public EmptyPowerConsumer(int aNodeValue, TileEntity aTileEntity, int aSide, ArrayList<ConsumerNode> aConsumers) {
+ public EmptyPowerConsumer(int aNodeValue, TileEntity aTileEntity, byte aSide, ArrayList<ConsumerNode> aConsumers) {
super(aNodeValue, aTileEntity, aSide, aConsumers);
}
diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java
index a4ff9c62d8..ec25578e8e 100644
--- a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java
+++ b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java
@@ -17,7 +17,7 @@ import static gregtech.api.enums.GT_Values.V;
//consumer for RF machines
public class NodeEnergyReceiver extends ConsumerNode {
- public NodeEnergyReceiver(int aNodeValue, IEnergyReceiver aTileEntity, int aSide, ArrayList<ConsumerNode> aConsumers) {
+ public NodeEnergyReceiver(int aNodeValue, IEnergyReceiver aTileEntity, byte aSide, ArrayList<ConsumerNode> aConsumers) {
super(aNodeValue, (TileEntity) aTileEntity, aSide, aConsumers);
}
diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeEnergySink.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergySink.java
index e315c75d9f..db9f383492 100644
--- a/src/main/java/gregtech/api/graphs/consumers/NodeEnergySink.java
+++ b/src/main/java/gregtech/api/graphs/consumers/NodeEnergySink.java
@@ -8,7 +8,7 @@ import java.util.ArrayList;
//consumer for IC2 machines
public class NodeEnergySink extends ConsumerNode {
- public NodeEnergySink(int nodeValue, IEnergySink tileEntity, int side, ArrayList<ConsumerNode> consumers) {
+ public NodeEnergySink(int nodeValue, IEnergySink tileEntity, byte side, ArrayList<ConsumerNode> consumers) {
super(nodeValue, (TileEntity) tileEntity, side, consumers);
}
diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeGTBaseMetaTile.java b/src/main/java/gregtech/api/graphs/consumers/NodeGTBaseMetaTile.java
index 1eb562ff68..dbcc3c3b62 100644
--- a/src/main/java/gregtech/api/graphs/consumers/NodeGTBaseMetaTile.java
+++ b/src/main/java/gregtech/api/graphs/consumers/NodeGTBaseMetaTile.java
@@ -6,13 +6,13 @@ import java.util.ArrayList;
//consumer for gt machines
public class NodeGTBaseMetaTile extends ConsumerNode {
- public NodeGTBaseMetaTile(int aNodeValue, BaseMetaTileEntity aTileEntity, int aSide, ArrayList<ConsumerNode> aConsumers) {
+ public NodeGTBaseMetaTile(int aNodeValue, BaseMetaTileEntity aTileEntity, byte aSide, ArrayList<ConsumerNode> aConsumers) {
super(aNodeValue, aTileEntity, aSide, aConsumers);
}
@Override
public int injectEnergy(int aVoltage, int aMaxApms) {
- return (int)((IEnergyConnected) mTileEntity).injectEnergyUnits((byte) mSide,aVoltage, aMaxApms);
+ return (int)((IEnergyConnected) mTileEntity).injectEnergyUnits(mSide,aVoltage, aMaxApms);
}
@Override