Make unpowered machines not inherit from TilePowered

This commit is contained in:
mezz committed 2014-11-05 21:50:14 -08:00
1 parent 32313cfe6a
commit 7d72a60f9b
3 files changed
+9 -23

No files matched your search

@@ -12,7 +12,7 @@ package forestry.core.gadgets;
import forestry.core.network.EntityNetData;
public abstract class Mill extends TilePowered {
public abstract class Mill extends TileBase {
@EntityNetData
public int charge = 0;
@@ -23,7 +23,6 @@ public abstract class Mill extends TilePowered {
public float progress;
public Mill() {
super(0, 0, 0);
speed = 0.01F;
}
@@ -76,10 +75,4 @@ public abstract class Mill extends TilePowered {
}
protected abstract void activate();
@Override
public boolean isWorking() {
return charge != 0;
}
}
@@ -24,6 +24,7 @@ import forestry.core.fluids.tanks.FilteredTank;
import forestry.core.gadgets.TileBase;
import forestry.core.gadgets.TilePowered;
import forestry.core.interfaces.ILiquidTankContainer;
import forestry.core.interfaces.IRenderableMachine;
import forestry.core.network.EntityNetData;
import forestry.core.network.GuiId;
import forestry.core.triggers.ForestryTrigger;
@@ -50,7 +51,7 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
public class MachineMoistener extends TilePowered implements ISpecialInventory, ISidedInventory, ILiquidTankContainer {
public class MachineMoistener extends TileBase implements ISpecialInventory, ISidedInventory, ILiquidTankContainer, IRenderableMachine {
/* CONSTANTS */
private static final short SLOT_STASH_1 = 0;
@@ -142,7 +143,6 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory,
private ItemStack pendingProduct;
public MachineMoistener() {
super(0, 0, 0);
setHints(Config.hints.get("moistener"));
resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, FluidRegistry.WATER);
tankManager = new TankManager(resourceTank);
@@ -461,17 +461,10 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory,
}
}
@Override
public boolean workCycle() {
return false;
}
@Override
public boolean isWorking() {
return burnTime > 0 && resourceTank.getFluidAmount() > 0;
}
@Override
public boolean hasFuelMin(float percentage) {
int max = 0;
int avail = 0;
@@ -493,7 +486,6 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory,
return ((float) avail / (float) max) > percentage;
}
@Override
public boolean hasResourcesMin(float percentage) {
if (inventory.getStackInSlot(SLOT_RESOURCE) == null)
return false;
@@ -525,11 +517,17 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory,
return (resourceTank.getFluidAmount() * i) / Defaults.PROCESSOR_TANK_CAPACITY;
}
/* IRenderableMachine */
@Override
public EnumTankLevel getPrimaryLevel() {
return Utils.rateTankLevel(getResourceScaled(100));
}
@Override
public EnumTankLevel getSecondaryLevel() {
return EnumTankLevel.EMPTY;
}
/* IINVENTORY */
@Override public int getSizeInventory() { return inventory.getSizeInventory(); }
@Override public ItemStack getStackInSlot(int i) { return inventory.getStackInSlot(i); }
@@ -117,11 +117,6 @@ public class MillRainmaker extends Mill implements ISpecialInventory {
}
}
@Override
public boolean workCycle() {
return false;
}
@Override
public int addItem(ItemStack stack, boolean doAdd, ForgeDirection from) {
if (charge != 0)