Merge pull request #156 from draknyte1/Multiblock-Fix

Multiblock fix for #141, other misc. fixes & a few new additions.

3 files changed, 359 insertions, 56 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 427eb19c9a..365218e28e 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1,8 +1,16 @@
 package gtPlusPlus.core.recipe;
 
 import gregtech.api.GregTech_API;
-import gregtech.api.enums.*;
-import gregtech.api.util.*;
+import gregtech.api.enums.ConfigCategories;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+import gregtech.api.util.HotFuel;
+import gregtech.api.util.ThermalFuel;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
@@ -52,8 +60,10 @@ public class RECIPES_GREGTECH {
 		cyclotronRecipes();
 		blastSmelterRecipes();
 		advancedMixerRecipes();
+		sifterRecipes();
+		electroMagneticSeperatorRecipes();
 		addFuels();
-	}	
+	}
 
 	private static void blastSmelterRecipes() {
 
@@ -63,9 +73,9 @@ public class RECIPES_GREGTECH {
 						ItemUtils.getGregtechCircuit(13),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 1),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1),
-						ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3),						
+						ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3),
 				},
-				FluidUtils.getFluidStack("molten.blackbronze", 5*144), 
+				FluidUtils.getFluidStack("molten.blackbronze", 5*144),
 				0,
 				MathUtils.findPercentageOfInt(200*20, 80),
 				120);
@@ -78,9 +88,9 @@ public class RECIPES_GREGTECH {
 						ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 15),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 1),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1),
-						ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3)						
+						ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3)
 				},
-				FluidUtils.getFluidStack("molten.blacksteel", 25*144), 
+				FluidUtils.getFluidStack("molten.blacksteel", 25*144),
 				0,
 				MathUtils.findPercentageOfInt(60*20, 80),
 				120);
@@ -94,9 +104,9 @@ public class RECIPES_GREGTECH {
 						ItemUtils.getItemStackOfAmountFromOreDict("dustZinc", 1),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustBismuth", 1),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 10),
-						ItemUtils.getItemStackOfAmountFromOreDict("dustBlackSteel", 20)						
+						ItemUtils.getItemStackOfAmountFromOreDict("dustBlackSteel", 20)
 				},
-				FluidUtils.getFluidStack("molten.redsteel", 40*144), 
+				FluidUtils.getFluidStack("molten.redsteel", 40*144),
 				0,
 				MathUtils.findPercentageOfInt(65*20, 80),
 				120);
@@ -109,10 +119,10 @@ public class RECIPES_GREGTECH {
 						ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 18),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustZinc", 5),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 30),
-						ItemUtils.getItemStackOfAmountFromOreDict("dustBlackSteel", 60)	
+						ItemUtils.getItemStackOfAmountFromOreDict("dustBlackSteel", 60)
 
 				},
-				FluidUtils.getFluidStack("molten.bluesteel", 125*144), 
+				FluidUtils.getFluidStack("molten.bluesteel", 125*144),
 				0,
 				MathUtils.findPercentageOfInt(70*20, 80),
 				120);
@@ -122,9 +132,9 @@ public class RECIPES_GREGTECH {
 				new ItemStack[]{
 						ItemUtils.getGregtechCircuit(2),
 						ItemUtils.getItemStackOfAmountFromOreDict("ingotTungsten", 1),
-						ItemUtils.getItemStackOfAmountFromOreDict("ingotSteel", 1)						
+						ItemUtils.getItemStackOfAmountFromOreDict("ingotSteel", 1)
 				},
-				FluidUtils.getFluidStack("molten.tungstensteel", 2*144), 
+				FluidUtils.getFluidStack("molten.tungstensteel", 2*144),
 				0,
 				MathUtils.findPercentageOfInt(300*20, 80),
 				120);
@@ -136,9 +146,9 @@ public class RECIPES_GREGTECH {
 						ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 6),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustNickel", 1),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustManganese", 1),
-						ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 1)						
+						ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 1)
 				},
-				FluidUtils.getFluidStack("molten.stainlesssteel", 9*144), 
+				FluidUtils.getFluidStack("molten.stainlesssteel", 9*144),
 				0,
 				MathUtils.findPercentageOfInt(85*20, 80),
 				120);
