Merge pull request #19 from draknyte1/DesktopPC

+ Added some Buttons to the workbench (WIP)
$ Workbench now uses the vanilla recipe handler.
$ Fixed the tool slots on the Workbench accepting the wrong items in certain cases.

+ Added hundreds of new machine recipes for all of the materials, due to below.
$ Rewrote recipe generation classes, things like plate bending and extrusion recipes now fall in line with GT tiering.

+ Added more functions to Materials.java, now you can get any item from them. (getDustSmall(5))
% Changed tool handling to better support older versions of Gregtech that don't allow Wrenchs to work as a BC/EIO wrench.
% Moved more GT related content to HANDLER_GT.

+ Added a basic re-implementation of the Meta Tile Entity system for GT Machines, using my own blocks as a base. In a feeble attempt to store NBT data to Itemblocks on drop/break.
% Changed lots of debug logging to only show in debug mode, if I missed anything, let me know.

1 files changed, 4 insertions, 7 deletions

diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java
index df06f92811..49ade0a10a 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java
@@ -1,7 +1,6 @@
 package gtPlusPlus.core.tileentities.machines;
 
 import gtPlusPlus.core.inventories.InventoryWorkbenchChest;
-import gtPlusPlus.core.inventories.InventoryWorkbenchCrafting;
 import gtPlusPlus.core.inventories.InventoryWorkbenchTools;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
@@ -10,11 +9,9 @@ public class TileEntityWorkbench extends TileEntity {
 
 	public InventoryWorkbenchChest inventoryChest;
 	public InventoryWorkbenchTools inventoryTool;
-	public InventoryWorkbenchCrafting inventoryCrafting;
-
-
+	//public InventoryWorkbenchCrafting inventoryCrafting;	
+	
 	public TileEntityWorkbench(){
-		this.inventoryCrafting = new InventoryWorkbenchCrafting();//number of slots - without product slot
 		this.inventoryTool = new InventoryWorkbenchTools();//number of slots - without product slot
 		this.inventoryChest = new InventoryWorkbenchChest();//number of slots - without product slot
 		this.canUpdate();
@@ -36,7 +33,7 @@ public class TileEntityWorkbench extends TileEntity {
         super.writeToNBT(nbt);
         inventoryChest.writeToNBT(getTag(nbt, "ContentsChest"));
         inventoryTool.writeToNBT(getTag(nbt, "ContentsTools"));
-        inventoryCrafting.writeToNBT(getTag(nbt, "ContentsCrafting"));
+        //inventoryCrafting.writeToNBT(getTag(nbt, "ContentsCrafting"));
         
     }
     
@@ -46,7 +43,7 @@ public class TileEntityWorkbench extends TileEntity {
         super.readFromNBT(nbt);
         inventoryChest.readFromNBT(nbt.getCompoundTag("ContentsChest"));
         inventoryTool.readFromNBT(nbt.getCompoundTag("ContentsTools"));
-        inventoryCrafting.readFromNBT(nbt.getCompoundTag("ContentsCrafting"));
+        //inventoryCrafting.readFromNBT(nbt.getCompoundTag("ContentsCrafting"));
     }
 
 }
\ No newline at end of file