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

Better Crate Control Functions

Browse source
This commit is contained in:
Henry Mao 2013-02-06 19:18:35 +08:00
parent c3e5c5f383
commit 0019108b57
2 changed files with 73 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/minecraft/assemblyline/common/AssemblyLine.java
View file

@ -154,7 +154,7 @@ public class AssemblyLine
GameRegistry.addRecipe(new ShapedOreRecipe(itemImprint, new Object[] { "R", "P", "I", 'P', Item.paper, 'R', Item.redstone, 'I', new ItemStack(Item.dyePowder, 1, 0) }));
// Imprinter (VANILLA COMPATIBLE)
GameRegistry.addRecipe(new ShapedOreRecipe(blockImprinter, new Object[] { "SIS", "SPS", "WCW", 'S', Item.ingotIron, 'C', Block.chest, 'W', Block.workbench, 'P', Block.pistonStickyBase, 'I', new ItemStack(Item.dyePowder, 1, 0) }));
GameRegistry.addRecipe(new ShapedOreRecipe(blockImprinter, new Object[] { "SIS", "SPS", "WCW", 'S', Item.ingotIron, 'C', Block.chest, 'W', Block.workbench, 'P', Block.pistonBase, 'I', new ItemStack(Item.dyePowder, 1, 0) }));
// Detector
GameRegistry.addRecipe(new ShapedOreRecipe(blockDetector, new Object[] { "SES", "SCS", "SPS", 'S', "ingotSteel", 'C', "basicCircuit", 'E', Item.eyeOfEnder }));

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

@ -28,44 +28,27 @@ public class BlockCrate extends BlockMachine
this.setTextureFile(AssemblyLine.BLOCK_TEXTURE_PATH);
}
/**
* Placed the item the player is holding into the crate.
*/
@Override
public boolean onMachineActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ)
public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player)
{
if (world.isRemote)
return true;
if (world.getBlockTileEntity(x, y, z) instanceof TileEntityCrate)
if (!world.isRemote)
{
TileEntityCrate tileEntity = (TileEntityCrate) world.getBlockTileEntity(x, y, z);
/**
* Make double clicking input all stacks.
*/
boolean allMode = false;
if (world.getWorldTime() - tileEntity.prevClickTime < 10)
if (world.getBlockTileEntity(x, y, z) instanceof TileEntityCrate)
{
allMode = true;
}
TileEntityCrate tileEntity = (TileEntityCrate) world.getBlockTileEntity(x, y, z);
tileEntity.prevClickTime = world.getWorldTime();
// add items
if (side == 1 || (side > 1 && hitY > 0.5))
{
if (allMode)
/**
* Make double clicking input all stacks.
*/
boolean allMode = false;
if (world.getWorldTime() - tileEntity.prevClickTime < 10)
{
this.insertAllItems(tileEntity, player);
allMode = true;
}
else
{
this.insertCurrentItem(tileEntity, player);
}
}
// remove items
else if (side == 0 || (side > 1 && hitY <= 0.5))
{
tileEntity.prevClickTime = world.getWorldTime();
if (allMode)
{
this.ejectItems(tileEntity, player, TileEntityCrate.MAX_LIMIT);
@ -73,23 +56,75 @@ public class BlockCrate extends BlockMachine
else
{
ItemStack stack = tileEntity.getStackInSlot(0);
if (stack != null)
{
this.ejectItems(tileEntity, player, stack.getMaxStackSize());
}
}
}
}
}
/**
* Placed the item the player is holding into the crate.
*/
@Override
public boolean onMachineActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ)
{
if (!world.isRemote)
{
if (world.getBlockTileEntity(x, y, z) instanceof TileEntityCrate)
{
TileEntityCrate tileEntity = (TileEntityCrate) world.getBlockTileEntity(x, y, z);
/**
* Make double clicking input all stacks.
*/
boolean allMode = false;
if (world.getWorldTime() - tileEntity.prevClickTime < 10)
{
allMode = true;
}
tileEntity.prevClickTime = world.getWorldTime();
// Add items
if (side == 1 || (side > 1 && hitY > 0.5) || !player.capabilities.isCreativeMode)
{
if (allMode)
{
this.insertAllItems(tileEntity, player);
}
else
{
this.insertCurrentItem(tileEntity, player);
}
}
// remove items
else if (side == 0 || (side > 1 && hitY <= 0.5))
{
if (allMode)
{
this.ejectItems(tileEntity, player, TileEntityCrate.MAX_LIMIT);
}
else
{
ItemStack stack = tileEntity.getStackInSlot(0);
if (stack != null)
{
this.ejectItems(tileEntity, player, stack.getMaxStackSize());
}
}
}
}
}
return true;
}
@Override
public int getRenderType()
{
return super.getRenderType();
}
/**
* Inserts a the itemStack the player is holding into the crate.
*/