aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/GT_Client.java
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/common/GT_Client.java
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/common/GT_Client.java')
-rw-r--r--src/main/java/gregtech/common/GT_Client.java20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java
index 4ae0204636..5951f95994 100644
--- a/src/main/java/gregtech/common/GT_Client.java
+++ b/src/main/java/gregtech/common/GT_Client.java
@@ -331,9 +331,9 @@ public class GT_Client extends GT_Proxy implements Runnable {
byte tConnections = 0;
if (tTile instanceof ICoverable) {
if (showCoverConnections) {
- for (byte tSide : ALL_VALID_SIDES) {
+ for (final ForgeDirection tSide : ForgeDirection.VALID_DIRECTIONS) {
if (((ICoverable) tTile).getCoverIDAtSide(tSide) > 0)
- tConnections = (byte) (tConnections + (1 << tSide));
+ tConnections = (byte) (tConnections + (1 << tSide.ordinal()));
}
} else if (tTile instanceof BaseMetaPipeEntity) tConnections = ((BaseMetaPipeEntity) tTile).mConnections;
}
@@ -783,7 +783,7 @@ public class GT_Client extends GT_Proxy implements Runnable {
|| GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sSolderingToolList)
|| (GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sSoftHammerList)
&& aTileEntity instanceof MultiBlockPart) && aEvent.player.isSneaking()) {
- if (((ICoverable) aTileEntity).getCoverIDAtSide((byte) aEvent.target.sideHit) == 0)
+ if (((ICoverable) aTileEntity).getCoverIDAtSide(ForgeDirection.getOrientation(aEvent.target.sideHit)) == 0)
drawGrid(aEvent, false, false, aEvent.player.isSneaking());
return;
}
@@ -791,21 +791,23 @@ public class GT_Client extends GT_Proxy implements Runnable {
if ((aEvent.currentItem == null && aEvent.player.isSneaking())
|| GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sCrowbarList)
|| GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sScrewdriverList)) {
- if (((ICoverable) aTileEntity).getCoverIDAtSide((byte) aEvent.target.sideHit) == 0)
- for (byte tSide : ALL_VALID_SIDES) if (((ICoverable) aTileEntity).getCoverIDAtSide(tSide) > 0) {
- drawGrid(aEvent, true, false, true);
- return;
+ if (((ICoverable) aTileEntity).getCoverIDAtSide(ForgeDirection.getOrientation(aEvent.target.sideHit)) == 0)
+ for (final ForgeDirection tSide : ForgeDirection.VALID_DIRECTIONS) {
+ if (((ICoverable) aTileEntity).getCoverIDAtSide(tSide) > 0) {
+ drawGrid(aEvent, true, false, true);
+ return;
+ }
}
return;
}
if (GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sCovers.keySet())) {
- if (((ICoverable) aTileEntity).getCoverIDAtSide((byte) aEvent.target.sideHit) == 0)
+ if (((ICoverable) aTileEntity).getCoverIDAtSide(ForgeDirection.getOrientation(aEvent.target.sideHit)) == 0)
drawGrid(aEvent, true, false, aEvent.player.isSneaking());
}
if (GT_Utility.areStacksEqual(ItemList.Tool_Cover_Copy_Paste.get(1), aEvent.currentItem, true)) {
- if (((ICoverable) aTileEntity).getCoverIDAtSide((byte) aEvent.target.sideHit) == 0)
+ if (((ICoverable) aTileEntity).getCoverIDAtSide(ForgeDirection.getOrientation(aEvent.target.sideHit)) == 0)
drawGrid(aEvent, true, false, aEvent.player.isSneaking());
}
}