+ Added Xp conversion brewing recipes.

- Made Xp Convertor redundant.
$ Hopefully fixed ExtraUtils complaining about rendering.
$ Additional 5.08 support.
$ Possibly fixed recipes for some items which don't display in NEI correctly.

3 files changed, 95 insertions, 18 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 97cef1ce0b..13c80297e4 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -4,11 +4,14 @@ import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
+import static gtPlusPlus.core.util.minecraft.ItemUtils.getSimpleStack;
+
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.*;
 import gregtech.api.util.*;
 
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
@@ -18,10 +21,13 @@ import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.material.nuclear.NUCLIDE;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.EnchantingUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
+import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
+import gtPlusPlus.everglades.dimension.Dimension_Everglades;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -63,9 +69,15 @@ public class RECIPES_GREGTECH {
 		electroMagneticSeperatorRecipes();
 		extruderRecipes();
 		cuttingSawRecipes();
+		breweryRecipes();
 		addFuels();
 	}
 
+	private static void breweryRecipes() {
+		CORE.RA.addBrewingRecipe(14, EnchantingUtils.getMobEssence(100), EnchantingUtils.getLiquidXP(1332), 100, 120, false);
+		CORE.RA.addBrewingRecipe(14, EnchantingUtils.getLiquidXP(1332), EnchantingUtils.getMobEssence(100), 100, 120, false);		
+	}
+
 	private static void cuttingSawRecipes() {
 		GT_Values.RA.addCutterRecipe(
 				ItemUtils.getItemStackOfAmountFromOreDict("blockMeatRaw", 1), //Input
@@ -829,6 +841,71 @@ public class RECIPES_GREGTECH {
 		/*addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16),
 				ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloyMA956", 4), null,
 				GregtechItemList.Casing_Power_SubStation.get(4), 80, 120);*/
+		
+
+		
+		
+		
+		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+				 GregtechItemList.Casing_Multi_Use.get(1),
+					ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 1),
+					ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(4), 8),
+					CI.sensor_HV,
+					CI.emitter_HV,
+					CI.fieldGenerator_HV,				
+				},
+				null,
+				ItemUtils.getSimpleStack(Dimension_Everglades.blockPortalFrame),
+				20*20,
+				2048);
+		
+		
+		
+
+
+		
+		
+		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {ItemUtils.getSimpleStack(ModItems.itemRope, 6)}, null, ItemUtils.getSimpleStack(ModBlocks.blockNet, 2), 1*20, 8);
+		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {ItemUtils.getSimpleStack(CI.explosiveITNT, 2), ItemUtils.getSimpleStack(CI.explosiveTNT, 4), ELEMENT.getInstance().SULFUR.getDust(2), ELEMENT.getInstance().IRON.getFrameBox(1)}, null, ItemUtils.getSimpleStack(ModBlocks.blockMiningExplosive, 3), 5*20, 60);		
+		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {ItemUtils.getSimpleStack(Items.nether_star), ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 8), ItemUtils.getItemStackOfAmountFromOreDict("stickBlackSteel", 8)}, null, ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard, 32), 30*20, 500);
+			
+		
+
+		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+				CI.electricPump_LV,
+				CI.electricMotor_LV,
+				ItemUtils.getItemStackOfAmountFromOreDict("circuitBasic", 2),
+				ItemUtils.getItemStackOfAmountFromOreDict("ringBrass", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("rodBrass", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("plateSteel", 2)				
+		}, null, ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1), 10*20, 30);		
+		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+				CI.electricPump_MV,
+				CI.electricMotor_MV,
+				ItemUtils.getItemStackOfAmountFromOreDict("circuitAdvanced", 2),
+				ItemUtils.getItemStackOfAmountFromOreDict("ringMagnalium", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("rodMagnalium", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("plateAluminium", 2)				
+		}, null, ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1), 10*20*2, 120);		
+		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+				CI.electricPump_HV,
+				CI.electricMotor_HV,
+				ItemUtils.getItemStackOfAmountFromOreDict("circuitData", 2),
+				ItemUtils.getItemStackOfAmountFromOreDict("ringChrome", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("rodChrome", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("plateStainlessSteel", 2)				
+		}, null, ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1), 10*20*3, 480);
+		
+		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+				CI.electricPump_EV,
+				CI.electricMotor_EV,
+				ItemUtils.getItemStackOfAmountFromOreDict("circuitElite", 2),
+				ItemUtils.getItemStackOfAmountFromOreDict("ringTitanium", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("rodTitanium", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 2)				
+		}, null, ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1), 10*20*4, 1960);
+
+
 	}
 
 	private static boolean addAR(final ItemStack inputA, final ItemStack inputB, final ItemStack outputA,
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 1a1dfe64d9..58f9d64066 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -41,20 +41,17 @@ public class RECIPES_General {
 	static ItemStack OUTPUT_Workbench_Bronze;
 	static ItemStack RECIPE_HydrogenDust;
 
-	public static void loadRecipes(){
-		
-		RECIPE_Paper = ItemUtils.getSimpleStack(Items.paper);
-		RECIPE_Dirt = ItemUtils.getSimpleStack(Blocks.dirt);
-		RECIPE_Snow = ItemUtils.getSimpleStack(Blocks.snow);
-		RECIPE_Obsidian = ItemUtils.getSimpleStack(Blocks.obsidian);
-		RECIPE_CraftingTable = ItemUtils.getSimpleStack(Blocks.crafting_table);
-		RECIPE_HydrogenDust = ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob);	
-		
-		OUTPUT_Workbench_Bronze = ItemUtils.getSimpleStack(ModBlocks.blockWorkbench);
-		OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase);	
-		
-		if (LoadedMods.Gregtech){
-			RECIPE_BasicCasingIC2 = ItemUtils.getItemStack("IC2:blockMachine", 1);
+	public static void loadRecipes(){		
+		if (LoadedMods.Gregtech){			
+			RECIPE_Paper = ItemUtils.getSimpleStack(Items.paper);
+			RECIPE_Dirt = ItemUtils.getSimpleStack(Blocks.dirt);
+			RECIPE_Snow = ItemUtils.getSimpleStack(Blocks.snow);
+			RECIPE_Obsidian = ItemUtils.getSimpleStack(Blocks.obsidian);
+			RECIPE_CraftingTable = ItemUtils.getSimpleStack(Blocks.crafting_table);
+			RECIPE_HydrogenDust = ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob);	
+			RECIPE_BasicCasingIC2 = ItemUtils.getItemStack("IC2:blockMachine", 1);			
+			OUTPUT_Workbench_Bronze = ItemUtils.getSimpleStack(ModBlocks.blockWorkbench);
+			OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase);	
 			run();
 			addCompressedObsidian();
 			addHandPumpRecipes();
@@ -64,11 +61,11 @@ public class RECIPES_General {
 
 	private static void run() {
 		//Workbench Blueprint
-		RecipeUtils.recipeBuilder(
+		/*RecipeUtils.recipeBuilder(
 				RECIPE_Paper, RECIPE_LapisDust, NULL,
 				RECIPE_Paper, RECIPE_LapisDust, NULL,
 				RECIPE_LapisDust, RECIPE_LapisDust, NULL,
-				OUTPUT_Blueprint);
+				OUTPUT_Blueprint);*/
 
 		//Bronze Workbench
 		/*RecipeUtils.recipeBuilder(
@@ -381,7 +378,7 @@ public class RECIPES_General {
 			generatePipeRecipes(e.mDefaultLocalName, e.getMass(), tVoltageMultiplier);
 		}
 		
-		
+		if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK)
 		RecipeUtils.addShapedGregtechRecipe(
 				CI.component_Plate[4], "rotorGtStainlessSteel", CI.component_Plate[4],
 				CI.getTieredCircuitOreDictName(3), CI.machineHull_HV, CI.getTieredCircuitOreDictName(3),
@@ -403,6 +400,8 @@ public class RECIPES_General {
 				CI.getTieredCircuitOreDictName(7), CI.component_Plate[9], ItemList.Hatch_Input_ZPM.get(1),
 				CI.component_Plate[8], GregtechItemList.Hatch_Input_Naquadah.get(1L, new Object[0]));
 		
+
+		if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_LV.get(1L, new Object[0]), bitsd,
 				new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LV.get(1), Character.valueOf('P'),
 						GregtechItemList.Pollution_Cleaner_LV.get(1) });
@@ -430,7 +429,7 @@ public class RECIPES_General {
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_MAX.get(1L, new Object[0]), bitsd,
 				new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MAX.get(1), Character.valueOf('P'),
 						GregtechItemList.Pollution_Cleaner_MAX.get(1) });
-		
+		}
 		
 		
 		
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 5cca67402b..10c5c09f8c 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -1329,6 +1329,7 @@ public class RECIPES_Machines {
 						o_Fermenter, o_Distillery, o_Extractor,
 						GregtechItemList.Industrial_MultiMachine.get(1));
 			}
+			
 			//Wireless Chargers
 			RecipeUtils.addShapedGregtechRecipe(
 					CI.emitter_LV, CI.circuitTier1, CI.emitter_LV,