+ Added the Advanced workbench.

+ Added custom slots for the Adv. Workbench, that take either tools or IElectricItems.
% Swapped the textures on most multiblocks/casings.

2 files changed, 166 insertions, 16 deletions

diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
index 270d0d1820..212e9154be 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
@@ -1,20 +1,27 @@
 package gtPlusPlus.core.block.machine;
 
+import gregtech.api.items.GT_MetaGenerated_Tool;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import ic2.core.item.tool.ItemToolWrench;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
+import buildcraft.api.tools.IToolWrench;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import crazypants.enderio.api.tool.ITool;
 
 public class Machine_Workbench extends BlockContainer
 {
@@ -32,7 +39,7 @@ public class Machine_Workbench extends BlockContainer
         this.setBlockName("blockWorkbenchGT");
         this.setCreativeTab(AddToCreativeTab.tabMachines);
         GameRegistry.registerBlock(this, "blockWorkbenchGT");
-		LanguageRegistry.addName(this, "Gregtech Workbench");
+		LanguageRegistry.addName(this, "Bronze Workbench");
         
     }
 
@@ -50,10 +57,10 @@ public class Machine_Workbench extends BlockContainer
 	@SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister p_149651_1_)
     {
-        this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + " /TileEntities/" + "bronze_side_cabinet");
-        this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + " /TileEntities/" + "bronze_top_crafting");
-        this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + " /TileEntities/" + "bronze_side");
-        this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + " /TileEntities/" + "bronze_side_cabinet");
+        this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "bronze_side_cabinet");
+        this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "bronze_top_crafting");
+        this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "bronze_side");
+        this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "bronze_side_cabinet");
     }
 
     /**
@@ -61,17 +68,45 @@ public class Machine_Workbench extends BlockContainer
      */
     @Override
     public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, float lz)
-    {
-        if (world.isRemote) return true;
- 
-        TileEntity te = world.getTileEntity(x, y, z);
-        if (te != null && te instanceof TileEntityWorkbench)
-        {
-            player.openGui(GTplusplus.instance, 3, world, x, y, z);
-            return true;
-        }
-        return false;
-    }
+	{
+		if (world.isRemote) return true;
+
+		ItemStack heldItem = UtilsItems.getItemStackInPlayersHand();
+		boolean holdingWrench = false;
+
+		if (heldItem != null){
+			if (heldItem.getItem() instanceof ItemToolWrench){
+				holdingWrench = true;
+			}
+			else if (heldItem.getItem() instanceof IToolWrench){
+				holdingWrench = true;
+			}
+			else if (heldItem.getItem() instanceof ITool){
+				holdingWrench = true;
+			}
+			else if (heldItem.getItem() instanceof GT_MetaGenerated_Tool){
+				GT_MetaGenerated_Tool testTool = (GT_MetaGenerated_Tool) heldItem.getItem();
+				if (testTool.canWrench(player, x, y, z)){
+					holdingWrench = true;
+				}
+			}
+			else {
+				holdingWrench = false;
+			}
+		}
+
+
+		TileEntity te = world.getTileEntity(x, y, z);
+		if (te != null && te instanceof TileEntityWorkbench)
+		{
+			if (!holdingWrench){
+				player.openGui(GTplusplus.instance, 3, world, x, y, z);
+				return true;				
+			}
+			Utils.LOG_INFO("Holding a Wrench, doing wrench things instead.");
+		}
+		return false;
+	}
 
 	@Override
 	public TileEntity createNewTileEntity(World world, int p_149915_2_) {
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java b/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java
new file mode 100644
index 0000000000..46c08c0d4d
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java
@@ -0,0 +1,115 @@
+package gtPlusPlus.core.block.machine;
+
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.machines.TileEntityWorkbenchAdvanced;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import ic2.core.item.tool.ItemToolWrench;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+import buildcraft.api.tools.IToolWrench;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import crazypants.enderio.api.tool.ITool;
+
+public class Machine_WorkbenchAdvanced extends BlockContainer
+{
+	@SideOnly(Side.CLIENT)
+	private IIcon textureTop;
+	@SideOnly(Side.CLIENT)
+	private IIcon textureBottom;
+	@SideOnly(Side.CLIENT)
+	private IIcon textureFront;
+
+	@SuppressWarnings("deprecation")
+	public Machine_WorkbenchAdvanced()
+	{
+		super(Material.iron);
+		this.setBlockName("blockWorkbenchGTAdvanced");
+		this.setCreativeTab(AddToCreativeTab.tabMachines);
+		GameRegistry.registerBlock(this, "blockWorkbenchGTAdvanced");
+		LanguageRegistry.addName(this, "Advanced Workbench");
+
+	}
+
+	/**
+	 * Gets the block's texture. Args: side, meta
+	 */
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(int p_149691_1_, int p_149691_2_)
+	{
+		return p_149691_1_ == 1 ? this.textureTop : (p_149691_1_ == 0 ? this.textureBottom : (p_149691_1_ != 2 && p_149691_1_ != 4 ? this.blockIcon : this.textureFront));
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(IIconRegister p_149651_1_)
+	{
+		this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "machine_top");
+		this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "cover_crafting");
+		this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "machine_top");
+		this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "machine_top");
+	}
+
+	/**
+	 * Called upon block activation (right click on the block.)
+	 */
+	@Override
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, float lz)
+	{
+		if (world.isRemote) return true;
+
+		ItemStack heldItem = UtilsItems.getItemStackInPlayersHand();
+		boolean holdingWrench = false;
+
+		if (heldItem != null){
+			if (heldItem.getItem() instanceof ItemToolWrench){
+				holdingWrench = true;
+			}
+			else if (heldItem.getItem() instanceof IToolWrench){
+				holdingWrench = true;
+			}
+			else if (heldItem.getItem() instanceof ITool){
+				holdingWrench = true;
+			}
+			else if (heldItem.getItem() instanceof GT_MetaGenerated_Tool){
+				GT_MetaGenerated_Tool testTool = (GT_MetaGenerated_Tool) heldItem.getItem();
+				if (testTool.canWrench(player, x, y, z)){
+					holdingWrench = true;
+				}
+			}
+			else {
+				holdingWrench = false;
+			}
+		}
+
+
+		TileEntity te = world.getTileEntity(x, y, z);
+		if (te != null && te instanceof TileEntityWorkbenchAdvanced)
+		{
+			if (!holdingWrench){
+				player.openGui(GTplusplus.instance, 4, world, x, y, z);
+				return true;				
+			}
+			Utils.LOG_INFO("Holding a Wrench, doing wrench things instead.");
+		}
+		return false;
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(World world, int p_149915_2_) {
+		return new TileEntityWorkbenchAdvanced(128000, 2);
+	}
+}
\ No newline at end of file