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.

2 files changed, 21 insertions, 15 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMultiTank.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMultiTank.java
index b78980f3e3..7d6c3caec7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMultiTank.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMultiTank.java
@@ -77,9 +77,9 @@ public class GregtechMetaTileEntityMultiTank
 
     private long getMaximumTankStorage(){
     	int multiplier = getStorageMultiplier();
-    	Utils.LOG_INFO("x = "+multiplier+" * 96000");
+    	Utils.LOG_WARNING("x = "+multiplier+" * 96000");
     	long tempTankStorageMax = (96000*multiplier);
-    	Utils.LOG_INFO("x = "+tempTankStorageMax);
+    	Utils.LOG_WARNING("x = "+tempTankStorageMax);
     	if (tempTankStorageMax <= 0){
     		return 96000;
     	}
@@ -207,7 +207,7 @@ public class GregtechMetaTileEntityMultiTank
         int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
         int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
         if (!aBaseMetaTileEntity.getAirOffset(xDir, 0, zDir)) {
-        	Utils.LOG_INFO("Must be hollow.");
+        	Utils.LOG_WARNING("Must be hollow.");
             return false;
         }
         int tAmount = 0;
@@ -219,20 +219,20 @@ public class GregtechMetaTileEntityMultiTank
                         if ((!addMaintenanceToMachineList(tTileEntity, 17)) && (!addInputToMachineList(tTileEntity, 17)) && (!addOutputToMachineList(tTileEntity, 17)) && (!addEnergyInputToMachineList(tTileEntity, 17))) {
                             if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) {
                             	if (h < 3){
-                                	Utils.LOG_INFO("Casing Expected.");
+                                	Utils.LOG_WARNING("Casing Expected.");
                                     return false;
                             	}
                             	else if (h >= 3){
-                                	//Utils.LOG_INFO("Your Multitank can be 20 blocks tall.");
+                                	//Utils.LOG_WARNING("Your Multitank can be 20 blocks tall.");
                             	}
                             }
                             if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 11) {
                             	if (h < 3){
-                                	Utils.LOG_INFO("Wrong Meta.");
+                                	Utils.LOG_WARNING("Wrong Meta.");
                                     return false;
                             	}
                             	else if (h >= 3){
-                                	//Utils.LOG_INFO("Your Multitank can be 20 blocks tall.");
+                                	//Utils.LOG_WARNING("Your Multitank can be 20 blocks tall.");
                             	}
                             }
                             if (h < 3){
@@ -240,10 +240,10 @@ public class GregtechMetaTileEntityMultiTank
                             }
                             else if (h >= 3){
                             	if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) == Blocks.air || aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getUnlocalizedName().contains("residual")){
-                                	Utils.LOG_INFO("Found air");
+                                	Utils.LOG_WARNING("Found air");
                             	}
                             	else {
-                            		Utils.LOG_INFO("Layer "+(h+2)+" is complete. Adding "+(64000*9)+"L storage to the tank.");
+                            		Utils.LOG_WARNING("Layer "+(h+2)+" is complete. Adding "+(64000*9)+"L storage to the tank.");
                                     tAmount++;
                             	}
                         	}
@@ -253,7 +253,7 @@ public class GregtechMetaTileEntityMultiTank
             }
         }
         multiblockCasingCount = (short) tAmount;
-        Utils.LOG_INFO("Your Multitank can be 20 blocks tall.");
+        Utils.LOG_WARNING("Your Multitank can be 20 blocks tall.");
         Utils.LOG_INFO("Casings Count: "+tAmount+" Valid Multiblock: "+(tAmount >= 16)+" Tank Storage Capacity:"+getMaximumTankStorage()+"L");
         return tAmount >= 16;
     }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
index 7a2e49492d..6bce3b9f67 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
@@ -16,10 +16,10 @@ public class GT_MetaTileEntity_TieredTank
         extends GregtechMetaBasicTank {
 	
 	protected FluidStack internalTank = getInternalStack();
-	protected String fluidName = getFluidName();
-	protected int fluidAmount = getInternalFluidAmount();
+	/*protected String fluidName = getFluidName();
+	protected int fluidAmount = getInternalFluidAmount();*/
 	
-	private String getFluidName(){
+	/*private String getFluidName(){
 		String x;
 		if (internalTank != null){
 			x = internalTank.getFluid().getName();
@@ -39,7 +39,7 @@ public class GT_MetaTileEntity_TieredTank
 			x = 0;
 		}
 		return x;
-	}
+	}*/
 	
     public GT_MetaTileEntity_TieredTank(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 3, "Stores " + ((int) (Math.pow(2, aTier) * 32000)) + "L of fluid");
@@ -89,8 +89,14 @@ public class GT_MetaTileEntity_TieredTank
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        if (aBaseMetaTileEntity.isClientSide()) return true;
+    	Utils.LOG_INFO("Right Click on Block");
+        if (aBaseMetaTileEntity.isClientSide()){
+        	Utils.LOG_INFO("MTE is ClientSide");
+        	return true;
+        }
+    	Utils.LOG_INFO("MTE is not ClientSide");
         aBaseMetaTileEntity.openGUI(aPlayer);
+    	Utils.LOG_INFO("MTE is now has an open GUI");
         return true;
     }