diff options
Diffstat (limited to 'main/java/gregtech/api')
4 files changed, 7 insertions, 7 deletions
diff --git a/main/java/gregtech/api/items/GT_MetaBase_Item.java b/main/java/gregtech/api/items/GT_MetaBase_Item.java index e977ef3fd2..4a0cd6f655 100644 --- a/main/java/gregtech/api/items/GT_MetaBase_Item.java +++ b/main/java/gregtech/api/items/GT_MetaBase_Item.java @@ -449,11 +449,11 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci } Long[] tStats = getFluidContainerStats(aStack); - if (tStats == null || tStats[0] <= 0 || aFluid == null || aFluid.getFluidID() <= 0 || aFluid.amount <= 0) return 0; + if (tStats == null || tStats[0] <= 0 || aFluid == null || aFluid.getFluid().getID() <= 0 || aFluid.amount <= 0) return 0; FluidStack tFluid = getFluidContent(aStack); - if (tFluid == null || tFluid.getFluidID() <= 0) { + if (tFluid == null || tFluid.getFluid().getID() <= 0) { if (aFluid.amount <= tStats[0]) { if (doFill) { setFluidContent(aStack, aFluid); 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()); diff --git a/main/java/gregtech/api/util/GT_Utility.java b/main/java/gregtech/api/util/GT_Utility.java index 666dc4f2aa..85a92c32aa 100644 --- a/main/java/gregtech/api/util/GT_Utility.java +++ b/main/java/gregtech/api/util/GT_Utility.java @@ -881,7 +881,7 @@ public class GT_Utility { if (aFluid == null || aFluid.getFluid() == null) return null; int tmp = 0; try{ - tmp = aFluid.getFluidID(); + tmp = aFluid.getFluid().getID(); }catch(Exception e){ System.err.println(e); } |