aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2020-10-19 14:02:28 +0200
committerbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2020-10-19 14:02:28 +0200
commit1661004faa9a3e1839b544b6cf4ac1479ea60a67 (patch)
tree6882003e088ad0b388907c75e8a06b3914ec6738 /src/main/java
parent2763104566be435df158ca11a96f51503857e11f (diff)
downloadGT5-Unofficial-1661004faa9a3e1839b544b6cf4ac1479ea60a67.tar.gz
GT5-Unofficial-1661004faa9a3e1839b544b6cf4ac1479ea60a67.tar.bz2
GT5-Unofficial-1661004faa9a3e1839b544b6cf4ac1479ea60a67.zip
Lift checks out of Stripped Methodes to prevent NoSuchMethodErrors
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java8
1 files changed, 4 insertions, 4 deletions
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 1d1b1a9ea0..8a28301fdf 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
@@ -404,7 +404,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
final GT_CoverBehavior coverBehavior = baseMetaTile.getCoverBehaviorAtSide(aSide);
final IGregTechTileEntity gTileEntity = (tTileEntity instanceof IGregTechTileEntity) ? (IGregTechTileEntity) tTileEntity : null;
- if (coverBehavior instanceof GT_Cover_Drain || isTConstructFaucet(tTileEntity))
+ if (coverBehavior instanceof GT_Cover_Drain || (GregTech_API.mTConstruct && isTConstructFaucet(tTileEntity)))
return true;
final IFluidHandler fTileEntity = (tTileEntity instanceof IFluidHandler) ? (IFluidHandler) tTileEntity : null;
@@ -413,7 +413,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
FluidTankInfo[] tInfo = fTileEntity.getTankInfo(ForgeDirection.getOrientation(tSide));
if (tInfo != null) {
return tInfo.length > 0
- || isTranslocator(tTileEntity)
+ || (GregTech_API.mTranslocator && isTranslocator(tTileEntity))
|| gTileEntity != null && gTileEntity.getCoverBehaviorAtSide(tSide) instanceof GT_Cover_FluidRegulator;
}
@@ -424,13 +424,13 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
@Optional.Method(modid = "TConstruct")
private boolean isTConstructFaucet(TileEntity tTileEntity){
// Tinker Construct Faucets return a null tank info, so check the class
- return GregTech_API.mTConstruct && tTileEntity instanceof tconstruct.smeltery.logic.FaucetLogic;
+ return tTileEntity instanceof tconstruct.smeltery.logic.FaucetLogic;
}
@Optional.Method(modid = "Translocator")
private boolean isTranslocator(TileEntity tTileEntity){
// Translocators return a TankInfo, but it's of 0 length - so check the class if we see this pattern
- return GregTech_API.mTranslocator && tTileEntity instanceof codechicken.translocator.TileLiquidTranslocator;
+ return tTileEntity instanceof codechicken.translocator.TileLiquidTranslocator;
}
@Override