@@ -153,9 +163,9 @@ public class RECIPES_GREGTECH {
 						ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 1),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 3),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 3),
-						ItemUtils.getItemStackOfAmountFromOreDict("dustSilicon", 12)						
+						ItemUtils.getItemStackOfAmountFromOreDict("dustSilicon", 12)
 				},
-				FluidUtils.getFluidStack("molten.eglinsteel", 48*144), 
+				FluidUtils.getFluidStack("molten.eglinsteel", 48*144),
 				0,
 				MathUtils.findPercentageOfInt(30*20, 80),
 				120);
@@ -167,9 +177,9 @@ public class RECIPES_GREGTECH {
 						ItemUtils.getItemStackOfAmountFromOreDict("dustTungstenSteel", 5),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 1),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustMolybdenum", 2),
-						ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 1)						
+						ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 1)
 				},
-				FluidUtils.getFluidStack("molten.hssg", 9*144), 
+				FluidUtils.getFluidStack("molten.hssg", 9*144),
 				0,
 				MathUtils.findPercentageOfInt(450*20, 80),
 				120);
@@ -182,9 +192,9 @@ public class RECIPES_GREGTECH {
 						ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 5),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 2),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustMolybdenum", 4),
-						ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 2)						
+						ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 2)
 				},
-				FluidUtils.getFluidStack("molten.hssg", 18*144), 
+				FluidUtils.getFluidStack("molten.hssg", 18*144),
 				0,
 				MathUtils.findPercentageOfInt(900*20, 80),
 				120);
@@ -196,9 +206,9 @@ public class RECIPES_GREGTECH {
 						ItemUtils.getItemStackOfAmountFromOreDict("dustHSSG", 6),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustCobalt", 1),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustSilicon", 1),
-						ItemUtils.getItemStackOfAmountFromOreDict("dustManganese", 1)					
+						ItemUtils.getItemStackOfAmountFromOreDict("dustManganese", 1)
 				},
-				FluidUtils.getFluidStack("molten.hsse", 9*144), 
+				FluidUtils.getFluidStack("molten.hsse", 9*144),
 				0,
 				MathUtils.findPercentageOfInt(540*20, 80),
 				120);
@@ -209,20 +219,158 @@ public class RECIPES_GREGTECH {
 						ItemUtils.getGregtechCircuit(3),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustHSSG", 6),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustOsmium", 1),
-						ItemUtils.getItemStackOfAmountFromOreDict("dustIridium", 2)					
+						ItemUtils.getItemStackOfAmountFromOreDict("dustIridium", 2)
 				},
-				FluidUtils.getFluidStack("molten.hsss", 9*144), 
+				FluidUtils.getFluidStack("molten.hsss", 9*144),
 				0,
 				MathUtils.findPercentageOfInt(810*20, 80),
 				120);
 
