Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added constructors to match prefab class

Browse source 
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.
This commit is contained in:
DarkGuardsman 2013-07-29 03:48:40 -04:00
parent bc9c30d66b
commit 50d03a632f
11 changed files with 53 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/minecraft/dark/assembly/common/armbot/TileEntityArmbot.java
View file

@ -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<IComputerAccess> connectedComputers = new ArrayList<IComputerAccess>();
/** 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()
{

23
src/minecraft/dark/assembly/common/bottler/BlockBottler.java
View file

@ -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;
}
}

8
src/minecraft/dark/assembly/common/bottler/TileEntityBottler.java
View file

@ -1,8 +0,0 @@
package dark.assembly.common.bottler;
import dark.core.blocks.TileEntityMachine;
public class TileEntityBottler extends TileEntityMachine
{
}

10
src/minecraft/dark/assembly/common/imprinter/prefab/TileEntityFilterable.java
View file

@ -20,6 +20,16 @@ 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? */

10
src/minecraft/dark/assembly/common/machine/TileEntityAssembly.java
View file

@ -33,6 +33,16 @@ import dark.core.tile.network.NetworkTileEntities;
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;

6
src/minecraft/dark/assembly/common/machine/TileEntityDetector.java
View file

@ -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()
{

5
src/minecraft/dark/assembly/common/machine/TileEntityManipulator.java
View file

@ -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()
{

5
src/minecraft/dark/assembly/common/machine/TileEntityRejector.java
View file

@ -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()
{

5
src/minecraft/dark/assembly/common/machine/belt/TileEntityConveyorBelt.java
View file

@ -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<Entity> IgnoreList = new ArrayList<Entity>();
public TileEntityConveyorBelt()
{
super(.1f);
}
@Override
public void onUpdate()
{

2
src/minecraft/dark/assembly/common/machine/crane/TileEntityCraneController.java
View file

@ -17,8 +17,10 @@ public class TileEntityCraneController extends TileEntityAssembly implements ICr
public TileEntityCraneController()
{
super(1);
width = depth = 0;
isCraneValid = false;
}
@Override

16
src/minecraft/dark/assembly/common/machine/crane/TileEntityCraneRail.java
View file

@ -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
}
}