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

Added single insert item feature

Browse source
This commit is contained in:
Henry Mao 2013-02-11 00:33:02 +08:00
parent e9366ccd15
commit 9ad51d8f27
1 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,8 +11,10 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.UniversalElectricity; import universalelectricity.core.UniversalElectricity;
import universalelectricity.core.implement.IItemElectric;
import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.BlockMachine; import universalelectricity.prefab.BlockMachine;
import universalelectricity.prefab.implement.IToolConfigurator;
import assemblyline.common.AssemblyLine; import assemblyline.common.AssemblyLine;
import assemblyline.common.TabAssemblyLine; import assemblyline.common.TabAssemblyLine;
@ -64,8 +66,29 @@ public class BlockCrate extends BlockMachine
* Placed the item the player is holding into the crate. * Placed the item the player is holding into the crate.
*/ */
@Override @Override
public boolean onMachineActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ)
{ {
/**
* Check if the player is holding a wrench or an electric item. If so, do not open the GUI.
*/
if (entityPlayer.inventory.getCurrentItem() != null)
{
if (entityPlayer.inventory.getCurrentItem().getItem() instanceof IToolConfigurator)
{
world.notifyBlocksOfNeighborChange(x, y, z, this.blockID);
((IToolConfigurator) entityPlayer.inventory.getCurrentItem().getItem()).wrenchUsed(entityPlayer, x, y, z);
return this.onUseWrench(world, x, y, z, entityPlayer, side, hitX, hitY, hitZ);
}
else if (entityPlayer.inventory.getCurrentItem().getItem() instanceof IItemElectric)
{
if (this.onUseElectricItem(world, x, y, z, entityPlayer, side, hitX, hitY, hitZ))
{
return true;
}
}
}
if (!world.isRemote) if (!world.isRemote)
{ {
if (world.getBlockTileEntity(x, y, z) instanceof TileEntityCrate) if (world.getBlockTileEntity(x, y, z) instanceof TileEntityCrate)
@ -85,14 +108,14 @@ public class BlockCrate extends BlockMachine
tileEntity.prevClickTime = world.getWorldTime(); tileEntity.prevClickTime = world.getWorldTime();
// Add items // Add items
if (side == 1 || (side > 1 && hitY > 0.5) || !player.capabilities.isCreativeMode) if (side == 1 || (side > 1 && hitY > 0.5) || !entityPlayer.capabilities.isCreativeMode)
{ {
this.tryInsert(tileEntity, player, allMode); this.tryInsert(tileEntity, entityPlayer, allMode);
} }
// Remove items // Remove items
else if (side == 0 || (side > 1 && hitY <= 0.5)) else if (side == 0 || (side > 1 && hitY <= 0.5))
{ {
this.tryEject(tileEntity, player, allMode); this.tryEject(tileEntity, entityPlayer, allMode);
} }
} }
} }
@ -231,6 +254,7 @@ public class BlockCrate extends BlockMachine
{ {
if (requestStack.isStackable()) if (requestStack.isStackable())
{ {
boolean success = false;
for (int i = 0; i < player.inventory.getSizeInventory(); i++) for (int i = 0; i < player.inventory.getSizeInventory(); i++)
{ {
ItemStack currentStack = player.inventory.getStackInSlot(i); ItemStack currentStack = player.inventory.getStackInSlot(i);
@ -246,11 +270,11 @@ public class BlockCrate extends BlockMachine
((EntityPlayerMP) player).sendContainerToPlayer(player.inventoryContainer); ((EntityPlayerMP) player).sendContainerToPlayer(player.inventoryContainer);
} }
return true; success = true;
} }
} }
} }
return success;
} }
} }