diff --git a/build.properties b/build.properties index 3304bc7ab..9523e1664 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ minecraft_version=1.7.10 -forge_version=10.13.2.1291 +forge_version=10.13.4.1448-1.7.10 FMP_version=1.1.2.331 CCLIB_version=1.1.3.136 NEI_version=1.0.4.101 diff --git a/src/api/java/buildcraft/api/core/StackKey.java b/src/api/java/buildcraft/api/core/StackKey.java index 092c173f0..68b990fef 100644 --- a/src/api/java/buildcraft/api/core/StackKey.java +++ b/src/api/java/buildcraft/api/core/StackKey.java @@ -87,7 +87,7 @@ public final class StackKey { } } if (fluidStack != null) { - if (fluidStack.fluidID != k.fluidStack.fluidID || + if (fluidStack.getFluid().getID() != k.fluidStack.getFluid().getID() || fluidStack.amount != k.fluidStack.amount || !objectsEqual(fluidStack.tag, k.fluidStack.tag)) { return false; @@ -106,7 +106,7 @@ public final class StackKey { } result = 31 * result + 7; if (fluidStack != null) { - result = 31 * result + fluidStack.fluidID; + result = 31 * result + fluidStack.getFluid().getID(); result = 31 * result + fluidStack.amount; result = 31 * result + objectHashCode(fluidStack.tag); } diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index 08948fb5a..7ced4d445 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -165,7 +165,7 @@ public class FluidNetwork extends DynamicNetwork if(acceptor != null && fluidToSend != null) { - fluidSent += acceptor.fill(side, new FluidStack(fluidToSend.fluidID, currentSending), doTransfer); + fluidSent += acceptor.fill(side, new FluidStack(fluidToSend.getFluidID(), currentSending), doTransfer); } if(fluidSent > prev) diff --git a/src/main/java/mekanism/common/content/boiler/BoilerTank.java b/src/main/java/mekanism/common/content/boiler/BoilerTank.java index c4e60e754..b33b93b21 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerTank.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerTank.java @@ -31,12 +31,12 @@ public abstract class BoilerTank implements IFluidTank { if(steamBoiler.structure != null && !steamBoiler.getWorldObj().isRemote) { - if(resource == null || resource.fluidID <= 0) + if(resource == null || resource.getFluidID() <= 0) { return 0; } - if(getFluid() == null || getFluid().fluidID <= 0) + if(getFluid() == null || getFluid().getFluidID() <= 0) { if(resource.amount <= getCapacity()) { @@ -138,7 +138,7 @@ public abstract class BoilerTank implements IFluidTank { if(steamBoiler.structure != null && !steamBoiler.getWorldObj().isRemote) { - if(getFluid() == null || getFluid().fluidID <= 0) + if(getFluid() == null || getFluid().getFluidID() <= 0) { return null; } @@ -160,7 +160,7 @@ public abstract class BoilerTank implements IFluidTank getFluid().amount -= used; } - FluidStack drained = new FluidStack(getFluid().fluidID, used); + FluidStack drained = new FluidStack(getFluid().getFluidID(), used); if(getFluid().amount <= 0) { diff --git a/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java b/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java index 1b0d3b10b..173739a37 100644 --- a/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java +++ b/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java @@ -34,7 +34,7 @@ public class DynamicFluidTank implements IFluidTank { if(dynamicTank.structure != null && !dynamicTank.getWorldObj().isRemote) { - if(resource == null || resource.fluidID <= 0) + if(resource == null || resource.getFluidID() <= 0) { return 0; } @@ -44,7 +44,7 @@ public class DynamicFluidTank implements IFluidTank return 0; } - if(dynamicTank.structure.fluidStored == null || dynamicTank.structure.fluidStored.fluidID <= 0) + if(dynamicTank.structure.fluidStored == null || dynamicTank.structure.fluidStored.getFluidID() <= 0) { if(resource.amount <= getCapacity()) { @@ -132,7 +132,7 @@ public class DynamicFluidTank implements IFluidTank { if(dynamicTank.structure != null && !dynamicTank.getWorldObj().isRemote) { - if(dynamicTank.structure.fluidStored == null || dynamicTank.structure.fluidStored.fluidID <= 0) + if(dynamicTank.structure.fluidStored == null || dynamicTank.structure.fluidStored.getFluidID() <= 0) { return null; } @@ -154,7 +154,7 @@ public class DynamicFluidTank implements IFluidTank dynamicTank.structure.fluidStored.amount -= used; } - FluidStack drained = new FluidStack(dynamicTank.structure.fluidStored.fluidID, used); + FluidStack drained = new FluidStack(dynamicTank.structure.fluidStored.getFluidID(), used); if(dynamicTank.structure.fluidStored.amount <= 0) { diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 222c15356..a9eba4951 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -669,7 +669,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec itemStack.setTagCompound(new NBTTagCompound()); } - if(fluidStack == null || fluidStack.amount == 0 || fluidStack.fluidID == 0) + if(fluidStack == null || fluidStack.amount == 0 || fluidStack.getFluidID() == 0) { itemStack.stackTagCompound.removeTag("fluidTank"); } diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index 9574aba5f..7a1a8be6c 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -130,7 +130,7 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo container.setTagCompound(new NBTTagCompound()); } - if(stack == null || stack.amount == 0 || stack.fluidID == 0) + if(stack == null || stack.amount == 0 || stack.getFluidID() == 0) { container.stackTagCompound.removeTag("fluidStack"); } diff --git a/src/main/java/mekanism/common/tile/TileEntityBoiler.java b/src/main/java/mekanism/common/tile/TileEntityBoiler.java index 5133c3179..c6c12ef8a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoiler.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoiler.java @@ -312,7 +312,7 @@ public class TileEntityBoiler extends TileEntityMultiblock 0 || (FluidContainerRegistry.getFluidForFilledItem(itemstack) != null && FluidContainerRegistry.getFluidForFilledItem(itemstack).fluidID == FluidRegistry.LAVA.getID()); + return getFuel(itemstack) > 0 || (FluidContainerRegistry.getFluidForFilledItem(itemstack) != null && FluidContainerRegistry.getFluidForFilledItem(itemstack).getFluidID() == FluidRegistry.LAVA.getID()); } else if(slotID == 1) { @@ -329,7 +329,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(resource.fluidID == FluidRegistry.LAVA.getID() && from != ForgeDirection.getOrientation(facing)) + if(resource.getFluidID() == FluidRegistry.LAVA.getID() && from != ForgeDirection.getOrientation(facing)) { return lavaTank.fill(resource, doFill); }