From 0019108b57dadcf9d53b8fc3601ec0797a54e20c Mon Sep 17 00:00:00 2001
From: Henry Mao <admin@calclavia.com>
Date: Wed, 6 Feb 2013 19:18:35 +0800
Subject: [PATCH] Better Crate Control Functions

---
 .../assemblyline/common/AssemblyLine.java     |   2 +-
 .../assemblyline/common/block/BlockCrate.java | 109 ++++++++++++------
 2 files changed, 73 insertions(+), 38 deletions(-)

diff --git a/src/minecraft/assemblyline/common/AssemblyLine.java b/src/minecraft/assemblyline/common/AssemblyLine.java
index 424bd503..5e230427 100644
--- a/src/minecraft/assemblyline/common/AssemblyLine.java
+++ b/src/minecraft/assemblyline/common/AssemblyLine.java
@@ -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 }));
diff --git a/src/minecraft/assemblyline/common/block/BlockCrate.java b/src/minecraft/assemblyline/common/block/BlockCrate.java
index 4840a52f..15909618 100644
--- a/src/minecraft/assemblyline/common/block/BlockCrate.java
+++ b/src/minecraft/assemblyline/common/block/BlockCrate.java
@@ -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.
 	 */