aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/graphs/consumers
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2023-04-22 22:33:35 -0700
committerGitHub <noreply@github.com>2023-04-23 07:33:35 +0200
commit56f2269f4af6d2130bdb2b6e6ac6e13bce89e47b (patch)
tree745e6d92025ec4ef449fc59fa5fdd741200b0489 /src/main/java/gregtech/api/graphs/consumers
parentac0b7a7da46646d325def36eed811941dbfc5950 (diff)
downloadGT5-Unofficial-56f2269f4af6d2130bdb2b6e6ac6e13bce89e47b.tar.gz
GT5-Unofficial-56f2269f4af6d2130bdb2b6e6ac6e13bce89e47b.tar.bz2
GT5-Unofficial-56f2269f4af6d2130bdb2b6e6ac6e13bce89e47b.zip
Forge direction (#1895)
* ForgeDirection Also refactor the clusterfuck that was `getCoordinateScan` Co-authored by: Jason Mitchell <mitchej@gmail.com> * Fix rendering of Frame Boxes Frame boxes needed their own implementation of getTexture with int connexion mask, which is returning an error texture for the MetaTileEntity, because pipes (FrameBox **is** a pipe) do use this method to return different textures based on connexion status. --------- Co-authored-by: Léa Gris <lea.gris@noiraude.net>
Diffstat (limited to 'src/main/java/gregtech/api/graphs/consumers')
-rw-r--r--src/main/java/gregtech/api/graphs/consumers/ConsumerNode.java8
-rw-r--r--src/main/java/gregtech/api/graphs/consumers/EmptyPowerConsumer.java6
-rw-r--r--src/main/java/gregtech/api/graphs/consumers/NodeEnergyConnected.java5
-rw-r--r--src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java6
-rw-r--r--src/main/java/gregtech/api/graphs/consumers/NodeEnergySink.java7
-rw-r--r--src/main/java/gregtech/api/graphs/consumers/NodeGTBaseMetaTile.java6
6 files changed, 22 insertions, 16 deletions
diff --git a/src/main/java/gregtech/api/graphs/consumers/ConsumerNode.java b/src/main/java/gregtech/api/graphs/consumers/ConsumerNode.java
index f82798f09b..04d7ebbe5a 100644
--- a/src/main/java/gregtech/api/graphs/consumers/ConsumerNode.java
+++ b/src/main/java/gregtech/api/graphs/consumers/ConsumerNode.java
@@ -3,17 +3,19 @@ package gregtech.api.graphs.consumers;
import java.util.ArrayList;
import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.util.ForgeDirection;
import gregtech.api.graphs.Node;
// node attached to a tile entity that can consume stuff from the network
public class ConsumerNode extends Node {
- public byte mSide;
+ public ForgeDirection mSide;
- public ConsumerNode(int aNodeValue, TileEntity aTileEntity, byte aSide, ArrayList<ConsumerNode> aConsumers) {
+ public ConsumerNode(int aNodeValue, TileEntity aTileEntity, ForgeDirection side,
+ ArrayList<ConsumerNode> aConsumers) {
super(aNodeValue, aTileEntity, aConsumers);
- this.mSide = aSide;
+ this.mSide = side;
}
public boolean needsEnergy() {
diff --git a/src/main/java/gregtech/api/graphs/consumers/EmptyPowerConsumer.java b/src/main/java/gregtech/api/graphs/consumers/EmptyPowerConsumer.java
index 6507d0f8e4..48cf330bdb 100644
--- a/src/main/java/gregtech/api/graphs/consumers/EmptyPowerConsumer.java
+++ b/src/main/java/gregtech/api/graphs/consumers/EmptyPowerConsumer.java
@@ -3,6 +3,7 @@ package gregtech.api.graphs.consumers;
import java.util.ArrayList;
import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.util.ForgeDirection;
import gregtech.api.graphs.paths.PowerNodePath;
import gregtech.api.metatileentity.BaseMetaPipeEntity;
@@ -10,8 +11,9 @@ import gregtech.api.metatileentity.BaseMetaPipeEntity;
// 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);
+ public EmptyPowerConsumer(int aNodeValue, TileEntity aTileEntity, ForgeDirection side,
+ ArrayList<ConsumerNode> aConsumers) {
+ super(aNodeValue, aTileEntity, side, aConsumers);
}
@Override
diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyConnected.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyConnected.java
index 65dd50f9df..6daeae8c9c 100644
--- a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyConnected.java
+++ b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyConnected.java
@@ -3,14 +3,15 @@ package gregtech.api.graphs.consumers;
import java.util.ArrayList;
import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.util.ForgeDirection;
import gregtech.api.interfaces.tileentity.IEnergyConnected;
public class NodeEnergyConnected extends ConsumerNode {
- public NodeEnergyConnected(int aNodeValue, IEnergyConnected aTileEntity, byte aSide,
+ public NodeEnergyConnected(int aNodeValue, IEnergyConnected aTileEntity, ForgeDirection side,
ArrayList<ConsumerNode> aConsumers) {
- super(aNodeValue, (TileEntity) aTileEntity, aSide, aConsumers);
+ super(aNodeValue, (TileEntity) aTileEntity, side, aConsumers);
}
@Override
diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java
index 4e84b04e2a..4f35922029 100644
--- a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java
+++ b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java
@@ -21,14 +21,14 @@ public class NodeEnergyReceiver extends ConsumerNode {
int mRestRF = 0;
- public NodeEnergyReceiver(int aNodeValue, IEnergyReceiver aTileEntity, byte aSide,
+ public NodeEnergyReceiver(int aNodeValue, IEnergyReceiver aTileEntity, ForgeDirection side,
ArrayList<ConsumerNode> aConsumers) {
- super(aNodeValue, (TileEntity) aTileEntity, aSide, aConsumers);
+ super(aNodeValue, (TileEntity) aTileEntity, side, aConsumers);
}
@Override
public int injectEnergy(long aVoltage, long aMaxAmps) {
- ForgeDirection tDirection = ForgeDirection.getOrientation(mSide);
+ ForgeDirection tDirection = mSide;
int rfOut = GT_Utility.safeInt(aVoltage * GregTech_API.mEUtoRF / 100);
int ampsUsed = 0;
if (mRestRF < rfOut) {
diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeEnergySink.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergySink.java
index d978a99d0b..44fb88e5e8 100644
--- a/src/main/java/gregtech/api/graphs/consumers/NodeEnergySink.java
+++ b/src/main/java/gregtech/api/graphs/consumers/NodeEnergySink.java
@@ -10,7 +10,8 @@ import ic2.api.energy.tile.IEnergySink;
// consumer for IC2 machines
public class NodeEnergySink extends ConsumerNode {
- public NodeEnergySink(int nodeValue, IEnergySink tileEntity, byte side, ArrayList<ConsumerNode> consumers) {
+ public NodeEnergySink(int nodeValue, IEnergySink tileEntity, ForgeDirection side,
+ ArrayList<ConsumerNode> consumers) {
super(nodeValue, (TileEntity) tileEntity, side, consumers);
}
@@ -23,9 +24,7 @@ public class NodeEnergySink extends ConsumerNode {
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)
- tUsedAmps++;
+ && ((IEnergySink) mTileEntity).injectEnergy(mSide, aVoltage, aVoltage) < aVoltage) tUsedAmps++;
return tUsedAmps;
}
}
diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeGTBaseMetaTile.java b/src/main/java/gregtech/api/graphs/consumers/NodeGTBaseMetaTile.java
index ec75468db5..e8d8304eb3 100644
--- a/src/main/java/gregtech/api/graphs/consumers/NodeGTBaseMetaTile.java
+++ b/src/main/java/gregtech/api/graphs/consumers/NodeGTBaseMetaTile.java
@@ -2,15 +2,17 @@ package gregtech.api.graphs.consumers;
import java.util.ArrayList;
+import net.minecraftforge.common.util.ForgeDirection;
+
import gregtech.api.interfaces.tileentity.IEnergyConnected;
import gregtech.api.metatileentity.BaseMetaTileEntity;
// consumer for gt machines
public class NodeGTBaseMetaTile extends ConsumerNode {
- public NodeGTBaseMetaTile(int aNodeValue, BaseMetaTileEntity aTileEntity, byte aSide,
+ public NodeGTBaseMetaTile(int aNodeValue, BaseMetaTileEntity aTileEntity, ForgeDirection side,
ArrayList<ConsumerNode> aConsumers) {
- super(aNodeValue, aTileEntity, aSide, aConsumers);
+ super(aNodeValue, aTileEntity, side, aConsumers);
}
@Override