summaryrefslogtreecommitdiff
path: root/ihl/processing/metallurgy
diff options
context:
space:
mode:
Diffstat (limited to 'ihl/processing/metallurgy')
-rw-r--r--ihl/processing/metallurgy/BasicElectricMotorTileEntity.java4
-rw-r--r--ihl/processing/metallurgy/ImpregnatingMachineTileEntity.java10
2 files changed, 3 insertions, 11 deletions
diff --git a/ihl/processing/metallurgy/BasicElectricMotorTileEntity.java b/ihl/processing/metallurgy/BasicElectricMotorTileEntity.java
index f02abea..a546b0a 100644
--- a/ihl/processing/metallurgy/BasicElectricMotorTileEntity.java
+++ b/ihl/processing/metallurgy/BasicElectricMotorTileEntity.java
@@ -31,7 +31,7 @@ public abstract class BasicElectricMotorTileEntity extends FlexibleCableHolderBa
public short progress;
protected short operationLength = 6000;
protected double energyConsume = 1d;
- public double energy;
+ public double energy = 0d;
public int maxStorage = 128;
private boolean addedToEnergyNet = false;
@@ -257,7 +257,7 @@ public abstract class BasicElectricMotorTileEntity extends FlexibleCableHolderBa
@Override
public double getEnergyAmountThisNodeWant() {
- return this.energy - this.getMaxStorage();
+ return this.getMaxStorage()-this.energy;
}
public double drawEnergyToGrid(double amount) {
diff --git a/ihl/processing/metallurgy/ImpregnatingMachineTileEntity.java b/ihl/processing/metallurgy/ImpregnatingMachineTileEntity.java
index a0ed60d..4f7c529 100644
--- a/ihl/processing/metallurgy/ImpregnatingMachineTileEntity.java
+++ b/ihl/processing/metallurgy/ImpregnatingMachineTileEntity.java
@@ -16,7 +16,6 @@ import ic2.core.block.invslot.InvSlot.Access;
import ic2.core.block.invslot.InvSlotConsumableLiquid;
import ic2.core.block.invslot.InvSlotOutput;
import ihl.interfaces.IFluidTankVisual;
-import ihl.interfaces.IHasTemperature;
import ihl.processing.chemistry.ApparatusProcessableInvSlot;
import ihl.processing.chemistry.ChemicalReactorTileEntity;
import ihl.processing.invslots.IHLInvSlotOutput;
@@ -37,7 +36,7 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
-public class ImpregnatingMachineTileEntity extends TileEntityInventory implements IHasGui,IFluidTankVisual,INetworkTileEntityEventListener, IFluidHandler, IHasTemperature
+public class ImpregnatingMachineTileEntity extends TileEntityInventory implements IHasGui,IFluidTankVisual,INetworkTileEntityEventListener, IFluidHandler
{
private final static UniversalRecipeManager recipeManager = new UniversalRecipeManager("tub");
public final ApparatusProcessableInvSlot input;
@@ -123,7 +122,6 @@ public class ImpregnatingMachineTileEntity extends TileEntityInventory implement
visibleFluidId=-1;
IC2.network.get().updateTileEntityField(this, "visibleFluidId");
}
- temperature=(short) (this.fluidTank.getTemperature()-273);
IHLUtils.handleFluidSlotsBehaviour(fillInputSlot, drainInputSlot, emptyFluidItemsSlot, fluidTank);
if (this.canOperate())
{
@@ -334,12 +332,6 @@ public class ImpregnatingMachineTileEntity extends TileEntityInventory implement
}
@Override
- public int getTemperature()
- {
- return this.fluidTank.getTemperature();
- }
-
- @Override
public int getVisibleFluidId() {
return this.visibleFluidId;
}