+ Added the Advanced workbench.

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

1 files changed, 37 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/core/util/item/UtilsItems.java b/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
index 64f06a078c..62162e596d 100644
--- a/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
+++ b/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
@@ -244,6 +244,17 @@ public class UtilsItems {
 
 		return null;
 	}
+	
+	public static ItemStack getItemStackInPlayersHand(){
+		Minecraft mc = Minecraft.getMinecraft();
+		ItemStack heldItem = null;
+		try{heldItem = mc.thePlayer.getHeldItem();
+		}catch(NullPointerException e){return null;}
+		if (heldItem != null){
+			return heldItem;
+		}
+		return null;
+	}
 
 	public static void generateSpawnEgg(String entityModID, String parSpawnName, int colourEgg, int colourOverlay){
 		Item itemSpawnEgg = new BasicSpawnEgg(entityModID, parSpawnName, colourEgg, colourOverlay).setUnlocalizedName("spawn_egg_"+parSpawnName.toLowerCase()).setTextureName(CORE.MODID+":spawn_egg");
@@ -279,6 +290,32 @@ public class UtilsItems {
 		Utils.LOG_INFO(oredictName+" was not valid.");	
 		return null;
 	}
+	
+	public static ItemStack getItemStackOfAmountFromOreDictNoBrokenExcluding(String excludeModName, String oredictName, int amount){
+		ItemStack returnValue = getItemStackOfAmountFromOreDict(oredictName, amount);
+
+		if (returnValue.getItem().getClass() != ModItems.AAA_Broken.getClass() || returnValue.getItem() != ModItems.AAA_Broken){	
+			if (returnValue.getClass().toString().toLowerCase().contains(excludeModName.toLowerCase())){
+				ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName);
+				if (!oreDictList.isEmpty()){
+					returnValue = oreDictList.get(1).copy();
+					returnValue.stackSize = amount;
+					return returnValue;
+				}
+			}	
+			else {
+				ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName);
+				if (!oreDictList.isEmpty()){
+					returnValue = oreDictList.get(1).copy();
+					returnValue.stackSize = amount;
+					return returnValue;
+				}
+			}
+			return returnValue;
+		}
+		Utils.LOG_INFO(oredictName+" was not valid.");	
+		return null;
+	}
 
 	public static void generateItemsFromMaterial(Material matInfo){