Added recipes for the GT4 Workbenches.

3 files changed, 18 insertions, 10 deletions

diff --git a/src/main/java/gtPlusPlus/core/block/ModBlocks.java b/src/main/java/gtPlusPlus/core/block/ModBlocks.java
index a716366601..5b29d9a636 100644
--- a/src/main/java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/main/java/gtPlusPlus/core/block/ModBlocks.java
@@ -43,8 +43,6 @@ public final class ModBlocks {
 	public static Block blockFakeMiningHead;
 	
 	public static Block blockFishTrap;
-	public static Block blockWorkbench;
-	public static Block blockWorkbenchAdvanced;
 	public static Block blockDecayablesChest;
 	public static Block blockEggBox;
 	
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
index caafbccf29..61bae54b31 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -42,8 +42,10 @@ public class RECIPES_General {
 	static ItemStack OUTPUT_Blueprint;
 	static ItemStack RECIPE_CraftingTable;
 	static String RECIPE_BronzePlate = "plateBronze";
+	static String RECIPE_StainlessPlate = "plateStainlessSteel";
 	static ItemStack RECIPE_BasicCasingIC2;
 	static ItemStack OUTPUT_Workbench_Bronze;
+	static ItemStack OUTPUT_Workbench_Advanced;
 	static ItemStack RECIPE_HydrogenDust;
 
 	public static void loadRecipes(){		
@@ -55,8 +57,9 @@ public class RECIPES_General {
 			RECIPE_CraftingTable = ItemUtils.getSimpleStack(Blocks.crafting_table);
 			RECIPE_HydrogenDust = ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob);	
 			RECIPE_BasicCasingIC2 = ItemUtils.getItemStackFromFQRN("IC2:blockMachine", 1);			
-			OUTPUT_Workbench_Bronze = ItemUtils.getSimpleStack(ModBlocks.blockWorkbench);
-			OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase);	
+			OUTPUT_Workbench_Bronze = GregtechItemList.GT4_Workbench_Bronze.get(1);	
+			OUTPUT_Workbench_Advanced = GregtechItemList.GT4_Workbench_Advanced.get(1);	
+			OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase, 2);	
 			run();
 			addCompressedObsidian();
 			migratedRecipes();
@@ -65,18 +68,24 @@ public class RECIPES_General {
 
 	private static void run() {
 		//Workbench Blueprint
-		/*RecipeUtils.addShapedRecipe(
+		RecipeUtils.addShapedRecipe(
 				RECIPE_Paper, RECIPE_LapisDust, NULL,
 				RECIPE_Paper, RECIPE_LapisDust, NULL,
 				RECIPE_LapisDust, RECIPE_LapisDust, NULL,
-				OUTPUT_Blueprint);*/
+				OUTPUT_Blueprint);
 
 		//Bronze Workbench
-		/*RecipeUtils.addShapedRecipe(
+		RecipeUtils.addShapedRecipe(
 				RECIPE_BronzePlate, RECIPE_CraftingTable, RECIPE_BronzePlate,
 				RECIPE_BronzePlate, RECIPE_BasicCasingIC2, RECIPE_BronzePlate,
-				RECIPE_BronzePlate, RECIPE_BronzePlate, RECIPE_BronzePlate,
-				OUTPUT_Workbench_Bronze);*/
+				RECIPE_BronzePlate, CI.getTieredCircuitOreDictName(0), RECIPE_BronzePlate,
+				OUTPUT_Workbench_Bronze);
+		
+		RecipeUtils.addShapedRecipe(
+				RECIPE_StainlessPlate, CI.getTieredCircuitOreDictName(3), RECIPE_StainlessPlate,
+				RECIPE_StainlessPlate, OUTPUT_Workbench_Bronze, RECIPE_StainlessPlate,
+				RECIPE_StainlessPlate, CI.getTieredCircuitOreDictName(3), RECIPE_StainlessPlate,
+				OUTPUT_Workbench_Advanced);
 
 		//Generates recipes for the Dull shard when TC is not installed.
 		if (!LoadedMods.Thaumcraft) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/workbench/GT_Container_BronzeWorkbench.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/workbench/GT_Container_BronzeWorkbench.java
index f7cfd31e5d..d26c4d49fd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/workbench/GT_Container_BronzeWorkbench.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/workbench/GT_Container_BronzeWorkbench.java
@@ -4,6 +4,7 @@ import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.gui.GT_Slot_Holo;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.slots.SlotBlueprint;
 import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_BronzeCraftingTable;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -53,7 +54,7 @@ public class GT_Container_BronzeWorkbench extends GT_ContainerMetaTile_Machine {
         addSlotToContainer(new Slot(mTileEntity, 33, 154, 28));
         addSlotToContainer(new Slot(mTileEntity, 34, 154, 64));
         
-        addSlotToContainer(new Slot(mTileEntity, 30, 136, 28));
+        addSlotToContainer(new SlotBlueprint(mTileEntity, 30, 136, 28));
         addSlotToContainer(new GT_Slot_Holo(mTileEntity, 31, 136, 64, false, false, 1));
         addSlotToContainer(new GT_Slot_Holo(mTileEntity, 32, 154, 46, false, false, 1));
         addSlotToContainer(new GT_Slot_Holo(mTileEntity, 32, 136, 46, false, false, 1));