+		//Osmiridium
+		CORE.RA.addBlastSmelterRecipe(
+				new ItemStack[]{
+						ItemUtils.getGregtechCircuit(2),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustIridium", 3),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustOsmium", 1)
+				},
+				Materials.Helium.getGas(1000),
+				FluidUtils.getFluidStack("molten.osmiridium", 4*144),
+				0,
+				MathUtils.findPercentageOfInt(500*20, 80),
+				1920);
+
+		//Naq Alloy
+		CORE.RA.addBlastSmelterRecipe(
+				new ItemStack[]{
+						ItemUtils.getGregtechCircuit(2),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustNaquadah", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustOsmiridium", 1)
+				},
+				Materials.Argon.getGas(1000),
+				FluidUtils.getFluidStack("molten.naquadahalloy", 2*144),
+				0,
+				MathUtils.findPercentageOfInt(500*20, 80),
+				30720);
+
+		//Nickel-Zinc-Ferrite
+		if (Materials.get("NickelZincFerrite") != null){
+			CORE.RA.addBlastSmelterRecipe(
+					new ItemStack[]{
+							ItemUtils.getGregtechCircuit(2),
+							ItemUtils.getItemStackOfAmountFromOreDict("dustFerriteMixture", 6)
+					},
+					Materials.Oxygen.getGas(2000),
+					FluidUtils.getFluidStack("molten.nickelzincferrite", 2*144),
+					0,
+					MathUtils.findPercentageOfInt(600*20, 80),
+					120);
+		}
+
+		//Gallium-Arsenide
+		if (Materials.get("GalliumArsenide") != null){
+			CORE.RA.addBlastSmelterRecipe(
+					new ItemStack[]{
+							ItemUtils.getGregtechCircuit(2),
+							ItemUtils.getItemStackOfAmountFromOreDict("dustGallium", 1),
+							ItemUtils.getItemStackOfAmountFromOreDict("dustArsenic", 1)
+					},
+					FluidUtils.getFluidStack("molten.galliumarsenide", 2*144),
+					0,
+					MathUtils.findPercentageOfInt(600*20, 80),
+					120);
+		}
+
+		//TungstenCarbide
+		if (Materials.get("TungstenCarbide") != null){
+			CORE.RA.addBlastSmelterRecipe(
+					new ItemStack[]{
+							ItemUtils.getGregtechCircuit(12),
+							ItemUtils.getItemStackOfAmountFromOreDict("dustTungsten", 1),
+							ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1)
+					},
+					FluidUtils.getFluidStack("molten.tungstencarbide", 2*144),
+					0,
+					MathUtils.findPercentageOfInt((int) Math.max(Materials.TungstenCarbide.getMass() / 40L, 1L) * Materials.TungstenCarbide.mBlastFurnaceTemp, 80),
+					480);
+		}
+
+
+		//Vanadium-Gallium
+		if (Materials.get("VanadiumGallium") != null){
+			CORE.RA.addBlastSmelterRecipe(
+					new ItemStack[]{
+							ItemUtils.getGregtechCircuit(12),
+							ItemUtils.getItemStackOfAmountFromOreDict("dustGallium", 1),
+							ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 3)
+					},
+					FluidUtils.getFluidStack("molten.vanadiumgallium", 4*144),
+					0,
+					MathUtils.findPercentageOfInt((int) Math.max(Materials.VanadiumGallium.getMass() / 40L, 1L) * Materials.VanadiumGallium.mBlastFurnaceTemp, 80),
+					480);
+		}
+
+		//EIO
+		//Dark Steel
+		if (ItemUtils.getItemStackOfAmountFromOreDict("dustElectricalSteel", 1) != ItemUtils.getSimpleStack(ModItems.AAA_Broken)){
+			CORE.RA.addBlastSmelterRecipe(
+					new ItemStack[]{
+							ItemUtils.getGregtechCircuit(2),
+							ItemUtils.getItemStackOfAmountFromOreDict("dustElectricalSteel", 1),
+							ItemUtils.getItemStackOfAmountFromOreDict("dustObsidian", 1)
+					},
+					FluidUtils.getFluidStack("molten.darksteel", 2*144),
+					0,
+					MathUtils.findPercentageOfInt(200*20, 80),
+					120);
+		}
+		//Pulsating Iron
+		if (ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1) != ItemUtils.getSimpleStack(ModItems.AAA_Broken)){
+			CORE.RA.addBlastSmelterRecipe(
+					new ItemStack[]{
+							ItemUtils.getGregtechCircuit(2),
+							ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1),
+							ItemUtils.getSimpleStack(Items.ender_pearl)
+					},
+					FluidUtils.getFluidStack("molten.pulsatingiron", 2*144),
+					0,
+					MathUtils.findPercentageOfInt(8*20, 80),
+					120);
+		}
+		//Energetic Alloy
+		if (ItemUtils.getItemStackOfAmountFromOreDict("dustEnergeticAlloy", 1) != ItemUtils.getSimpleStack(ModItems.AAA_Broken)){
+			CORE.RA.addBlastSmelterRecipe(
+					new ItemStack[]{
+							ItemUtils.getGregtechCircuit(12),
+							ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1),
+							ItemUtils.getSimpleStack(Items.glowstone_dust)
+					},
+					FluidUtils.getFluidStack("molten.redstone", 144),
+					FluidUtils.getFluidStack("molten.energeticalloy", 144),
+					0,
+					MathUtils.findPercentageOfInt(9*20, 80),
+					120);
+		}
+		//Vibrant Alloy
+		if (ItemUtils.getItemStackOfAmountFromOreDict("dustVibrantAlloy", 1) != ItemUtils.getSimpleStack(ModItems.AAA_Broken)){
+			CORE.RA.addBlastSmelterRecipe(
+					new ItemStack[]{
+							ItemUtils.getGregtechCircuit(12),
+							ItemUtils.getItemStackOfAmountFromOreDict("dustEnergeticAlloy", 1),
+							ItemUtils.getSimpleStack(Items.ender_pearl)
+					},
+					FluidUtils.getFluidStack("molten.vibrantalloy", 144),
+					0,
+					MathUtils.findPercentageOfInt(16*20, 80),
+					480);
+		}
+
 	}
 
 	private static void fluidcannerRecipes() {
 		//Sulfuric Acid
 		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle), ItemUtils.getSimpleStack(ModItems.itemSulfuricPotion), FluidUtils.getFluidStack("sulfuricacid", 250), null);
