diff options
| author | Blood Asp <Blood@Asp> | 2015-04-23 20:38:52 +0200 |
|---|---|---|
| committer | Blood Asp <Blood@Asp> | 2015-04-23 20:38:52 +0200 |
| commit | 88b575ed3cccba9fd37eae4f6b4d91f72c31fd27 (patch) | |
| tree | 04dcde36abcd26113bb6c0fbbf8bbcf69e172ace /main/java/gregtech/api/metatileentity/implementations | |
| parent | 7224ac4299098c70efae9dbd04c50a97e3f5f583 (diff) | |
| download | GT5-Unofficial-88b575ed3cccba9fd37eae4f6b4d91f72c31fd27.tar.gz GT5-Unofficial-88b575ed3cccba9fd37eae4f6b4d91f72c31fd27.tar.bz2 GT5-Unofficial-88b575ed3cccba9fd37eae4f6b4d91f72c31fd27.zip | |
Fix compatibility with forge older than 1355
Diffstat (limited to 'main/java/gregtech/api/metatileentity/implementations')
| -rw-r--r-- | main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java | 4 | ||||
| -rw-r--r-- | main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java index 426d4cfb7b..cb5c1b2f46 100644 --- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java +++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java @@ -262,9 +262,9 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity { @Override public final int fill_default(ForgeDirection aSide, FluidStack aFluid, boolean doFill) { - if (aFluid == null || aFluid.getFluidID() <= 0) return 0; + if (aFluid == null || aFluid.getFluid().getID() <= 0) return 0; - if (mFluid == null || mFluid.getFluidID() <= 0) { + if (mFluid == null || mFluid.getFluid().getID() <= 0) { if(aFluid.amount <= getCapacity()) { if (doFill) { mFluid = aFluid.copy(); diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java index f5787161c0..594411c3dd 100644 --- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java +++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java @@ -131,9 +131,9 @@ public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_Tier @Override public int fill(FluidStack aFluid, boolean doFill) { - if (aFluid == null || aFluid.getFluidID() <= 0 || aFluid.amount <= 0 || !canTankBeFilled() || !isFluidInputAllowed(aFluid)) return 0; + if (aFluid == null || aFluid.getFluid().getID() <= 0 || aFluid.amount <= 0 || !canTankBeFilled() || !isFluidInputAllowed(aFluid)) return 0; - if (getFillableStack() == null || getFillableStack().getFluidID() <= 0) { + if (getFillableStack() == null || getFillableStack().getFluid().getID() <= 0) { if(aFluid.amount <= getCapacity()) { if (doFill) { setFillableStack(aFluid.copy()); |