Merge branch 'master' of https://github.com/GTNewHorizons/GTplusplus into St00f

# Conflicts:
#	.gitignore
#	dependencies.gradle
#	src/main/java/gtPlusPlus/core/config/ConfigHandler.java
#	src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
#	src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
#	src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java
#	src/main/resources/assets/miscutils/lang/en_US.lang

1 files changed, 78 insertions, 75 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;
-	}
 
 
+	}
 
 }