From 50d03a632fa1fa5fc44a8867460e837ac12b039d Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Mon, 29 Jul 2013 03:48:40 -0400 Subject: [PATCH] Added constructors to match prefab class Mainly just changes to meet TileEntityMachine power changes. Will still need to go threw most of these later later to fix issues with power drain. --- .../common/armbot/TileEntityArmbot.java | 8 +++++-- .../assembly/common/bottler/BlockBottler.java | 23 ------------------- .../common/bottler/TileEntityBottler.java | 8 ------- .../prefab/TileEntityFilterable.java | 12 +++++++++- .../common/machine/TileEntityAssembly.java | 14 +++++++++-- .../common/machine/TileEntityDetector.java | 6 ++++- .../common/machine/TileEntityManipulator.java | 5 ++++ .../common/machine/TileEntityRejector.java | 5 ++++ .../machine/belt/TileEntityConveyorBelt.java | 5 ++++ .../crane/TileEntityCraneController.java | 2 ++ .../machine/crane/TileEntityCraneRail.java | 16 ++----------- 11 files changed, 53 insertions(+), 51 deletions(-) delete mode 100644 src/minecraft/dark/assembly/common/bottler/BlockBottler.java delete mode 100644 src/minecraft/dark/assembly/common/bottler/TileEntityBottler.java diff --git a/src/minecraft/dark/assembly/common/armbot/TileEntityArmbot.java b/src/minecraft/dark/assembly/common/armbot/TileEntityArmbot.java index 04417498..aeb38de7 100644 --- a/src/minecraft/dark/assembly/common/armbot/TileEntityArmbot.java +++ b/src/minecraft/dark/assembly/common/armbot/TileEntityArmbot.java @@ -46,11 +46,9 @@ import dark.core.helpers.ItemFindingHelper; public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock, IInventory, IPacketReceiver, IArmbot, IPeripheral { - private final CommandManager commandManager = new CommandManager(); /** The items this container contains. */ protected ItemStack disk = null; - public final double WATT_REQUEST = 20; private int computersAttached = 0; private List connectedComputers = new ArrayList(); /** The rotation of the arms. In Degrees. */ @@ -71,6 +69,12 @@ public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock, /** Client Side Object Storage */ public EntityItem renderEntityItem = null; + public TileEntityArmbot() + { + super(20); + // TODO Auto-generated constructor stub + } + @Override public void initiate() { diff --git a/src/minecraft/dark/assembly/common/bottler/BlockBottler.java b/src/minecraft/dark/assembly/common/bottler/BlockBottler.java deleted file mode 100644 index a1b1c1fd..00000000 --- a/src/minecraft/dark/assembly/common/bottler/BlockBottler.java +++ /dev/null @@ -1,23 +0,0 @@ -package dark.assembly.common.bottler; - -import net.minecraft.block.material.Material; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import dark.assembly.common.machine.BlockAssembly; - -public class BlockBottler extends BlockAssembly -{ - - public BlockBottler(int id) - { - super(id, Material.iron, "AutoBottler"); - // TODO Auto-generated constructor stub - } - - @Override - public TileEntity createNewTileEntity(World world) - { - return null; - } - -} diff --git a/src/minecraft/dark/assembly/common/bottler/TileEntityBottler.java b/src/minecraft/dark/assembly/common/bottler/TileEntityBottler.java deleted file mode 100644 index fbbfcbc4..00000000 --- a/src/minecraft/dark/assembly/common/bottler/TileEntityBottler.java +++ /dev/null @@ -1,8 +0,0 @@ -package dark.assembly.common.bottler; - -import dark.core.blocks.TileEntityMachine; - -public class TileEntityBottler extends TileEntityMachine -{ - -} diff --git a/src/minecraft/dark/assembly/common/imprinter/prefab/TileEntityFilterable.java b/src/minecraft/dark/assembly/common/imprinter/prefab/TileEntityFilterable.java index 9f8d7861..db83dfc4 100644 --- a/src/minecraft/dark/assembly/common/imprinter/prefab/TileEntityFilterable.java +++ b/src/minecraft/dark/assembly/common/imprinter/prefab/TileEntityFilterable.java @@ -20,8 +20,18 @@ public abstract class TileEntityFilterable extends TileEntityAssembly implements private ItemStack filterItem; private boolean inverted; + public TileEntityFilterable(float wattsPerTick, float maxEnergy) + { + super(wattsPerTick, maxEnergy); + } + + public TileEntityFilterable(float wattsPerTick) + { + super(wattsPerTick); + } + /** Looks through the things in the filter and finds out which item is being filtered. - * + * * @return Is this filterable block filtering this specific ItemStack? */ public boolean isFiltering(ItemStack itemStack) { diff --git a/src/minecraft/dark/assembly/common/machine/TileEntityAssembly.java b/src/minecraft/dark/assembly/common/machine/TileEntityAssembly.java index 7940d137..1dfa7df1 100644 --- a/src/minecraft/dark/assembly/common/machine/TileEntityAssembly.java +++ b/src/minecraft/dark/assembly/common/machine/TileEntityAssembly.java @@ -28,11 +28,21 @@ import dark.core.tile.network.NetworkTileEntities; /** A class to be inherited by all machines on the assembly line. This class acts as a single peace * in a network of similar tiles allowing all to share power from one or more sources - * + * * @author DarkGuardsman */ public abstract class TileEntityAssembly extends TileEntityMachine implements INetworkPart, IPacketReceiver, IConductor { + public TileEntityAssembly(float wattsPerTick) + { + super(wattsPerTick); + } + + public TileEntityAssembly(float wattsPerTick, float maxEnergy) + { + super(wattsPerTick, maxEnergy); + } + /** Is the tile currently powered allowing it to run */ public boolean running = false; private boolean prevRun = false; @@ -202,7 +212,7 @@ public abstract class TileEntityAssembly extends TileEntityMachine implements IN } /** Handles reduced data from the main packet method - * + * * @param id - packet ID * @param dis - data * @param player - player diff --git a/src/minecraft/dark/assembly/common/machine/TileEntityDetector.java b/src/minecraft/dark/assembly/common/machine/TileEntityDetector.java index 80a96886..7f1c7597 100644 --- a/src/minecraft/dark/assembly/common/machine/TileEntityDetector.java +++ b/src/minecraft/dark/assembly/common/machine/TileEntityDetector.java @@ -14,9 +14,13 @@ import dark.assembly.common.imprinter.prefab.TileEntityFilterable; public class TileEntityDetector extends TileEntityFilterable { - private boolean powering = false; + public TileEntityDetector() + { + super(1); + } + @Override public void updateEntity() { diff --git a/src/minecraft/dark/assembly/common/machine/TileEntityManipulator.java b/src/minecraft/dark/assembly/common/machine/TileEntityManipulator.java index 242ad084..970380da 100644 --- a/src/minecraft/dark/assembly/common/machine/TileEntityManipulator.java +++ b/src/minecraft/dark/assembly/common/machine/TileEntityManipulator.java @@ -25,6 +25,11 @@ public class TileEntityManipulator extends TileEntityFilterable implements IRota /** The class that interacts with inventories for this machine */ private InvInteractionHelper invExtractionHelper; + public TileEntityManipulator() + { + super(1); + } + @Override public void onUpdate() { diff --git a/src/minecraft/dark/assembly/common/machine/TileEntityRejector.java b/src/minecraft/dark/assembly/common/machine/TileEntityRejector.java index 89d947b4..b1b38483 100644 --- a/src/minecraft/dark/assembly/common/machine/TileEntityRejector.java +++ b/src/minecraft/dark/assembly/common/machine/TileEntityRejector.java @@ -19,6 +19,11 @@ public class TileEntityRejector extends TileEntityFilterable /** should the piston fire, or be extended */ public boolean firePiston = false; + public TileEntityRejector() + { + super(1); + } + @Override public void onUpdate() { diff --git a/src/minecraft/dark/assembly/common/machine/belt/TileEntityConveyorBelt.java b/src/minecraft/dark/assembly/common/machine/belt/TileEntityConveyorBelt.java index 07208072..6a98fa3f 100644 --- a/src/minecraft/dark/assembly/common/machine/belt/TileEntityConveyorBelt.java +++ b/src/minecraft/dark/assembly/common/machine/belt/TileEntityConveyorBelt.java @@ -43,6 +43,11 @@ public class TileEntityConveyorBelt extends TileEntityAssembly implements IPacke /** Entities that are ignored allowing for other tiles to interact with them */ public List IgnoreList = new ArrayList(); + public TileEntityConveyorBelt() + { + super(.1f); + } + @Override public void onUpdate() { diff --git a/src/minecraft/dark/assembly/common/machine/crane/TileEntityCraneController.java b/src/minecraft/dark/assembly/common/machine/crane/TileEntityCraneController.java index 7d48967a..281ed433 100644 --- a/src/minecraft/dark/assembly/common/machine/crane/TileEntityCraneController.java +++ b/src/minecraft/dark/assembly/common/machine/crane/TileEntityCraneController.java @@ -17,8 +17,10 @@ public class TileEntityCraneController extends TileEntityAssembly implements ICr public TileEntityCraneController() { + super(1); width = depth = 0; isCraneValid = false; + } @Override diff --git a/src/minecraft/dark/assembly/common/machine/crane/TileEntityCraneRail.java b/src/minecraft/dark/assembly/common/machine/crane/TileEntityCraneRail.java index 25085e9a..b9789912 100644 --- a/src/minecraft/dark/assembly/common/machine/crane/TileEntityCraneRail.java +++ b/src/minecraft/dark/assembly/common/machine/crane/TileEntityCraneRail.java @@ -1,10 +1,11 @@ package dark.assembly.common.machine.crane; +import universalelectricity.prefab.tile.TileEntityAdvanced; import net.minecraftforge.common.ForgeDirection; import dark.assembly.api.ICraneStructure; import dark.assembly.common.machine.TileEntityAssembly; -public class TileEntityCraneRail extends TileEntityAssembly implements ICraneStructure +public class TileEntityCraneRail extends TileEntityAdvanced implements ICraneStructure { @Override @@ -13,17 +14,4 @@ public class TileEntityCraneRail extends TileEntityAssembly implements ICraneStr return true; } - @Override - public boolean canConnect(ForgeDirection direction) - { - return false; - } - - @Override - public void onUpdate() - { - // TODO Auto-generated method stub - - } - }