Merge branch 'master' into experimental

src/main/java/tconstruct/client/ArmorControls.java

@@ -104,7 +104,7 @@ public class ArmorControls {
 
 	private void checkKeys() {
 		for (KeyBinding key : this.keys) {
-			if (this.isKeyActive(key.getKeyCode())) {
+			if (key != null && this.isKeyActive(key.getKeyCode())) {
 				this.keyPressed(key);
 			}
 		}

src/main/java/tconstruct/library/tools/HarvestTool.java

@@ -311,11 +311,21 @@ public abstract class HarvestTool extends ToolCore
 
             // following code can be found in PlayerControllerMP.onPlayerDestroyBlock
             world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12));
-            if(block.removedByPlayer(world, player, x,y,z))
+            if(block.removedByPlayer(world, player, x,y,z, true))
             {
                 block.onBlockDestroyedByPlayer(world, x,y,z, meta);
             }
-            pcmp.onPlayerDestroyBlock(x, y, z, sidehit);
+            // callback to the tool
+            ItemStack itemstack = player.getCurrentEquippedItem();
+            if (itemstack != null)
+            {
+                itemstack.func_150999_a(world, block, x, y, z, player);
+
+                if (itemstack.stackSize == 0)
+                {
+                    player.destroyCurrentEquippedItem();
+                }
+            }
 
             // send an update to the server, so we get an update back
             if(PHConstruct.extraBlockUpdates)

src/main/java/tconstruct/smeltery/gui/SmelteryGui.java

@@ -518,7 +518,7 @@ public class SmelteryGui extends ActiveContainerGui
     {
         super.mouseClicked(mouseX, mouseY, mouseButton);
 
-        int cornerX = (width - xSize) / 2 + 36;
+        int cornerX = (width - xSize) / 2 + 36 + (columns - 3) * 22;
         int cornerY = (height - ySize) / 2;
         int fluidToBeBroughtUp = -1;