Added missing recipes for Rotors and Fine Wire.

Hopefully remove bad plasma related recipes.
Hopefully cleaned up Wire/Cable recipes.

5 files changed, 157 insertions, 84 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
index cd43d6201c..54e9716520 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
@@ -3,23 +3,22 @@ package gtPlusPlus.xmod.gregtech.loaders;
 import java.util.HashSet;
 import java.util.Set;
 
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.GregTech_API;
+import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
-import gregtech.api.util.GT_Recipe;
-
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.item.ItemStack;
 
 public class RecipeGen_Extruder extends RecipeGen_Base {
 
 	public final static Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>();
+	private static boolean mRotorShapeEnabled = false;
 	static {
 		MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
+		mRotorShapeEnabled = ItemUtils.doesItemListEntryExist("Shape_Extruder_Rotor");
 	}
 
 	public RecipeGen_Extruder(final Material M){
@@ -48,10 +47,10 @@ public class RecipeGen_Extruder extends RecipeGen_Base {
 
 		Logger.WARNING("Generating Extruder recipes for "+material.getLocalizedName());
 
-		
+
 		if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getBlock(1))) {
 			//Ingot Recipe
-			if (addExtruderRecipe(
+			if (GT_Values.RA.addExtruderRecipe(
 					material.getBlock(1),
 					shape_Ingot,
 					material.getIngot(9),
@@ -64,7 +63,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base {
 			}
 
 			//Block Recipe
-			if (addExtruderRecipe(
+			if (GT_Values.RA.addExtruderRecipe(
 					material.getIngot(9),
 					shape_Block,
 					material.getBlock(1),
@@ -80,97 +79,101 @@ public class RecipeGen_Extruder extends RecipeGen_Base {
 
 		//Plate Recipe
 		if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getPlate(1)))
-		if (addExtruderRecipe(
-				itemIngot,
-				shape_Plate,
-				itemPlate,
-				10, 
-				material.vVoltageMultiplier)){
-			Logger.WARNING("Extruder Plate Recipe: "+material.getLocalizedName()+" - Success");
-		}
-		else {
-			Logger.WARNING("Extruder Plate Recipe: "+material.getLocalizedName()+" - Failed");
-		}
-
-		//Ring Recipe
-		if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getRing(1)))
-		if (!material.isRadioactive){
-			if (addExtruderRecipe(
+			if (GT_Values.RA.addExtruderRecipe(
 					itemIngot,
-					shape_Ring,
-					material.getRing(4),
-					(int) Math.max(material.getMass() * 2L * 1, 1),
+					shape_Plate,
+					itemPlate,
+					10, 
 					material.vVoltageMultiplier)){
-				Logger.WARNING("Extruder Ring Recipe: "+material.getLocalizedName()+" - Success");
+				Logger.WARNING("Extruder Plate Recipe: "+material.getLocalizedName()+" - Success");
 			}
 			else {
-				Logger.WARNING("Extruder Ring Recipe: "+material.getLocalizedName()+" - Failed");
+				Logger.WARNING("Extruder Plate Recipe: "+material.getLocalizedName()+" - Failed");
+			}
+
+		//Ring Recipe
+		if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getRing(1)))
+			if (!material.isRadioactive){
+				if (GT_Values.RA.addExtruderRecipe(
+						itemIngot,
+						shape_Ring,
+						material.getRing(4),
+						(int) Math.max(material.getMass() * 2L * 1, 1),
+						material.vVoltageMultiplier)){
+					Logger.WARNING("Extruder Ring Recipe: "+material.getLocalizedName()+" - Success");
+				}
+				else {
+					Logger.WARNING("Extruder Ring Recipe: "+material.getLocalizedName()+" - Failed");
+				}
 			}
-		}
 
 
 		//Gear Recipe
 		if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getGear(1)))
-		if (!material.isRadioactive){
-			if (addExtruderRecipe(
-					material.getIngot(4),
-					shape_Gear,
-					itemGear,
-					(int) Math.max(material.getMass() * 5L, 1),
-					material.vVoltageMultiplier)){
-				Logger.WARNING("Extruder Gear Recipe: "+material.getLocalizedName()+" - Success");
+			if (!material.isRadioactive){
+				if (GT_Values.RA.addExtruderRecipe(
+						material.getIngot(4),
+						shape_Gear,
+						itemGear,
+						(int) Math.max(material.getMass() * 5L, 1),
+						material.vVoltageMultiplier)){
+					Logger.WARNING("Extruder Gear Recipe: "+material.getLocalizedName()+" - Success");
+				}
+				else {
+					Logger.WARNING("Extruder Gear Recipe: "+material.getLocalizedName()+" - Failed");
+				}
 			}
-			else {
-				Logger.WARNING("Extruder Gear Recipe: "+material.getLocalizedName()+" - Failed");
-			}
-		}
 
 
 		//Rod Recipe
 		if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getRod(1)))
-		if (addExtruderRecipe(
-				itemIngot,
-				shape_Rod,
-				material.getRod(2),
-				(int) Math.max(material.getMass() * 2L * 1, 1),
-				material.vVoltageMultiplier)){
-			Logger.WARNING("Extruder Rod Recipe: "+material.getLocalizedName()+" - Success");
-		}
-		else {
-			Logger.WARNING("Extruder Rod Recipe: "+material.getLocalizedName()+" - Failed");
-		}
-
-
-		//Bolt Recipe
-		if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getBolt(1)))
-		if (!material.isRadioactive){
-			if (addExtruderRecipe(
+			if (GT_Values.RA.addExtruderRecipe(
 					itemIngot,
-					shape_Bolt,
-					material.getBolt(8),
+					shape_Rod,
+					material.getRod(2),
 					(int) Math.max(material.getMass() * 2L * 1, 1),
 					material.vVoltageMultiplier)){
-				Logger.WARNING("Extruder Bolt Recipe: "+material.getLocalizedName()+" - Success");
+				Logger.WARNING("Extruder Rod Recipe: "+material.getLocalizedName()+" - Success");
 			}
 			else {
-				Logger.WARNING("Extruder Bolt Recipe: "+material.getLocalizedName()+" - Failed");
+				Logger.WARNING("Extruder Rod Recipe: "+material.getLocalizedName()+" - Failed");
 			}
-		}
 
-	}
+
+		//Bolt Recipe
+		if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getBolt(1)))
+			if (!material.isRadioactive){
+				if (GT_Values.RA.addExtruderRecipe(
+						itemIngot,
+						shape_Bolt,
+						material.getBolt(8),
+						(int) Math.max(material.getMass() * 2L * 1, 1),
+						material.vVoltageMultiplier)){
+					Logger.WARNING("Extruder Bolt Recipe: "+material.getLocalizedName()+" - Success");
+				}
+				else {
+					Logger.WARNING("Extruder Bolt Recipe: "+material.getLocalizedName()+" - Failed");
+				}
+			}
+
+		//Rotor Recipe
+		// Shape_Extruder_Rotor
+		if (mRotorShapeEnabled && ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getRotor(1)))
+			if (GT_Values.RA.addExtruderRecipe(
+					material.getIngot(5),
+					ItemUtils.getValueOfItemList("Shape_Extruder_Rotor", 0, ItemUtils.getErrorStack(1)),
+					material.getRotor(1),
+					200,
+					60)){
+				Logger.WARNING("Extruder Rotor Recipe: "+material.getLocalizedName()+" - Success");
+			}
+			else {
+				Logger.WARNING("Extruder Rotor Recipe: "+material.getLocalizedName()+" - Failed");
+			}
 
 
-	public static boolean addExtruderRecipe(final ItemStack aInput, final ItemStack aShape, final ItemStack aOutput, int aDuration, final int aEUt) {
-		if ((aInput == null) || (aShape == null) || (aOutput == null)) {
-			return false;
-		}
-		if ((aDuration = GregTech_API.sRecipeFile.get("extruder", aOutput, aDuration)) <= 0) {
-			return false;
-		}
-		GT_Recipe.GT_Recipe_Map.sExtruderRecipes.addRecipe(true, new ItemStack[]{aInput, aShape}, new ItemStack[]{aOutput}, null, null, null, aDuration, aEUt, 0);
-		return true;
-	}
 
 
+	}
 
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
index ec71cb6b57..0661ea5ea4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
@@ -5,6 +5,8 @@ import java.util.Set;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
@@ -15,8 +17,10 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 public class RecipeGen_Fluids extends RecipeGen_Base {
 
 	public final static Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>();
+	private static boolean mRotorShapeEnabled = false;
 	static {
 		MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
+		mRotorShapeEnabled = ItemUtils.doesItemListEntryExist("Shape_Extruder_Rotor");
 	}
 
 	public RecipeGen_Fluids(final Material M) {
@@ -136,6 +140,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
 				ItemList mold_Bolt = ItemUtils.getValueOfItemList("Shape_Mold_Bolt", null);
 				ItemList mold_Screw = ItemUtils.getValueOfItemList("Shape_Mold_Screw", null);
 				ItemList mold_Ring = ItemUtils.getValueOfItemList("Shape_Mold_Ring", null);
+				ItemList mold_Rotor = ItemUtils.getValueOfItemList("Shape_Mold_Rotor", null);
 
 				// Rod
 				if (ItemUtils.checkForInvalidItems(material.getRod(1)))
@@ -212,7 +217,23 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
 						Logger.WARNING((144 * 9) + "l fluid molder from 1 ring Recipe: " + material.getLocalizedName()
 								+ " - Failed");
 					}
+				
+				// Rotor
+				if (ItemUtils.checkForInvalidItems(material.getRotor(1)))
+					if (mold_Rotor != null && GT_Values.RA.addFluidSolidifierRecipe(mold_Rotor.get(0), // Item Shape
+							material.getFluidStack(612), // Fluid Input
+							material.getRotor(1), // output
+							100, // Duration
+							material.vVoltageMultiplier // Eu Tick
+					)) {
+						Logger.WARNING((144 * 9) + "l fluid molder from 1 rotor Recipe: " + material.getLocalizedName()
+								+ " - Success");
+					} else {
+						Logger.WARNING((144 * 9) + "l fluid molder from 1 rotor Recipe: " + material.getLocalizedName()
+								+ " - Failed");
+					}				
 
+	            
 			}
 		}
 	}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java
