- Disabled generation of Deci/Centi dusts for now.

+ Added a check for Growthcraft versioning, newer versions past 2.3.1 will not have extra support loaded.
+ Improved Chemical Compound tooltip generation on dusts.

2 files changed, 45 insertions, 44 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
index 40895b8c86..b125122cb3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
@@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.loaders;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
-import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Recipe;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
@@ -80,41 +79,7 @@ public class RecipeGen_Plates {
 		}
 		else {
 			Utils.LOG_INFO("Bender Recipe: "+material.getLocalizedName()+" - Failed");			
-		}
-
-
-		Utils.LOG_INFO("Adding crafting recipes for "+material.getLocalizedName()+" Plates - Single & Double");
-
-		//Single Plate Shaped/Shapeless
-		GT_ModHandler.addCraftingRecipe(
-				plate_Single,
-				gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
-				new Object[]{"h", "B", "I",
-						Character.valueOf('I'),
-						ingotStackOne,
-						Character.valueOf('B'),
-						ingotStackOne});
-
-		GT_ModHandler.addShapelessCraftingRecipe(
-				plate_Single,
-				new Object[]{gregtech.api.enums.ToolDictNames.craftingToolForgeHammer,
-						ingotStackOne,
-						ingotStackOne});	     
-
-		//Double Plate Shaped/Shapeless
-		GT_ModHandler.addCraftingRecipe(
-				plate_Double,
-				gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
-				new Object[]{"I", "B", "h",
-						Character.valueOf('I'),
-						plate_Single,
-						Character.valueOf('B'),
-						plate_Single});
-		GT_ModHandler.addShapelessCraftingRecipe(
-				plate_Double,
-				new Object[]{gregtech.api.enums.ToolDictNames.craftingToolForgeHammer,
-						plate_Single,
-						plate_Single});	     
+		} 
 	}
 
 	public static boolean addBenderRecipe(ItemStack aInput1, ItemStack aOutput1, int aDuration, int aEUt) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
index 4f749005d5..65eb280c2f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.xmod.gregtech.loaders;
 
+import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.recipe.UtilsRecipe;
@@ -9,9 +10,44 @@ public class RecipeGen_ShapedCrafting {
 
 	public static void generateRecipes(Material material){
 		Utils.LOG_INFO("Generating Shaped Crafting recipes for "+material.getLocalizedName()); //TODO
+		
+		//Plates
+		
+		//Single Plate Shaped/Shapeless
+		GT_ModHandler.addCraftingRecipe(
+				material.getPlate(1),
+				gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[]{"h", "B", "I",
+						Character.valueOf('I'),
+						material.getIngot(1),
+						Character.valueOf('B'),
+						material.getIngot(1)});
+
+		GT_ModHandler.addShapelessCraftingRecipe(
+				material.getPlate(1),
+				new Object[]{gregtech.api.enums.ToolDictNames.craftingToolForgeHammer,
+					material.getIngot(1),
+					material.getIngot(1)});	     
+
+		//Double Plate Shaped/Shapeless
+		GT_ModHandler.addCraftingRecipe(
+				material.getPlateDouble(1),
+				gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[]{"I", "B", "h",
+						Character.valueOf('I'),
+						material.getPlate(1),
+						Character.valueOf('B'),
+						material.getPlate(1)});
+		
+		GT_ModHandler.addShapelessCraftingRecipe(
+				material.getPlateDouble(1),
+				new Object[]{gregtech.api.enums.ToolDictNames.craftingToolForgeHammer,
+					material.getPlate(1),
+					material.getPlate(1)});	    
+		
 		//Ring Recipe
 		if (!material.isRadioactive){
-			if (UtilsRecipe.addShapedGregtechRecipe(
+			if (UtilsRecipe.recipeBuilder(
 					"craftingToolWrench", null, null,
 					null, material.getRod(1), null,
 					null, null, null,
@@ -26,7 +62,7 @@ public class RecipeGen_ShapedCrafting {
 		//Framebox Recipe
 		if (!material.isRadioactive){
 			ItemStack stackStick = material.getRod(1);
-			if (UtilsRecipe.addShapedGregtechRecipe(
+			if (UtilsRecipe.recipeBuilder(
 					stackStick, stackStick, stackStick,
 					stackStick, "craftingToolWrench", stackStick,
 					stackStick, stackStick, stackStick,
@@ -40,7 +76,7 @@ public class RecipeGen_ShapedCrafting {
 
 		//Shaped Recipe - Bolts
 		if (!material.isRadioactive){
-			if (UtilsRecipe.addShapedGregtechRecipe(
+			if (UtilsRecipe.recipeBuilder(
 					"craftingToolSaw", null, null,
 					null, material.getRod(1), null,
 					null, null, null,
@@ -54,7 +90,7 @@ public class RecipeGen_ShapedCrafting {
 
 
 		//Shaped Recipe - Ingot to Rod
-		if (UtilsRecipe.addShapedGregtechRecipe(
+		if (UtilsRecipe.recipeBuilder(
 				"craftingToolFile", null, null,
 				null, material.getIngot(1), null,
 				null, null, null,
@@ -67,7 +103,7 @@ public class RecipeGen_ShapedCrafting {
 
 
 		//Shaped Recipe - Long Rod to two smalls
-		if (UtilsRecipe.addShapedGregtechRecipe(
+		if (UtilsRecipe.recipeBuilder(
 				"craftingToolSaw", null, null,
 				material.getLongRod(1), null, null,
 				null, null, null,
@@ -79,7 +115,7 @@ public class RecipeGen_ShapedCrafting {
 		}
 
 		//Two small to long rod
-		if (UtilsRecipe.addShapedGregtechRecipe(
+		if (UtilsRecipe.recipeBuilder(
 				material.getRod(1), "craftingToolHardHammer", material.getRod(1),
 				null, null, null,
 				null, null, null,
@@ -92,7 +128,7 @@ public class RecipeGen_ShapedCrafting {
 
 		//Rotor Recipe
 		if (!material.isRadioactive){
-			if (UtilsRecipe.addShapedGregtechRecipe(
+			if (UtilsRecipe.recipeBuilder(
 					material.getPlate(1), "craftingToolHardHammer", material.getPlate(1),
 					material.getScrew(1), material.getRing(1), "craftingToolFile",
 					material.getPlate(1), "craftingToolScrewdriver", material.getPlate(1),
@@ -106,7 +142,7 @@ public class RecipeGen_ShapedCrafting {
 
 		//Screws
 		if (!material.isRadioactive){
-			if (UtilsRecipe.addShapedGregtechRecipe(
+			if (UtilsRecipe.recipeBuilder(
 					"craftingToolFile", material.getBolt(1), null,
 					material.getBolt(1), null, null,
 					null, null, null,