-		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemSulfuricPotion), ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("sulfuricacid", 250));		
-		
+		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemSulfuricPotion), ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("sulfuricacid", 250));
+
 		//Hydrofluoric Acid
 		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle), ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion), FluidUtils.getFluidStack("hydrofluoricacid", 250), null);
 		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion), ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("hydrofluoricacid", 250));
@@ -237,7 +385,7 @@ public class RECIPES_GREGTECH {
 				20,
 				GT_ModHandler.getSteam(1000),
 				GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 24L),
-				FluidUtils.getFluidStack("fluid.coalgas", 1440), 
+				FluidUtils.getFluidStack("fluid.coalgas", 1440),
 				60,
 				30);
 
@@ -247,7 +395,7 @@ public class RECIPES_GREGTECH {
 				22,
 				GT_ModHandler.getSteam(1000),
 				ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 10),
-				FluidUtils.getFluidStack("fluid.coalgas", 2880), 
+				FluidUtils.getFluidStack("fluid.coalgas", 2880),
 				30,
 				120);
 
@@ -608,12 +756,12 @@ public class RECIPES_GREGTECH {
 		addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16), ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloyMA956", 4), null, GregtechItemList.Casing_Power_SubStation.get(4), 80, 128);
 	}
 
-	private static boolean addAR(ItemStack inputA, ItemStack inputB, ItemStack outputA, int seconds, int voltage){
+	private static boolean addAR(final ItemStack inputA, final ItemStack inputB, final ItemStack outputA, final int seconds, final int voltage){
 		//return GT_Values.RA.addAssemblerRecipe(inputA, inputB, outputA, seconds*20, voltage);
 		return addAR(inputA, inputB, null, outputA, seconds*20, voltage);
 	}
 
-	private static boolean addAR(ItemStack inputA, ItemStack inputB, FluidStack inputFluidA, ItemStack outputA, int seconds, int voltage){
+	private static boolean addAR(final ItemStack inputA, final ItemStack inputB, final FluidStack inputFluidA, final ItemStack outputA, final int seconds, final int voltage){
 		//return GT_Values.RA.addAssemblerRecipe(inputA, inputB, outputA, seconds*20, voltage);
 		return GT_Values.RA.addAssemblerRecipe(inputA, inputB, inputFluidA, outputA, seconds*20, voltage);
 	}
@@ -702,6 +850,7 @@ public class RECIPES_GREGTECH {
 				new int[]{},
 				0);*/
 
+		ThermalFuel.addSteamTurbineFuel(FluidUtils.getFluidStack("steam", 1024));
 
 		//CORE.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketRocket_fuel", 0, 1), null, 112, 0);
 		GT_Values.RA.addFuel(ItemUtils.getSimpleStack(Items.lava_bucket), null, 32, 2);
@@ -950,12 +1099,55 @@ public class RECIPES_GREGTECH {
 				FluidUtils.getFluidStack("molten.bismuth", 1),
 				new ItemStack[]{GregtechItemList.Pellet_RTG_PO210.get(1)},
 				null,
-				new int[]{100}, 
-				20*300, 
-				2040, 
-				500*20);		
+				new int[]{100},
+				20*300,
+				2040,
+				500*20);
 	}
