From ccf7a37b2239d2d5a1eb4652f03ba995a766875e Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sat, 27 Dec 2014 21:08:18 +0000 Subject: [PATCH] Make HeatUtils not take unnecessary arguments. --- .../java/mekanism/common/multipart/PartHeatTransmitter.java | 2 +- src/main/java/mekanism/common/util/HeatUtils.java | 2 +- .../generators/common/tile/TileEntityHeatGenerator.java | 3 +-- .../generators/common/tile/reactor/TileEntityReactorPort.java | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/mekanism/common/multipart/PartHeatTransmitter.java b/src/main/java/mekanism/common/multipart/PartHeatTransmitter.java index 67cac04e4..645ddc3c6 100644 --- a/src/main/java/mekanism/common/multipart/PartHeatTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartHeatTransmitter.java @@ -110,7 +110,7 @@ public class PartHeatTransmitter extends PartTransmitter implements @Override public double[] simulateHeat() { - return HeatUtils.simulate(this, Coord4D.get(tile()), world()); + return HeatUtils.simulate(this); } @Override diff --git a/src/main/java/mekanism/common/util/HeatUtils.java b/src/main/java/mekanism/common/util/HeatUtils.java index 486af0bf3..4dbd279f6 100644 --- a/src/main/java/mekanism/common/util/HeatUtils.java +++ b/src/main/java/mekanism/common/util/HeatUtils.java @@ -9,7 +9,7 @@ import net.minecraftforge.common.util.ForgeDirection; public class HeatUtils { - public static double[] simulate(IHeatTransfer source, Coord4D pos, World world) + public static double[] simulate(IHeatTransfer source) { double heatTransferred[] = new double[]{0,0}; for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index 30c3307b9..14a7b7f6f 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -5,7 +5,6 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.MekanismConfig.generators; -import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.Mekanism; import mekanism.common.base.ISustainedData; import mekanism.common.util.ChargeUtils; @@ -413,7 +412,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu transferHeatTo(-heatLost); setEnergy(getEnergy() + workDone); } - return HeatUtils.simulate(this, Coord4D.get(this), worldObj); + return HeatUtils.simulate(this); } @Override diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index afb205715..5c1139225 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -258,7 +258,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl @Override public double[] simulateHeat() { - return HeatUtils.simulate(this, Coord4D.get(this), worldObj); + return HeatUtils.simulate(this); } @Override