Improved Matter Fabricator recipes.

1 files changed, 15 insertions, 99 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
index f07be17ffd..8489f0d59c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
@@ -3,6 +3,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_Recipe;
+import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Massfabricator;
 import gregtech.api.util.GTPP_Recipe;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
@@ -33,9 +34,9 @@ public class GregtechIndustrialMassFabricator {
 	}
 
 	private static void generateRecipes() {
-		
+
 		//Generate Scrap->UUA Recipes
-		
+
 
 
 		//Basic UUA1
@@ -63,7 +64,7 @@ public class GregtechIndustrialMassFabricator {
 
 		GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(UUA_From_Scrap);
 		GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(UUA_From_ScrapBoxes);		
-		
+
 		if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {					
 			//Basic UUM
 			GT_Recipe generateUUM = new GTPP_Recipe(
@@ -94,10 +95,13 @@ public class GregtechIndustrialMassFabricator {
 		}
 		else {
 
+			GT_Recipe.GT_Recipe_Map.sMassFabFakeRecipes.addFakeRecipe(false, null, null, null, null, new FluidStack[]{Materials.UUMatter.getFluid(1L)}, GT_MetaTileEntity_Massfabricator.sDurationMultiplier, 256, 0);
+			GT_Recipe.GT_Recipe_Map.sMassFabFakeRecipes.addFakeRecipe(false, null, null, null, new FluidStack[]{Materials.UUAmplifier.getFluid(GT_MetaTileEntity_Massfabricator.sUUAperUUM)}, new FluidStack[]{Materials.UUMatter.getFluid(1L)}, GT_MetaTileEntity_Massfabricator.sDurationMultiplier / GT_MetaTileEntity_Massfabricator.sUUASpeedBonus, 256, 0);
+
 			//Basic UUM
 			GT_Recipe generateUUM_LV = new GTPP_Recipe(
 					false, 
-					new ItemStack[] {CI.getNumberedCircuit(15)}, 
+					new ItemStack[] {CI.getNumberedCircuit(1)}, 
 					new ItemStack[] {GT_Values.NI}, 
 					null, null, 
 					new FluidStack[] {GT_Values.NF}, 
@@ -105,119 +109,31 @@ public class GregtechIndustrialMassFabricator {
 					160*20, 
 					256, 
 					0);
-			GT_Recipe generateUUM_MV = new GTPP_Recipe(
-					false, 
-					new ItemStack[] {CI.getNumberedCircuit(14)}, 
-					new ItemStack[] {GT_Values.NI}, 
-					null, null, 
-					new FluidStack[] {GT_Values.NF}, 
-					new FluidStack[] {Materials.UUMatter.getFluid(1)},
-					160*20, 
-					512, 
-					0);
-			GT_Recipe generateUUM_HV = new GTPP_Recipe(
-					false, 
-					new ItemStack[] {CI.getNumberedCircuit(13)}, 
-					new ItemStack[] {GT_Values.NI}, 
-					null, null, 
-					new FluidStack[] {GT_Values.NF}, 
-					new FluidStack[] {Materials.UUMatter.getFluid(1)},
-					160*20, 
-					1024, 
-					0);
-			GT_Recipe generateUUM_EV = new GTPP_Recipe(
-					false, 
-					new ItemStack[] {CI.getNumberedCircuit(12)}, 
-					new ItemStack[] {GT_Values.NI}, 
-					null, null, 
-					new FluidStack[] {GT_Values.NF}, 
-					new FluidStack[] {Materials.UUMatter.getFluid(1)},
-					160*20, 
-					2048, 
-					0);
-			GT_Recipe generateUUM_IV = new GTPP_Recipe(
-					false, 
-					new ItemStack[] {CI.getNumberedCircuit(11)}, 
-					new ItemStack[] {GT_Values.NI}, 
-					null, null, 
-					new FluidStack[] {GT_Values.NF}, 
-					new FluidStack[] {Materials.UUMatter.getFluid(1)},
-					160*20, 
-					4096, 
-					0);
 
 			//Basic UUM
 			GT_Recipe generateUUMFromUUA_LV = new GTPP_Recipe(
 					false, 
-					new ItemStack[] {CI.getNumberedCircuit(5)}, 
-					new ItemStack[] {GT_Values.NI}, 
-					null, null, 
-					new FluidStack[] {Materials.UUAmplifier.getFluid(1)}, 
-					new FluidStack[] {Materials.UUMatter.getFluid(1)},
-					40*20, 
-					256, 
-					0);
-			GT_Recipe generateUUMFromUUA_MV = new GTPP_Recipe(
-					false, 
-					new ItemStack[] {CI.getNumberedCircuit(4)}, 
-					new ItemStack[] {GT_Values.NI}, 
-					null, null, 
-					new FluidStack[] {Materials.UUAmplifier.getFluid(1)}, 
-					new FluidStack[] {Materials.UUMatter.getFluid(1)},
-					40*20, 
-					512, 
-					0);
-			GT_Recipe generateUUMFromUUA_HV = new GTPP_Recipe(
-					false, 
-					new ItemStack[] {CI.getNumberedCircuit(3)}, 
-					new ItemStack[] {GT_Values.NI}, 
-					null, null, 
-					new FluidStack[] {Materials.UUAmplifier.getFluid(1)}, 
-					new FluidStack[] {Materials.UUMatter.getFluid(1)},
-					40*20, 
-					1024, 
-					0);
-			GT_Recipe generateUUMFromUUA_EV = new GTPP_Recipe(
-					false, 
 					new ItemStack[] {CI.getNumberedCircuit(2)}, 
 					new ItemStack[] {GT_Values.NI}, 
 					null, null, 
 					new FluidStack[] {Materials.UUAmplifier.getFluid(1)}, 
 					new FluidStack[] {Materials.UUMatter.getFluid(1)},
 					40*20, 
-					2048, 
-					0);
-			GT_Recipe generateUUMFromUUA_IV = new GTPP_Recipe(
-					false, 
-					new ItemStack[] {CI.getNumberedCircuit(1)}, 
-					new ItemStack[] {GT_Values.NI}, 
-					null, null, 
-					new FluidStack[] {Materials.UUAmplifier.getFluid(1)}, 
-					new FluidStack[] {Materials.UUMatter.getFluid(1)},
-					40*20, 
-					4096, 
+					256, 
 					0);
 
 			GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUM_LV);
-			GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUM_MV);
-			GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUM_HV);
-			GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUM_EV);
-			GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUM_IV);
-			GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUMFromUUA_LV);
-			GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUMFromUUA_MV);
-			GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUMFromUUA_HV);
-			GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUMFromUUA_EV);
-			GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUMFromUUA_IV);			
+			GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUMFromUUA_LV);	
 
 		}
-		
+
 		Logger.INFO("Generated "+GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.mRecipeList.size()+" Matter Fabricator recipes.");
 
-		
-		
+
+
 
 	}
-	
+
 
 
 	public static ItemStack getScrapPile() {
@@ -226,5 +142,5 @@ public class GregtechIndustrialMassFabricator {
 	public static ItemStack getScrapBox() {
 		return ItemUtils.getSimpleStack(ItemUtils.getItemFromFQRN("IC2:itemScrapbox"));
 	}
-	
+
 }
\ No newline at end of file