diff options
author | Jason Mitchell <mitchej@gmail.com> | 2023-04-22 22:33:35 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-23 07:33:35 +0200 |
commit | 56f2269f4af6d2130bdb2b6e6ac6e13bce89e47b (patch) | |
tree | 745e6d92025ec4ef449fc59fa5fdd741200b0489 /src/main/java/gregtech/loaders | |
parent | ac0b7a7da46646d325def36eed811941dbfc5950 (diff) | |
download | GT5-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/loaders')
-rw-r--r-- | src/main/java/gregtech/loaders/postload/PartP2PGTPower.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java b/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java index 080ae1b00b..53f73872e1 100644 --- a/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java +++ b/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java @@ -15,7 +15,6 @@ import appeng.parts.AEBasePart; import appeng.parts.p2p.PartP2PIC2Power; import gregtech.api.interfaces.tileentity.IEnergyConnected; import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_Utility; public class PartP2PGTPower extends PartP2PIC2Power implements IGridTickable { @@ -39,24 +38,26 @@ public class PartP2PGTPower extends PartP2PIC2Power implements IGridTickable { return getTile().zCoord; } - public final int getOffsetX(byte aSide, int aMultiplier) { - return getXCoord() + ForgeDirection.getOrientation(aSide).offsetX * aMultiplier; + public final int getOffsetX(ForgeDirection side, int aMultiplier) { + return getXCoord() + side.offsetX * aMultiplier; } - public final short getOffsetY(byte aSide, int aMultiplier) { - return (short) (getYCoord() + ForgeDirection.getOrientation(aSide).offsetY * aMultiplier); + public final short getOffsetY(ForgeDirection side, int aMultiplier) { + return (short) (getYCoord() + side.offsetY * aMultiplier); } - public final int getOffsetZ(byte aSide, int aMultiplier) { - return getZCoord() + ForgeDirection.getOrientation(aSide).offsetZ * aMultiplier; + public final int getOffsetZ(ForgeDirection side, int aMultiplier) { + return getZCoord() + side.offsetZ * aMultiplier; } public final TileEntity getTileEntity(int aX, int aY, int aZ) { return getWorld().getTileEntity(aX, aY, aZ); } - public final TileEntity getTileEntityAtSide(byte aSide) { - int tX = getOffsetX(aSide, 1), tY = getOffsetY(aSide, 1), tZ = getOffsetZ(aSide, 1); + public final TileEntity getTileEntityAtSide(ForgeDirection side) { + final int tX = getOffsetX(side, 1); + final int tY = getOffsetY(side, 1); + final int tZ = getOffsetZ(side, 1); return getWorld().getTileEntity(tX, tY, tZ); } @@ -64,14 +65,13 @@ public class PartP2PGTPower extends PartP2PIC2Power implements IGridTickable { if (getOfferedEnergy() == 0) { return false; } - TileEntity t = getTileEntityAtSide((byte) getSide().ordinal()); - if (t instanceof IEnergyConnected) { + final TileEntity te = getTileEntityAtSide(getSide()); + if (te instanceof IEnergyConnected energyConnected) { long voltage = 8 << (getSourceTier() * 2); if (voltage > getOfferedEnergy()) { voltage = (long) getOfferedEnergy(); } - if (((IEnergyConnected) t).injectEnergyUnits(GT_Utility.getOppositeSide(getSide().ordinal()), voltage, 1) - > 0) { + if (energyConnected.injectEnergyUnits(getSide().getOpposite(), voltage, 1) > 0) { drawEnergy(voltage); return true; } |