tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Got crates to work with double clicks

Browse source
This commit is contained in:
Henry Mao 2013-01-26 21:59:07 +08:00
parent 1c08afde7e
commit 2059523e28
2 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/minecraft/assemblyline/common/block/BlockCrate.java
View file

@ -36,32 +36,45 @@ public class BlockCrate extends BlockMachine
@Override
public boolean onMachineActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ)
{
if (world.getBlockTileEntity(x, y, z) instanceof TileEntityCrate)
{
TileEntityCrate tileEntity = (TileEntityCrate) world.getBlockTileEntity(x, y, z);
if (side == ForgeDirection.UP.ordinal())
/**
* Make double clicking input all stacks.
*/
boolean allMode = false;
if (world.getWorldTime() - tileEntity.prevClickTime < 10)
{
this.insertCurrentItem(tileEntity, player);
allMode = true;
}
else if (side == ForgeDirection.DOWN.ordinal())
tileEntity.prevClickTime = world.getWorldTime();
if (side == 1 || (side > 1 && hitY > 0.5))
{
this.ejectItems(tileEntity, player, 64);
}
else
{
if (hitY > 0.5)
if (allMode)
{
this.insertAllItems(tileEntity, player);
}
else
{
this.insertCurrentItem(tileEntity, player);
// return this.insertAllItems(tileEntity, player);
}
}
else if (side == 0 || (side > 1 && hitY <= 0.5))
{
if (allMode)
{
this.ejectItems(tileEntity, player, TileEntityCrate.MAX_LIMIT);
}
else
{
this.ejectItems(tileEntity, player, 64);
// return this.ejectItems(tileEntity, player, TileEntityCrate.MAX_LIMIT);
}
}
}
return true;
@ -101,6 +114,11 @@ public class BlockCrate extends BlockMachine
{
ItemStack requestStack = player.getCurrentEquippedItem();
if (requestStack == null && tileEntity.getStackInSlot(0) != null)
{
requestStack = tileEntity.getStackInSlot(0).copy();
}
if (requestStack != null)
{
if (requestStack.isStackable())

1
src/minecraft/assemblyline/common/block/TileEntityCrate.java
View file

@ -23,6 +23,7 @@ public class TileEntityCrate extends TileEntityAdvanced implements IInventory, I
{
public static final int MAX_LIMIT = 2880;
private ItemStack[] containingItems = new ItemStack[1];
public long prevClickTime = -1000;
@Override
public boolean canUpdate()