From b70c0e015f439d47a604e38917e08bc0470b9f02 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 13 May 2015 17:18:21 -0400 Subject: [PATCH] Remove hard dep on unnecessarily new forge version --- build.gradle | 2 +- build.properties | 3 +-- src/api/java/buildcraft/api/core/StackKey.java | 4 ++-- src/main/java/mekanism/common/FluidNetwork.java | 2 +- .../java/mekanism/common/content/boiler/BoilerTank.java | 8 ++++---- .../mekanism/common/content/tank/DynamicFluidTank.java | 8 ++++---- src/main/java/mekanism/common/item/ItemBlockMachine.java | 2 +- src/main/java/mekanism/common/item/ItemGaugeDropper.java | 2 +- .../java/mekanism/common/recipe/inputs/FluidInput.java | 2 +- .../mekanism/common/recipe/inputs/PressurizedInput.java | 2 +- src/main/java/mekanism/common/tile/TileEntityBoiler.java | 4 ++-- .../java/mekanism/common/tile/TileEntityDynamicTank.java | 2 +- .../java/mekanism/common/tile/TileEntityElectricPump.java | 2 +- .../mekanism/common/tile/TileEntityFluidicPlenisher.java | 2 +- .../java/mekanism/common/tile/TileEntityPortableTank.java | 2 +- .../common/tile/TileEntityRotaryCondensentrator.java | 2 +- .../common/tile/TileEntitySolarEvaporationController.java | 4 ++-- .../generators/common/item/ItemBlockGenerator.java | 2 +- .../generators/common/tile/TileEntityHeatGenerator.java | 6 +++--- 19 files changed, 30 insertions(+), 31 deletions(-) diff --git a/build.gradle b/build.gradle index 4e5aee139..e11669df2 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ sourceCompatibility = '1.7' targetCompatibility = '1.7' minecraft { - version = config.minecraft_version + "-" + config.forge_version + "-" + config.forge_mc_version + version = config.minecraft_version + "-" + config.forge_version } processResources diff --git a/build.properties b/build.properties index 528e02318..fd61d23d6 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,5 @@ minecraft_version=1.7.10 -forge_mc_version=1710ls -forge_version=10.13.3.1395 +forge_version=10.13.2.1291 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 257a32a16..092c173f0 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.getFluidID() != k.fluidStack.getFluidID() || + if (fluidStack.fluidID != k.fluidStack.fluidID || 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.getFluidID(); + result = 31 * result + fluidStack.fluidID; 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 d3a0ec622..905eab28f 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.getFluidID(), currentSending), doTransfer); + fluidSent += acceptor.fill(side, new FluidStack(fluidToSend.fluidID, 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 b33b93b21..c4e60e754 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.getFluidID() <= 0) + if(resource == null || resource.fluidID <= 0) { return 0; } - if(getFluid() == null || getFluid().getFluidID() <= 0) + if(getFluid() == null || getFluid().fluidID <= 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().getFluidID() <= 0) + if(getFluid() == null || getFluid().fluidID <= 0) { return null; } @@ -160,7 +160,7 @@ public abstract class BoilerTank implements IFluidTank getFluid().amount -= used; } - FluidStack drained = new FluidStack(getFluid().getFluidID(), used); + FluidStack drained = new FluidStack(getFluid().fluidID, 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 11ba213d1..59afdaac0 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.getFluidID() <= 0) + if(resource == null || resource.fluidID <= 0) { return 0; } @@ -44,7 +44,7 @@ public class DynamicFluidTank implements IFluidTank return 0; } - if(dynamicTank.structure.fluidStored == null || dynamicTank.structure.fluidStored.getFluidID() <= 0) + if(dynamicTank.structure.fluidStored == null || dynamicTank.structure.fluidStored.fluidID <= 0) { if(resource.amount <= getCapacity()) { @@ -140,7 +140,7 @@ public class DynamicFluidTank implements IFluidTank { if(dynamicTank.structure != null && !dynamicTank.getWorldObj().isRemote) { - if(dynamicTank.structure.fluidStored == null || dynamicTank.structure.fluidStored.getFluidID() <= 0) + if(dynamicTank.structure.fluidStored == null || dynamicTank.structure.fluidStored.fluidID <= 0) { return null; } @@ -162,7 +162,7 @@ public class DynamicFluidTank implements IFluidTank dynamicTank.structure.fluidStored.amount -= used; } - FluidStack drained = new FluidStack(dynamicTank.structure.fluidStored.getFluidID(), used); + FluidStack drained = new FluidStack(dynamicTank.structure.fluidStored.fluidID, 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 a9eba4951..222c15356 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.getFluidID() == 0) + if(fluidStack == null || fluidStack.amount == 0 || fluidStack.fluidID == 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 7a1a8be6c..9574aba5f 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.getFluidID() == 0) + if(stack == null || stack.amount == 0 || stack.fluidID == 0) { container.stackTagCompound.removeTag("fluidStack"); } diff --git a/src/main/java/mekanism/common/recipe/inputs/FluidInput.java b/src/main/java/mekanism/common/recipe/inputs/FluidInput.java index 9a7237542..90deeef43 100644 --- a/src/main/java/mekanism/common/recipe/inputs/FluidInput.java +++ b/src/main/java/mekanism/common/recipe/inputs/FluidInput.java @@ -47,7 +47,7 @@ public class FluidInput extends MachineInput @Override public int hashIngredients() { - return ingredient.fluid != null ? ingredient.fluid.hashCode() : 0; + return ingredient.getFluid() != null ? ingredient.getFluid().hashCode() : 0; } @Override diff --git a/src/main/java/mekanism/common/recipe/inputs/PressurizedInput.java b/src/main/java/mekanism/common/recipe/inputs/PressurizedInput.java index 38c9f59c4..2fc3e919e 100644 --- a/src/main/java/mekanism/common/recipe/inputs/PressurizedInput.java +++ b/src/main/java/mekanism/common/recipe/inputs/PressurizedInput.java @@ -147,7 +147,7 @@ public class PressurizedInput extends MachineInput @Override public int hashIngredients() { - return StackUtils.hashItemStack(theSolid) << 16 | (theFluid.fluid != null ? theFluid.fluid.hashCode() : 0) << 8 | theGas.hashCode(); + return StackUtils.hashItemStack(theSolid) << 16 | (theFluid.getFluid() != null ? theFluid.getFluid().hashCode() : 0) << 8 | theGas.hashCode(); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityBoiler.java b/src/main/java/mekanism/common/tile/TileEntityBoiler.java index c6c12ef8a..5133c3179 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).getFluidID() == FluidRegistry.LAVA.getID()); + return getFuel(itemstack) > 0 || (FluidContainerRegistry.getFluidForFilledItem(itemstack) != null && FluidContainerRegistry.getFluidForFilledItem(itemstack).fluidID == 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.getFluidID() == FluidRegistry.LAVA.getID() && from != ForgeDirection.getOrientation(facing)) + if(resource.fluidID == FluidRegistry.LAVA.getID() && from != ForgeDirection.getOrientation(facing)) { return lavaTank.fill(resource, doFill); }