-	
+
+	private static void sifterRecipes() {
+		//Zirconium
+		GT_Values.RA.addSifterRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedTin", 1),
+				new ItemStack[]{
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyZinc", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1)
+				},
+				new int[]{10000, 5000, 1500, 1000, 500, 500},
+				20*30,
+				60);
+
+		//Zirconium
+		GT_Values.RA.addSifterRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCassiterite", 1),
+				new ItemStack[]{
+						ItemUtils.getItemStackOfAmountFromOreDict("dustCassiterite", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1)
+				},
+				new int[]{10000, 5000, 1500, 1000, 500, 500},
+				20*30,
+				60);
+	}
+
+	private static void electroMagneticSeperatorRecipes(){
+		GT_Values.RA.addElectromagneticSeparatorRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedBauxite", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustBauxite", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallRutile", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("nuggetZirconium", 1),
+				new int[]{10000, 2500, 4000},
+				20*20,
+				24);
+	}
+
 	private static void advancedMixerRecipes(){
 		//HgBa2Ca2Cu3O8
 		CORE.RA.addMixerRecipe(
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 67b9107b28..4304fdaff5 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -1,28 +1,22 @@
 package gtPlusPlus.core.recipe;
 
+import static gtPlusPlus.core.util.item.ItemUtils.getSimpleStack;
+
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.recipe.RecipeUtils;
-import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
-import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
 import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 public class RECIPES_General {
@@ -44,6 +38,7 @@ public class RECIPES_General {
 		if (LoadedMods.Gregtech){
 			RECIPE_BasicCasingIC2 = ItemUtils.getItemStack("IC2:blockMachine", 1);
 			run();
+			addCompressedObsidian();
 		}
 	}
 
@@ -102,18 +97,18 @@ public class RECIPES_General {
 				"stickWood", "treeSapling", "stickWood",
 				"stickWood", "dustBone", "stickWood",
 				ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest))){
-			Utils.LOG_INFO("Added a recipe for Rainforest oak Saplings.");	
+			Utils.LOG_INFO("Added a recipe for Rainforest oak Saplings.");
 		}
 
 		//Iron bars
-		ItemStack ironBars = ItemUtils.getItemStack("minecraft:iron_bars", 1);
+		final ItemStack ironBars = ItemUtils.getItemStack("minecraft:iron_bars", 1);
 		//Fish Trap
 		if (RecipeUtils.recipeBuilder(
 				ironBars, ironBars, ironBars,
 				ironBars, "frameGtWroughtIron", ironBars,
 				ironBars, ironBars, ironBars,
 				ItemUtils.getSimpleStack(ModBlocks.blockFishTrap))){
-			Utils.LOG_INFO("Added a recipe for the Fish Trap.");	
+			Utils.LOG_INFO("Added a recipe for the Fish Trap.");
 		}
 
 		//Alkalus Coin
@@ -122,17 +117,17 @@ public class RECIPES_General {
 				"gemFlawlessRuby", ItemList.Credit_Greg_Naquadah.get(1), "gemFlawlessSapphire",
 				"gemExquisiteEmerald", "gemFlawlessEmerald", "gemExquisiteSapphire",
 				ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk))){
-			Utils.LOG_INFO("Added a recipe for The Alkalus Disk.");	
+			Utils.LOG_INFO("Added a recipe for The Alkalus Disk.");
 		}
 