index 830fae78ab..bcf3ef1f9f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java
@@ -1,7 +1,10 @@
 package gtPlusPlus.xmod.gregtech.loaders;
 
 import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
@@ -114,6 +117,32 @@ public class RecipeGen_MetalRecipe extends RecipeGen_Base {
             else {
                 Logger.WARNING("Lathe Screw Recipe: "+material.getLocalizedName()+" - Failed");
             }
+        
+        // Fine Wire
+        if (ItemUtils.checkForInvalidItems(material.getFineWire(1)) && (ItemUtils.checkForInvalidItems(material.getIngot(1)) || ItemUtils.checkForInvalidItems(material.getWire01(1))))        	
+            if (GT_Values.RA.addWiremillRecipe(
+            		ItemUtils.checkForInvalidItems(material.getWire01(1)) ? material.getWire01(1) : material.getIngot(1),
+            		material.getFineWire(ItemUtils.checkForInvalidItems(material.getWire01(1)) ? 4 : 8), 
+            		100, 
+            		4)){
+                Logger.WARNING("Wiremill Fine Wire Recipe: "+material.getLocalizedName()+" - Success");
+            }
+            else {
+                Logger.WARNING("Wiremill Fine Wire Recipe: "+material.getLocalizedName()+" - Failed");
+            }
 
+        // Fine Wire
+        if (ItemUtils.checkForInvalidItems(material.getFineWire(1)) && (ItemUtils.checkForInvalidItems(material.getRod(1))))        	
+            if (GT_Values.RA.addWiremillRecipe(
+            		material.getRod(1),
+            		material.getFineWire(4), 
+            		50, 
+            		4)){
+                Logger.WARNING("Wiremill Fine Wire Recipe: "+material.getLocalizedName()+" - Success");
+            }
+            else {
+                Logger.WARNING("Wiremill Fine Wire Recipe: "+material.getLocalizedName()+" - Failed");
+            }
+        
     }
 }
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java
index 5f53defc2f..7355ac7dc0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java
@@ -8,6 +8,8 @@ import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
+import gtPlusPlus.core.recipe.common.CI;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraft.item.ItemStack;
 
 public class RecipeGen_Plasma extends RecipeGen_Base {
@@ -27,15 +29,18 @@ public class RecipeGen_Plasma extends RecipeGen_Base {
 		generateRecipes(this.toGenerate);
 	}
 
-	private void generateRecipes(final Material material) {		
-		// Cool Plasma
-		ItemStack aPlasmaCell = material.getPlasmaCell(1);
-		ItemStack aCell = material.getCell(1);
-		if (material.getPlasmaCell(1) != null){
-			GT_Values.RA.addFuel(GT_Utility.copyAmount(1L, aPlasmaCell), GT_Utility.getFluidForFilledItem(aPlasmaCell, true) == null ? GT_Utility.getContainerItem(aPlasmaCell, true) : null, (int) Math.max(1024L, 1024L * material.getMass()), 4);
-        }
-		if (material.getCell(1) != null && material.getPlasmaCell(1) != null){
-			 GT_Values.RA.addVacuumFreezerRecipe(aPlasmaCell, aCell, (int) Math.max(material.getMass() * 2L, 1L));
+	private void generateRecipes(final Material material) {	
+		if (material.getPlasma() != null) {
+			// Cool Plasma
+			ItemStack aPlasmaCell = material.getPlasmaCell(1);
+			ItemStack aCell = material.getCell(1);
+			ItemStack aContainerItem = GT_Utility.getFluidForFilledItem(aPlasmaCell, true) == null ? GT_Utility.getContainerItem(aPlasmaCell, true) : CI.emptyCells(1);
+			if (ItemUtils.checkForInvalidItems(new ItemStack[] {aPlasmaCell, aContainerItem})){
+				GT_Values.RA.addFuel(GT_Utility.copyAmount(1L, aPlasmaCell), aContainerItem, (int) Math.max(1024L, 1024L * material.getMass()), 4);
+	        }
+			if (ItemUtils.checkForInvalidItems(new ItemStack[] {aCell, aPlasmaCell})){
+				 GT_Values.RA.addVacuumFreezerRecipe(aPlasmaCell, aCell, (int) Math.max(material.getMass() * 2L, 1L));
+			}
 		}
 	}
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
index ea129a2b0e..7a596c3c42 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
@@ -9,6 +9,7 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
+import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import net.minecraft.item.ItemStack;
@@ -177,6 +178,20 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
 				Logger.WARNING("Bolt Recipe: "+material.getLocalizedName()+" - Failed");
 			}
 		}
+		
+		//Shaped Recipe - Fine Wire
+		if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getFoil(1)) && ItemUtils.checkForInvalidItems(material.getFineWire(1))) {
+			if (RecipeUtils.addShapedRecipe(
+					material.getFoil(1), CI.craftingToolWireCutter, null,
+					null, null, null,
+					null, null, null,
+					material.getFineWire(1))){
+				Logger.WARNING("Fine Wire Recipe: "+material.getLocalizedName()+" - Success");
+			}
+			else {
+				Logger.WARNING("Fine Wire Recipe: "+material.getLocalizedName()+" - Failed");
+			}
+		}
 
 
 		//Shaped Recipe - Ingot to Rod