Merge pull request #13 from draknyte1/NewMatSystem

New Back-end systems for dynamic Material (Alloys) and Tool generation.
Also fixes a few issues with other things, which were noticed during development of the new systems.

1 files changed, 43 insertions, 2 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
index a58d258ff3..dc9173a502 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
@@ -1,12 +1,20 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.recipe.RECIPE_CONSTANTS;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator;
+import net.minecraft.item.ItemStack;
 
 public class GregtechRocketFuelGenerator {
-	
+
 	public static void run()
 	{
 		if (LoadedMods.Gregtech){
@@ -20,6 +28,39 @@ public class GregtechRocketFuelGenerator {
 		GregtechItemList.Rocket_Engine_EV.set(new GregtechMetaTileEntityRocketFuelGenerator(793, "advancedgenerator.rocketFuel.tier.01", "Basic Rocket Engine", 4).getStackForm(1L));
 		GregtechItemList.Rocket_Engine_IV.set(new GregtechMetaTileEntityRocketFuelGenerator(794, "advancedgenerator.rocketFuel.tier.02", "Advanced Rocket Engine", 5).getStackForm(1L));
 		GregtechItemList.Rocket_Engine_LuV.set(new GregtechMetaTileEntityRocketFuelGenerator(795, "advancedgenerator.rocketFuel.tier.03", "Turbo Rocket Engine", 6).getStackForm(1L));
+
+		GT_ModHandler.addCraftingRecipe(
+				GregtechItemList.Rocket_Engine_EV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, 
+				new Object[]{"PCP", "EME", "GWG",
+					Character.valueOf('M'), ItemList.Hull_EV,
+					Character.valueOf('P'), ItemList.Electric_Piston_EV,
+					Character.valueOf('E'), ItemList.Electric_Motor_EV,
+					Character.valueOf('C'), GregtechOrePrefixes.circuit.get(Materials.Ultimate),
+					Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Aluminium),
+					Character.valueOf('G'), OrePrefixes.gearGt.get(Materials.Titanium)});
+		
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Rocket_Engine_IV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[]{"PCP", "EME", "GWG",
+			Character.valueOf('M'), ItemList.Hull_IV,
+			Character.valueOf('P'), ItemList.Electric_Piston_IV,
+			Character.valueOf('E'), ItemList.Electric_Motor_IV,
+			Character.valueOf('C'), GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic),
+			Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Platinum),
+			Character.valueOf('G'), OrePrefixes.gearGt.get(Materials.TungstenSteel)});
+		
+		final ItemStack INGREDIENT_1 = RECIPE_CONSTANTS.electricPiston_LuV;
+		final ItemStack INGREDIENT_2 = RECIPE_CONSTANTS.electricMotor_LuV;
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Rocket_Engine_LuV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[]{"PCP", "EME", "GWG", 
+			Character.valueOf('M'), ItemList.Hull_LuV,
+			Character.valueOf('P'), INGREDIENT_1, 
+			Character.valueOf('E'), INGREDIENT_2, 
+			Character.valueOf('C'), GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic), 
+			Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Tungsten), 
+			Character.valueOf('G'), OrePrefixes.gearGt.get(Materials.Chrome)});
 	}
-	
+
 }