-		String fancyGems[] = new String[]{"gemExquisiteDiamond", "gemExquisiteEmerald", "gemExquisiteRuby", "gemExquisiteSapphire"};
-		ItemStack gemShards[] = new ItemStack[]{ItemUtils.simpleMetaStack(ModItems.itemGemShards, 0, 1),
+		final String fancyGems[] = new String[]{"gemExquisiteDiamond", "gemExquisiteEmerald", "gemExquisiteRuby", "gemExquisiteSapphire"};
+		final ItemStack gemShards[] = new ItemStack[]{ItemUtils.simpleMetaStack(ModItems.itemGemShards, 0, 1),
 				ItemUtils.simpleMetaStack(ModItems.itemGemShards, 1, 1),
 				ItemUtils.simpleMetaStack(ModItems.itemGemShards, 2, 1),
 				ItemUtils.simpleMetaStack(ModItems.itemGemShards, 3, 1)};
-		
+
 		int l=0;
-		for (String gem : fancyGems){
+		for (final String gem : fancyGems){
 			GameRegistry.addShapelessRecipe(
 					gemShards[l],
 					ItemUtils.getItemStackOfAmountFromOreDict(gem, 1),
@@ -140,7 +135,19 @@ public class RECIPES_General {
 			l++;
 		}
 
-		//Alkalus Coin		
+		RecipeUtils.addShapedGregtechRecipe(
+				"stickBlackSteel", "plateTungstenSteel", "stickBlackSteel",
+				"plateTungstenSteel", getSimpleStack(Items.nether_star), "plateTungstenSteel",
+				"stickBlackSteel", "plateTungstenSteel", "stickBlackSteel",
+				ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard, 32));
+
+		RecipeUtils.addShapedGregtechRecipe(
+				getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), getSimpleStack(Items.experience_bottle),
+				ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1), getSimpleStack(Items.nether_star), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1),
+				getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), getSimpleStack(Items.experience_bottle),
+				ItemUtils.getSimpleStack(ModBlocks.blockXpConverter, 1));
+
+		//Alkalus Coin
 		/*AddGregtechRecipe.addAssemblylineRecipe(
 				ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk),
 				288000,
@@ -154,16 +161,73 @@ public class RECIPES_General {
         		GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 16L),
         		GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 16L),
         		GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 16L),
-        		GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NiobiumTitanium, 2L)}, 
+        		GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NiobiumTitanium, 2L)},
 				new FluidStack[]{
         		Materials.Osmium.getMolten(144*32),
         		Materials.Europium.getFluid(144*8)},
 				ItemUtils.getSimpleStack(Dimension_DarkWorld.portalItem),
 				30*20*60,
 				100000);*/
-		
+
+		RecipeUtils.addShapelessGregtechRecipe(
+				new ItemStack[]{
+						ItemUtils.getItemStackOfAmountFromOreDictNoBroken(CI.craftingToolKnife, 1), ItemUtils.getSimpleStack(Items.reeds)},
+				ItemUtils.getSimpleStack(ModItems.itemFiber, 16)
+				);
+
+		RecipeUtils.addShapelessGregtechRecipe(
+				new ItemStack[]{
+						ItemUtils.getItemStackOfAmountFromOreDictNoBroken(CI.craftingToolKnife, 1), ItemUtils.getSimpleStack(Blocks.sapling)},
+				ItemUtils.getSimpleStack(ModItems.itemFiber, 32)
+				);
+
+		RecipeUtils.recipeBuilder(
+				null, ItemUtils.getSimpleStack(ModItems.itemFiber, 1), null,
+				ItemUtils.getSimpleStack(ModItems.itemFiber, 1), CI.craftingToolKnife, ItemUtils.getSimpleStack(ModItems.itemFiber, 1),
+				null, ItemUtils.getSimpleStack(ModItems.itemFiber, 1), null,
+				ItemUtils.getSimpleStack(ModItems.itemRope, 3));
+
+		RecipeUtils.recipeBuilder(
+				ItemUtils.getSimpleStack(ModItems.itemRope, 1), ItemUtils.getSimpleStack(ModItems.itemRope, 1), ItemUtils.getSimpleStack(ModItems.itemRope, 1),
+				ItemUtils.getSimpleStack(ModItems.itemRope, 1), ItemUtils.getSimpleStack(ModItems.itemRope, 1), ItemUtils.getSimpleStack(ModItems.itemRope, 1),
+				null, null, null,
+				ItemUtils.getSimpleStack(ModBlocks.blockNet, 2));
+
+
+	}
+
+	private static boolean addCompressedObsidian(){
+		//Invert Obsidian
+		RecipeUtils.addShapedGregtechRecipe(
+				getSimpleStack(Items.redstone), getSimpleStack(Items.glowstone_dust), getSimpleStack(Items.redstone),
+				getSimpleStack(Items.glowstone_dust), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 1, 1), getSimpleStack(Items.glowstone_dust),
+				getSimpleStack(Items.redstone), getSimpleStack(Items.glowstone_dust), getSimpleStack(Items.redstone),
+				ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1));
+
+		final ItemStack[] mItems = new ItemStack[6];
+		mItems[0] = ItemUtils.getSimpleStack(Blocks.obsidian);
+		for (int r=0;r<5;r++){
+			mItems[r+1] = ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, r, 1);
 		}
 
