From d945860185b888709300e28ae1c9db88799856c0 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 6 May 2023 08:13:45 -0700 Subject: Exploring some various ForgeDirection fixes (#1950) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix mFacing NPEs * Default facing fixes (#1945) * QuickFixes incomplete facing fixes * fix Neither UP nor DOWN conditions as offsetY == 0 is not valid test * fix neither up nor down again * Still not fixed: use ForgeDirection.flag for clarty killed more ordinal siding. * get ride of offset testing --------- Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com> Co-authored-by: Jason Mitchell * bit logic fix * Fix single block machine facings * Predict the machine facing direction clientside before the server packet arrives * Fix isFacingValid logic --------- Co-authored-by: Léa Gris Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com> Co-authored-by: Martin Robertz Co-authored-by: Raven Szewczyk --- src/main/java/gregtech/common/covers/GT_Cover_Drain.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main/java/gregtech/common/covers/GT_Cover_Drain.java') diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java b/src/main/java/gregtech/common/covers/GT_Cover_Drain.java index 14b25e4777..92d1aca0d7 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Drain.java @@ -79,8 +79,9 @@ public class GT_Cover_Drain extends GT_CoverBehavior { false); } if ((tLiquid != null) && (tLiquid.getFluid() != null) - && ((side.ordinal() > 1) || ((side == ForgeDirection.DOWN) && (tLiquid.getFluid() - .getDensity() <= 0)) + && ((side.flag & (ForgeDirection.UP.flag | ForgeDirection.DOWN.flag)) == 0 // Horizontal + || ((side == ForgeDirection.DOWN) && (tLiquid.getFluid() + .getDensity() <= 0)) || ((side == ForgeDirection.UP) && (tLiquid.getFluid() .getDensity() >= 0))) && (((IFluidHandler) aTileEntity).fill(side, tLiquid, false) == tLiquid.amount)) { -- cgit