From 7d72a60f9b141004de1a32b832e8a676eb21b8db Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 5 Nov 2014 21:50:14 -0800 Subject: [PATCH] Make unpowered machines not inherit from TilePowered --- src/main/java/forestry/core/gadgets/Mill.java | 9 +-------- .../factory/gadgets/MachineMoistener.java | 18 ++++++++---------- .../factory/gadgets/MillRainmaker.java | 5 ----- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/src/main/java/forestry/core/gadgets/Mill.java b/src/main/java/forestry/core/gadgets/Mill.java index adf223e4f..67f1291a1 100755 --- a/src/main/java/forestry/core/gadgets/Mill.java +++ b/src/main/java/forestry/core/gadgets/Mill.java @@ -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; - } - } diff --git a/src/main/java/forestry/factory/gadgets/MachineMoistener.java b/src/main/java/forestry/factory/gadgets/MachineMoistener.java index 59c3c953d..9c9f9fdcb 100755 --- a/src/main/java/forestry/factory/gadgets/MachineMoistener.java +++ b/src/main/java/forestry/factory/gadgets/MachineMoistener.java @@ -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); } diff --git a/src/main/java/forestry/factory/gadgets/MillRainmaker.java b/src/main/java/forestry/factory/gadgets/MillRainmaker.java index 3bbab49e7..438d95216 100755 --- a/src/main/java/forestry/factory/gadgets/MillRainmaker.java +++ b/src/main/java/forestry/factory/gadgets/MillRainmaker.java @@ -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)