+		//Compressed Obsidian 1-5
+		for (int r=0;r<5;r++){
+
+			final ItemStack input = mItems[r];
+			final ItemStack output = mItems[r+1];
+
+			RecipeUtils.addShapedGregtechRecipe(
+					input, input, input,
+					input, input, input,
+					input, input, input,
+					output);
+
+			RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{output}, ItemUtils.getSimpleStack(input, 9));
+
+		}
+		return true;
 	}
 
+}
+
 
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 5423dd24b3..2bc794de16 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -1062,6 +1062,53 @@ public class RECIPES_Machines {
 						"plateStainlessSteel",CI.emitter_ULV,"plateStainlessSteel",
 						ItemUtils.getSimpleStack(ModBlocks.blockProjectTable));
 			}
+			
+			//Wireless Chargers
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_LV, CI.circuitTier1, CI.emitter_LV,
+					CI.component_Plate[3], CI.machineHull_LV, CI.component_Plate[3],
+					CI.sensor_LV, CI.fieldGenerator_LV, CI.sensor_LV, 
+					GregtechItemList.Charger_LV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_MV, CI.circuitTier2, CI.emitter_MV,
+					CI.component_Plate[4], CI.machineHull_MV, CI.component_Plate[4],
+					CI.sensor_MV, CI.fieldGenerator_MV, CI.sensor_MV, 
+					GregtechItemList.Charger_MV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_HV, CI.circuitTier3, CI.emitter_HV,
+					CI.component_Plate[5], CI.machineHull_HV, CI.component_Plate[5],
+					CI.sensor_HV, CI.fieldGenerator_HV, CI.sensor_HV, 
+					GregtechItemList.Charger_HV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_EV, CI.circuitTier4, CI.emitter_EV,
+					CI.component_Plate[6], CI.machineHull_EV, CI.component_Plate[6],
+					CI.sensor_EV, CI.fieldGenerator_EV, CI.sensor_EV, 
+					GregtechItemList.Charger_EV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_IV, CI.circuitTier5, CI.emitter_IV,
+					CI.component_Plate[7], CI.machineHull_IV, CI.component_Plate[7],
+					CI.sensor_IV, CI.fieldGenerator_IV, CI.sensor_IV, 
+					GregtechItemList.Charger_IV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_LuV, CI.circuitTier6, CI.emitter_LuV,
+					CI.component_Plate[8], CI.machineHull_LuV, CI.component_Plate[8],
+					CI.sensor_LuV, CI.fieldGenerator_LuV, CI.sensor_LuV, 
+					GregtechItemList.Charger_LuV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_ZPM, CI.circuitTier7, CI.emitter_ZPM,
+					CI.component_Plate[9], CI.machineHull_ZPM, CI.component_Plate[9],
+					CI.sensor_ZPM, CI.fieldGenerator_ZPM, CI.sensor_ZPM, 
+					GregtechItemList.Charger_ZPM.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_UV, CI.circuitTier8, CI.emitter_UV,
+					CI.component_Plate[10], CI.machineHull_UV, CI.component_Plate[10],
+					CI.sensor_UV, CI.fieldGenerator_UV, CI.sensor_UV, 
+					GregtechItemList.Charger_UV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_MAX, CI.circuitTier9, CI.emitter_MAX,
+					CI.component_Plate[11], CI.machineHull_MAX, CI.component_Plate[11],
+					CI.sensor_MAX, CI.fieldGenerator_MAX, CI.sensor_MAX, 
+					GregtechItemList.Charger_MAX.get(1));
 
 
 		}