From c679603ab78c35d893deb41762bf9f031ae23c62 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sun, 7 Jan 2018 10:11:59 +0100 Subject: Fix that the main facing of basic machines can be set to top/bottom (#80) --- .../implementations/GT_MetaTileEntity_BasicMachine.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/main/java/gregtech/api/metatileentity/implementations') diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java index ade5d98528..1c5b90f7db 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java @@ -109,11 +109,16 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B mGUIName = aGUIName; mNEIName = aNEIName; } + + protected boolean isValidMainFacing(byte aSide) { + return aSide > 1; + } - public boolean setMainFacing(byte aDirection){ - mMainFacing = aDirection; + public boolean setMainFacing(byte aSide){ + if (!isValidMainFacing(aSide)) return false; + mMainFacing = aSide; if(getBaseMetaTileEntity().getFrontFacing() == mMainFacing){ - getBaseMetaTileEntity().setFrontFacing(GT_Utility.getOppositeSide(aDirection)); + getBaseMetaTileEntity().setFrontFacing(GT_Utility.getOppositeSide(aSide)); } onFacingChange(); onMachineBlockUpdate(); -- cgit From fcb663754350649e9ce01769f54f850a2c6d262e Mon Sep 17 00:00:00 2001 From: Technus Date: Sun, 7 Jan 2018 11:11:43 +0100 Subject: Fix behaviour of disconnected fluid pipes --- .../implementations/GT_MetaPipeEntity_Fluid.java | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'src/main/java/gregtech/api/metatileentity/implementations') diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java index eb403aa5f0..9100daa8d2 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java @@ -649,4 +649,29 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity { if (inputAABB.intersectsWith(aabb)) outputAABB.add(aabb); } } + + @Override + public FluidStack drain(ForgeDirection aSide, int maxDrain, boolean doDrain) { + if(isConnectedAtSide(aSide.ordinal()) || aSide==ForgeDirection.UNKNOWN) + return super.drain(aSide, maxDrain, doDrain); + return null; + } + + @Override + public FluidStack drain(ForgeDirection aSide, FluidStack aFluid, boolean doDrain) { + if(isConnectedAtSide(aSide.ordinal()) || aSide==ForgeDirection.UNKNOWN) + return super.drain(aSide, aFluid, doDrain); + return null; + } + + //Stub method? + //@Override + //public int fill(FluidStack resource, boolean doFill) {} + + @Override + public int fill(ForgeDirection aSide, FluidStack aFluid, boolean doFill) { + if(isConnectedAtSide(aSide.ordinal()) || aSide==ForgeDirection.UNKNOWN) + return super.fill(aSide, aFluid, doFill); + return 0; + } } -- cgit From bbaa3dd99996a9fa121dd06386051adb4d10b54a Mon Sep 17 00:00:00 2001 From: Antifluxfield Date: Sun, 7 Jan 2018 18:16:31 +0800 Subject: Fix #81 (#83) --- .../api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/gregtech/api/metatileentity/implementations') diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java index 9100daa8d2..ad71f1c099 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java @@ -594,12 +594,12 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity { @Override public boolean isLiquidInput(byte aSide) { - return !isInputDisabledAtSide(aSide); + return isConnectedAtSide(aSide) && !isInputDisabledAtSide(aSide); } @Override public boolean isLiquidOutput(byte aSide) { - return true; + return isConnectedAtSide(aSide); } public boolean isInputDisabledAtSide(int aSide) { -- cgit From f50e0bd7cfdc552dc8636677cdb2860e11c523e2 Mon Sep 17 00:00:00 2001 From: Technus Date: Sun, 7 Jan 2018 11:18:42 +0100 Subject: Revert "Fix behaviour of disconnected fluid pipes" This reverts commit fcb663754350649e9ce01769f54f850a2c6d262e. --- .../implementations/GT_MetaPipeEntity_Fluid.java | 25 ---------------------- 1 file changed, 25 deletions(-) (limited to 'src/main/java/gregtech/api/metatileentity/implementations') diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java index ad71f1c099..d601ceb8b6 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java @@ -649,29 +649,4 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity { if (inputAABB.intersectsWith(aabb)) outputAABB.add(aabb); } } - - @Override - public FluidStack drain(ForgeDirection aSide, int maxDrain, boolean doDrain) { - if(isConnectedAtSide(aSide.ordinal()) || aSide==ForgeDirection.UNKNOWN) - return super.drain(aSide, maxDrain, doDrain); - return null; - } - - @Override - public FluidStack drain(ForgeDirection aSide, FluidStack aFluid, boolean doDrain) { - if(isConnectedAtSide(aSide.ordinal()) || aSide==ForgeDirection.UNKNOWN) - return super.drain(aSide, aFluid, doDrain); - return null; - } - - //Stub method? - //@Override - //public int fill(FluidStack resource, boolean doFill) {} - - @Override - public int fill(ForgeDirection aSide, FluidStack aFluid, boolean doFill) { - if(isConnectedAtSide(aSide.ordinal()) || aSide==ForgeDirection.UNKNOWN) - return super.fill(aSide, aFluid, doFill); - return 0; - } } -- cgit