+ Added in the Chemical Dehydrator machine.

+ Added in Fluids (Sulfuric Lithium mix, Lithium Hydroxide)
+ Added crafting recipes for Sulfuric Lithium Mix and Lithium Hydroxide.
% Moved a handful of Gregtech related classes into the proper packages under xmod.

20 files changed, 21 insertions, 826 deletions

diff --git a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java
index 162a05b369..188b5ec3aa 100644
--- a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java
@@ -16,23 +16,8 @@ import miscutil.core.common.compat.COMPAT_PneumaticCraft;
 import miscutil.core.common.compat.COMPAT_RFTools;
 import miscutil.core.common.compat.COMPAT_SimplyJetpacks;
 import miscutil.core.common.compat.COMPAT_Thaumcraft;
-import miscutil.core.handler.registration.LateRegistrationHandler;
-import miscutil.core.handler.registration.RegistrationHandler;
-import miscutil.core.handler.registration.gregtech.GregtechEnergyBuffer;
-import miscutil.core.handler.registration.gregtech.GregtechIndustrialCentrifuge;
-import miscutil.core.handler.registration.gregtech.GregtechIndustrialCokeOven;
-import miscutil.core.handler.registration.gregtech.GregtechIndustrialElectrolyzer;
-import miscutil.core.handler.registration.gregtech.GregtechIndustrialMacerator;
-import miscutil.core.handler.registration.gregtech.GregtechIndustrialMassFabricator;
-import miscutil.core.handler.registration.gregtech.GregtechIndustrialPlatePress;
-import miscutil.core.handler.registration.gregtech.GregtechIndustrialWiremill;
-import miscutil.core.handler.registration.gregtech.GregtechIronBlastFurnace;
-import miscutil.core.handler.registration.gregtech.GregtechPowerSubStation;
-import miscutil.core.handler.registration.gregtech.GregtechRocketFuelGenerator;
-import miscutil.core.handler.registration.gregtech.GregtechSafeBlock;
-import miscutil.core.handler.registration.gregtech.GregtechSolarGenerators;
-import miscutil.core.handler.registration.gregtech.GregtechSteamCondenser;
-import miscutil.core.handler.registration.gregtech.GregtechSuperConductionPoint;
+import miscutil.core.handler.Recipes.LateRegistrationHandler;
+import miscutil.core.handler.Recipes.RegistrationHandler;
 import miscutil.core.item.ModItems;
 import miscutil.core.lib.CORE;
 import miscutil.core.lib.LoadedMods;
@@ -42,6 +27,22 @@ import miscutil.core.recipe.ShapedRecipeObject;
 import miscutil.core.util.Utils;
 import miscutil.core.util.item.UtilsItems;
 import miscutil.core.util.recipe.UtilsRecipe;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechDehydrator;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechEnergyBuffer;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialCentrifuge;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialCokeOven;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialElectrolyzer;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialMacerator;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialMassFabricator;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialPlatePress;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialWiremill;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechIronBlastFurnace;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechPowerSubStation;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechRocketFuelGenerator;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechSafeBlock;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechSolarGenerators;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechSteamCondenser;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechSuperConductionPoint;
 import net.minecraft.item.ItemStack;
 
 public class COMPAT_HANDLER {
@@ -94,6 +95,7 @@ public class COMPAT_HANDLER {
 		//GregtechIndustrialSinter.run();
 		GregtechSolarGenerators.run();
 		GregtechPowerSubStation.run();
+		GregtechDehydrator.run();
 		}
 
 	}
diff --git a/src/Java/miscutil/core/handler/registration/LateRegistrationHandler.java b/src/Java/miscutil/core/handler/Recipes/LateRegistrationHandler.java
index 9fc339f512..84af30a748 100644
--- a/src/Java/miscutil/core/handler/registration/LateRegistrationHandler.java
+++ b/src/Java/miscutil/core/handler/Recipes/LateRegistrationHandler.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration;
+package miscutil.core.handler.Recipes;
 
 import miscutil.core.handler.COMPAT_HANDLER;
 import miscutil.core.recipe.ShapedRecipeObject;
diff --git a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java b/src/Java/miscutil/core/handler/Recipes/RegistrationHandler.java
index 5b9058e2de..be48d27752 100644
--- a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java
+++ b/src/Java/miscutil/core/handler/Recipes/RegistrationHandler.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration;
+package miscutil.core.handler.Recipes;
 
 import miscutil.core.handler.COMPAT_HANDLER;
 import miscutil.core.recipe.RECIPES_MachineComponents;
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java
deleted file mode 100644
index f3cc14e889..0000000000
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java
+++ /dev/null
@@ -1,291 +0,0 @@
-package miscutil.core.handler.registration.gregtech;
-
-import static miscutil.core.lib.LoadedMods.Gregtech;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;
-import gregtech.api.util.GT_OreDictUnificator;
-
-import java.util.ArrayList;
-
-import miscutil.core.item.ModItems;
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.recipe.UtilsRecipe;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntityFluid;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_Cable;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_SuperConductor;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-
-public class GregtechConduits {
-	/**
-	 * 
-	 * The Voltage Tiers. Use this Array instead of the old named Voltage Variables
-	 * public static final long[] V = new long[] {0=8, 1=32, 2=128, 3=512, 4=2048, 5=8192, 6=32768, 7=131072, 8=524288, 9=Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE};
-	 * 
-	 */
-	
-	
-	private static int BasePipeID = 30700;
-	
-	
-	public static void run()
-	{
-		if (Gregtech){
-			Utils.LOG_INFO("Gregtech5u Content | Registering Custom Cables/Wires/Pipes.");
-			run1();
-		}
-		
-	}
-	
-	private static void run1(){
-		if (LoadedMods.Big_Reactors){
-			wireFactory("Blutonium", 8196, 30600, 8, 32, 2);
-			wireFactory("Cyanite", 512, 30615, 2, 16, 4);
-			wireFactory("Yellorium", 2048, 30630, 4, 16, 2);
-		}
-		if (LoadedMods.EnderIO){
-			wireFactory("RedstoneAlloy", 32, 30645, 1, 4, 1);
-		}
-		
-		superConductorFactory("Superconductor", 524288, 30660, 0, 0, 8);
-		superConductorFactory("VoidMetal", 512, 30661, 0, 0, 8);
-		
-		generateNonGTFluidPipes(GT_Materials.Staballoy, BasePipeID, 6250, 7500, true);
-		generateNonGTFluidPipes(GT_Materials.Tantalloy60, BasePipeID+5, 5000, 4250, true);
-		generateNonGTFluidPipes(GT_Materials.Tantalloy61, BasePipeID+10, 6000, 5800, true);
-		generateNonGTFluidPipes(GT_Materials.VoidMetal, BasePipeID+15, 250, 25000, true);
-		generateGTFluidPipes(Materials.Europium, BasePipeID+20, 12000, 7500, true);
-		
-		generateNonGTFluidPipes(GT_Materials.Potin, BasePipeID+25, 375, 2000, true);
-		generateNonGTFluidPipes(GT_Materials.MaragingSteel300, BasePipeID+30, 7000, 2500, true);
-		generateNonGTFluidPipes(GT_Materials.MaragingSteel350, BasePipeID+35, 8000, 2500, true);
-		generateNonGTFluidPipes(GT_Materials.Inconel690, BasePipeID+40, 7500, 4800, true);
-		generateNonGTFluidPipes(GT_Materials.Inconel792, BasePipeID+45, 8000, 5500, true);
-		generateNonGTFluidPipes(GT_Materials.HastelloyX, BasePipeID+50, 10000, 4200, true);
-		
-	}	
-	
-	private static void wireFactory(String Material, int Voltage, int ID, long insulatedLoss, long uninsulatedLoss, long Amps){
-		Materials T = Materials.valueOf(Material);
-		int V = 0;
-		if (Voltage == 8){
-			V = 0;
-		}
-		else if (Voltage == 32){
-			V = 1;
-		}
-		else if (Voltage == 128){
-			V = 2;
-		}
-		else if (Voltage == 512){
-			V = 3;
-		}
-		else if (Voltage == 2048){
-			V = 4;
-		}
-		else if (Voltage == 8196){
-			V = 5;
-		}
-		else if (Voltage == 32768){
-			V = 6;
-		}
-		else if (Voltage == 131072){
-			V = 7;
-		}
-		else if (Voltage == 524288){
-			V = 8;
-		}
-		else if (Voltage == Integer.MAX_VALUE){
-			V = 9;
-		}
-		else {
-			Utils.LOG_ERROR("Failed to set voltage on "+Material+". Invalid voltage of "+Voltage+"V set.");
-			Utils.LOG_ERROR(Material+" has defaulted to 8v.");
-			V = 0;
-		}
-		//makeWires(T, ID, 2L, 4L, 2L, GT_Values.V[V], true, false);	 
-		makeWires(T, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false);	 
-		//makeWires(T, ID, bEC ? 2L : 2L, bEC ? 4L : 4L, 2L, gregtech.api.enums.GT_Values.V[V], true, false);	 
-	}	
-
-	private static void makeWires(Materials aMaterial, int aStartID, long aLossInsulated, long aLoss, long aAmperage, long aVoltage, boolean aInsulatable, boolean aAutoInsulated)
-	{
-		Utils.LOG_WARNING("Gregtech5u Content | Registered "+aMaterial.name() +" as a new material for Wire & Cable.");
-		GT_OreDictUnificator.registerOre(OrePrefixes.wireGt01, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 0, "wire." + aMaterial.name().toLowerCase() + ".01", "1x " + aMaterial.mDefaultLocalName + " Wire", 0.125F, aMaterial, aLoss, 1L * aAmperage, aVoltage, false, !aAutoInsulated).getStackForm(1L));
-		GT_OreDictUnificator.registerOre(OrePrefixes.wireGt02, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 1, "wire." + aMaterial.name().toLowerCase() + ".02", "2x " + aMaterial.mDefaultLocalName + " Wire", 0.25F, aMaterial, aLoss, 2L * aAmperage, aVoltage, false, !aAutoInsulated).getStackForm(1L));
-		GT_OreDictUnificator.registerOre(OrePrefixes.wireGt04, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 2, "wire." + aMaterial.name().toLowerCase() + ".04", "4x " + aMaterial.mDefaultLocalName + " Wire", 0.375F, aMaterial, aLoss, 4L * aAmperage, aVoltage, false, !aAutoInsulated).getStackForm(1L));
-		GT_OreDictUnificator.registerOre(OrePrefixes.wireGt08, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 3, "wire." + aMaterial.name().toLowerCase() + ".08", "8x " + aMaterial.mDefaultLocalName + " Wire", 0.5F, aMaterial, aLoss, 8L * aAmperage, aVoltage, false, !aAutoInsulated).getStackForm(1L));
-		GT_OreDictUnificator.registerOre(OrePrefixes.wireGt12, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 4, "wire." + aMaterial.name().toLowerCase() + ".12", "12x " + aMaterial.mDefaultLocalName + " Wire", 0.75F, aMaterial, aLoss, 12L * aAmperage, aVoltage, false, !aAutoInsulated).getStackForm(1L));
-		GT_OreDictUnificator.registerOre(OrePrefixes.wireGt16, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 5, "wire." + aMaterial.name().toLowerCase() + ".16", "16x " + aMaterial.mDefaultLocalName + " Wire", 1.0F, aMaterial, aLoss, 16L * aAmperage, aVoltage, false, !aAutoInsulated).getStackForm(1L));
-		if (aInsulatable)
-		{
-			GT_OreDictUnificator.registerOre(OrePrefixes.cableGt01, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 6, "cable." + aMaterial.name().toLowerCase() + ".01", "1x " + aMaterial.mDefaultLocalName + " Cable", 0.25F, aMaterial, aLossInsulated, 1L * aAmperage, aVoltage, true, false).getStackForm(1L));
-			GT_OreDictUnificator.registerOre(OrePrefixes.cableGt02, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 7, "cable." + aMaterial.name().toLowerCase() + ".02", "2x " + aMaterial.mDefaultLocalName + " Cable", 0.375F, aMaterial, aLossInsulated, 2L * aAmperage, aVoltage, true, false).getStackForm(1L));
-			GT_OreDictUnificator.registerOre(OrePrefixes.cableGt04, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 8, "cable." + aMaterial.name().toLowerCase() + ".04", "4x " + aMaterial.mDefaultLocalName + " Cable", 0.5F, aMaterial, aLossInsulated, 4L * aAmperage, aVoltage, true, false).getStackForm(1L));
-			GT_OreDictUnificator.registerOre(OrePrefixes.cableGt08, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 9, "cable." + aMaterial.name().toLowerCase() + ".08", "8x " + aMaterial.mDefaultLocalName + " Cable", 0.75F, aMaterial, aLossInsulated, 8L * aAmperage, aVoltage, true, false).getStackForm(1L));
-			GT_OreDictUnificator.registerOre(OrePrefixes.cableGt12, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 10, "cable." + aMaterial.name().toLowerCase() + ".12", "12x " + aMaterial.mDefaultLocalName + " Cable", 1.0F, aMaterial, aLossInsulated, 12L * aAmperage, aVoltage, true, false).getStackForm(1L));
-		}
-	}
-	
-	private static void superConductorFactory(String Material, int Voltage, int ID, long insulatedLoss, long uninsulatedLoss, long Amps){
-		GT_Materials T = GT_Materials.valueOf(Material);
-		int V = 0;
-		if (Voltage == 8){
-			V = 0;
-		}
-		else if (Voltage == 32){
-			V = 1;
-		}
-		else if (Voltage == 128){
-			V = 2;
-		}
-		else if (Voltage == 512){
-			V = 3;
-		}
-		else if (Voltage == 2048){
-			V = 4;
-		}
-		else if (Voltage == 8196){
-			V = 5;
-		}
-		else if (Voltage == 32768){
-			V = 6;
-		}
-		else if (Voltage == 131072){
-			V = 7;
-		}
-		else if (Voltage == 524288){
-			V = 8;
-		}
-		else if (Voltage == Integer.MAX_VALUE){
-			V = 9;
-		}
-		else {
-			Utils.LOG_ERROR("Failed to set voltage on "+Material+". Invalid voltage of "+Voltage+"V set.");
-			Utils.LOG_ERROR(Material+" has defaulted to 8v.");
-			V = 0;
-		}
-		//makeWires(T, ID, 2L, 4L, 2L, GT_Values.V[V], true, false);	 
-		makeSuperConductors(T, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false);	 
-		//makeWires(T, ID, bEC ? 2L : 2L, bEC ? 4L : 4L, 2L, gregtech.api.enums.GT_Values.V[V], true, false);	 
-	}	
-	
-	private static void makeSuperConductors(GT_Materials aMaterial, int aStartID, long aLossInsulated, long aLoss, long aAmperage, long aVoltage, boolean aInsulatable, boolean aAutoInsulated)
-	{
-		Utils.LOG_WARNING("Gregtech5u Content | Registered "+aMaterial.name() +" as a new Super Conductor.");
-		registerOre(GregtechOrePrefixes.type2, aMaterial, new GregtechMetaPipeEntity_SuperConductor(aStartID + 5, "wire." + aMaterial.name().toLowerCase() + ".16", "16x " + aMaterial.mDefaultLocalName + " Wire", 1.0F, aMaterial, aLoss, 16L * aAmperage, aVoltage, false, !aAutoInsulated).getStackForm(1L));
-		
-	}
-	
-	private static boolean registerOre(GregtechOrePrefixes aPrefix, Object aMaterial, ItemStack aStack) {
-        return GT_OreDictUnificator.registerOre(aPrefix.get(aMaterial), aStack);
-    }
-	
-	
-	private static void generateGTFluidPipes(Materials material, int startID, int transferRatePerSec, int heatResistance, boolean isGasProof){
-		int transferRatePerTick = transferRatePerSec/20;
-		GT_OreDictUnificator.registerOre(OrePrefixes.pipeTiny.get(material), new GT_MetaPipeEntity_Fluid(startID, "GT_Pipe_"+material.mDefaultLocalName+"_Tiny", "Tiny "+material.mDefaultLocalName+" Fluid Pipe", 0.25F, material, transferRatePerTick*2, heatResistance, isGasProof).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(OrePrefixes.pipeSmall.get(material), new GT_MetaPipeEntity_Fluid(startID+1, "GT_Pipe_"+material.mDefaultLocalName+"_Small", "Small "+material.mDefaultLocalName+" Fluid Pipe", 0.375F, material, transferRatePerTick*4, heatResistance, isGasProof).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(OrePrefixes.pipeMedium.get(material), new GT_MetaPipeEntity_Fluid(startID+2, "GT_Pipe_"+material.mDefaultLocalName+"", ""+material.mDefaultLocalName+" Fluid Pipe", 0.5F, material, transferRatePerTick*6, heatResistance, isGasProof).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(OrePrefixes.pipeLarge.get(material), new GT_MetaPipeEntity_Fluid(startID+3, "GT_Pipe_"+material.mDefaultLocalName+"_Large", "Large "+material.mDefaultLocalName+" Fluid Pipe", 0.75F, material, transferRatePerTick*8, heatResistance, isGasProof).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(OrePrefixes.pipeHuge.get(material), new GT_MetaPipeEntity_Fluid(startID+4, "GT_Pipe_"+material.mDefaultLocalName+"_Huge", "Huge "+material.mDefaultLocalName+" Fluid Pipe", 1.0F, material, transferRatePerTick*10, heatResistance, isGasProof).getStackForm(1L));
-        generatePipeRecipes(material.mDefaultLocalName);
-	}
-	
-	private static void generateNonGTFluidPipes(GT_Materials material, int startID, int transferRatePerSec, int heatResistance, boolean isGasProof){
-		int transferRatePerTick = transferRatePerSec/20;
-    	GT_OreDictUnificator.registerOre(OrePrefixes.pipeTiny.get(material), new GregtechMetaPipeEntityFluid(startID, "GT_Pipe_"+material.mDefaultLocalName+"_Tiny", "Tiny "+material.mDefaultLocalName+" Fluid Pipe", 0.25F, material, transferRatePerTick*2, heatResistance, isGasProof).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(OrePrefixes.pipeSmall.get(material), new GregtechMetaPipeEntityFluid(startID+1, "GT_Pipe_"+material.mDefaultLocalName+"_Small", "Small "+material.mDefaultLocalName+" Fluid Pipe", 0.375F, material, transferRatePerTick*4, heatResistance, isGasProof).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(OrePrefixes.pipeMedium.get(material), new GregtechMetaPipeEntityFluid(startID+2, "GT_Pipe_"+material.mDefaultLocalName+"", ""+material.mDefaultLocalName+" Fluid Pipe", 0.5F, material, transferRatePerTick*6, heatResistance, isGasProof).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(OrePrefixes.pipeLarge.get(material), new GregtechMetaPipeEntityFluid(startID+3, "GT_Pipe_"+material.mDefaultLocalName+"_Large", "Large "+material.mDefaultLocalName+" Fluid Pipe", 0.75F, material, transferRatePerTick*8, heatResistance, isGasProof).getStackForm(1L));
-        GT_OreDictUnificator.registerOre(OrePrefixes.pipeHuge.get(material), new GregtechMetaPipeEntityFluid(startID+4, "GT_Pipe_"+material.mDefaultLocalName+"_Huge", "Huge "+material.mDefaultLocalName+" Fluid Pipe", 1.0F, material, transferRatePerTick*10, heatResistance, isGasProof).getStackForm(1L));
-        generatePipeRecipes(material.mDefaultLocalName);
-	
-	}
-	
-	private static void generatePipeRecipes(String materialName){
-		
-		String output = materialName.substring(0, 1).toUpperCase() + materialName.substring(1);
-		output = output.replace("-", "").replace("_", "").replace(" ", "");
-		
-		Utils.LOG_INFO("Generating "+output+" pipes & respective recipes.");
-		int multi = 5;		
-		
-		ItemStack pipeIngot = UtilsItems.getItemStackOfAmountFromOreDict("ingot"+output, 1).copy();
-		ItemStack pipePlate = UtilsItems.getItemStackOfAmountFromOreDict("plate"+output, 1).copy();
-		
-		//Check all pipes are not null
-		Utils.LOG_WARNING("Generated pipeTiny from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 1) != null) ? true : false));
-		Utils.LOG_WARNING("Generated pipeSmall from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1) != null) ? true : false));
-		Utils.LOG_WARNING("Generated pipeNormal from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1) != null) ? true : false));
-		Utils.LOG_WARNING("Generated pipeLarge from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1) != null) ? true : false));
-		Utils.LOG_WARNING("Generated pipeHuge from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1) != null) ? true : false));
-		
-		//Add the Three Shaped Recipes First		
-		UtilsRecipe.recipeBuilder(
-				pipePlate, "craftingToolWrench", pipePlate,
-				pipePlate, null, pipePlate,
-				pipePlate, "craftingToolHardHammer", pipePlate,
-				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 6));
-		
-		UtilsRecipe.recipeBuilder(
-				pipePlate, pipePlate, pipePlate,
-				"craftingToolWrench", null, "craftingToolHardHammer",
-				pipePlate, pipePlate, pipePlate,
-				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 2));
-		
-		UtilsRecipe.recipeBuilder(
-				pipePlate, "craftingToolHardHammer", pipePlate,
-				pipePlate, null, pipePlate,
-				pipePlate, "craftingToolWrench", pipePlate,
-				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1));
-		
-		GT_Values.RA.addExtruderRecipe(
-				UtilsItems.getSimpleStack(pipeIngot, 1),
-				ItemList.Shape_Extruder_Pipe_Tiny.get(0),
-				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 2),
-				32*multi, 8*multi);
-		
-		GT_Values.RA.addExtruderRecipe(
-				UtilsItems.getSimpleStack(pipeIngot, 1),
-				ItemList.Shape_Extruder_Pipe_Small.get(0),
-				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1),
-				32*multi, 16*multi);
-		
-		GT_Values.RA.addExtruderRecipe(
-				UtilsItems.getSimpleStack(pipeIngot, 3),
-				ItemList.Shape_Extruder_Pipe_Medium.get(0),
-				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1),
-				32*multi, 32*multi);
-		
-		GT_Values.RA.addExtruderRecipe(
-				UtilsItems.getSimpleStack(pipeIngot, 6),
-				ItemList.Shape_Extruder_Pipe_Large.get(0),
-				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1),
-				32*multi, 64*multi);
-		
-		GT_Values.RA.addExtruderRecipe(
-				UtilsItems.getSimpleStack(pipeIngot, 12),
-				ItemList.Shape_Extruder_Pipe_Huge.get(0),
-				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1),
-				32*multi, 128*multi);
-		
-	}
-	
-	private static ItemStack getOredictStack(String oredictName, int amount){
-		ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName);
-		if (!oreDictList.isEmpty()){
-		ItemStack returnValue = oreDictList.get(0).copy();
-		returnValue.stackSize = amount;
-		return returnValue;
-		}
-	 return UtilsItems.getSimpleStack(ModItems.AAA_Broken, amount);
-	}
-}
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechEnergyBuffer.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechEnergyBuffer.java
deleted file mode 100644
index 21e74c1614..0000000000
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechEnergyBuffer.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package miscutil.core.handler.registration.gregtech;
-
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.api.enums.GregtechOreDictNames;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaEnergyBuffer;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.creative.GregtechMetaCreativeEnergyBuffer;
-
-public class GregtechEnergyBuffer
-{
-	
-	//Misc Items
-	//public static Item itemBufferCore;
-	
-	public static void run()
-	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
-			Utils.LOG_INFO("Gregtech5u Content | Registering Energy Buffer Blocks.");
-			run1();
-		}
-		
-	}
-
-	@SuppressWarnings("deprecation")
-	private static void run1()
-	{
-		
-		//itemBufferCore = new Item().setUnlocalizedName("itemBufferCore").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemBufferCore");
-
-		//Registry
-		//GameRegistry.registerItem(itemBufferCore, "itemBufferCore");
-		//LanguageRegistry.addName(itemBufferCore, "Buffer Core");
-		//OreDictionary.registerOre("itemBufferCore", itemBufferCore);
-		
-
-		//Energy Buffers
-		GregtechItemList.Energy_Buffer_1by1_ULV.set(new GregtechMetaEnergyBuffer(770, "energybuffer.01.tier.00", "Ultra Low Voltage Energy Buffer", 0, "", 1).getStackForm(1L));
-		GregtechItemList.Energy_Buffer_1by1_LV.set(new GregtechMetaEnergyBuffer(771, "energybuffer.01.tier.01", "Low Voltage Energy Buffer", 1, "", 1).getStackForm(1L));
-		GregtechItemList.Energy_Buffer_1by1_MV.set(new GregtechMetaEnergyBuffer(772, "energybuffer.01.tier.02", "Medium Voltage Energy Buffer", 2, "", 1).getStackForm(1L));
-		GregtechItemList.Energy_Buffer_1by1_HV.set(new GregtechMetaEnergyBuffer(773, "energybuffer.01.tier.03", "High Voltage Energy Buffer", 3, "", 1).getStackForm(1L));
-		GregtechItemList.Energy_Buffer_1by1_EV.set(new GregtechMetaEnergyBuffer(774, "energybuffer.01.tier.04", "Extreme Voltage Energy Buffer", 4, "", 1).getStackForm(1L));
-		GregtechItemList.Energy_Buffer_1by1_IV.set(new GregtechMetaEnergyBuffer(775, "energybuffer.01.tier.05", "Insane Voltage Energy Buffer", 5, "", 1).getStackForm(1L));
-		GregtechItemList.Energy_Buffer_1by1_LuV.set(new GregtechMetaEnergyBuffer(776, "energybuffer.01.tier.06", "Ludicrous Voltage Energy Buffer", 6, "", 1).getStackForm(1L));
-		GregtechItemList.Energy_Buffer_1by1_ZPM.set(new GregtechMetaEnergyBuffer(777, "energybuffer.01.tier.07", "ZPM Voltage Energy Buffer", 7, "", 1).getStackForm(1L));
-		GregtechItemList.Energy_Buffer_1by1_UV.set(new GregtechMetaEnergyBuffer(778, "energybuffer.01.tier.08", "Ultimate Voltage Energy Buffer", 8, "", 1).getStackForm(1L));
-		GregtechItemList.Energy_Buffer_1by1_MAX.set(new GregtechMetaEnergyBuffer(779, "energybuffer.01.tier.09", "MAX Voltage Energy Buffer", 9, "", 1).getStackForm(1L));
-		// Creative Buffer Has Special ID
-		GregtechItemList.Energy_Buffer_CREATIVE
-				.set(new GregtechMetaCreativeEnergyBuffer(750,
-						"energybuffer.01.tier.xx",
-						"512V Creative Energy Buffer", 3, "", 0)
-						.getStackForm(1L));
-
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_ULV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Lead), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_LV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Tin), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_MV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.AnyCopper), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_HV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Gold), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_EV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Aluminium), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_IV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Tungsten), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_LuV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_ZPM.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_UV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_UV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Superconductor), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
-		/*GT_ModHandler.addCraftingRecipe(
-				GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]),
-				GT_ModHandler.RecipeBits.DISMANTLEABLE
-						| GT_ModHandler.RecipeBits.NOT_REMOVABLE
-						| GT_ModHandler.RecipeBits.REVERSIBLE
-						| GT_ModHandler.RecipeBits.BUFFERED, new Object[] {
-						"WTW", "WMW", Character.valueOf('M'),
-						ItemList.Hull_MAX, Character.valueOf('W'),
-						OrePrefixes.wireGt08.get(Materials.Superconductor),
-						Character.valueOf('T'), GregtechOreDictNames.buffer_core });*/
-		
-		
-		
-
-	}
-}
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java
deleted file mode 100644
index 6e0324966f..0000000000
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package miscutil.core.handler.registration.gregtech;
-
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge;
-
-public class GregtechIndustrialCentrifuge
-{
-
-
-
-	public static void run()
-	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
-			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Centrifuge Multiblock.");
-			run1();
-		}
-
-	}
-
-	private static void run1()
-	{
-		//Industrial Centrifuge Multiblock
-		GregtechItemList.Industrial_Centrifuge.set(new GregtechMetaTileEntityIndustrialCentrifuge(790, "industrialcentrifuge.controller.tier.single", "Industrial Centrifuge").getStackForm(1L));
-		
-	}
-}
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java
deleted file mode 100644
index bd3d9f4d89..0000000000
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package miscutil.core.handler.registration.gregtech;
-
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCokeOven;
-
-public class GregtechIndustrialCokeOven
-{
-
-
-
-	public static void run()
-	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
-			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Coke Oven Multiblock.");
-			run1();
-		}
-
-	}
-
-	private static void run1()
-	{
-		//Industrial Centrifuge Multiblock
-		GregtechItemList.Industrial_CokeOven.set(new GregtechMetaTileEntityIndustrialCokeOven(791, "industrialcokeoven.controller.tier.single", "Industrial Coke Oven").getStackForm(1L));
-		
-	}
-}
\ No newline at end of file
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java
deleted file mode 100644
index c4ad9c122b..0000000000
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package miscutil.core.handler.registration.gregtech;
-
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialElectrolyzer;
-
-public class GregtechIndustrialElectrolyzer
-{
-
-
-
-	public static void run()
-	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
-			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Electrolyzer Multiblock.");
-			run1();
-		}
-
-	}
-
-	private static void run1()
-	{
-		//Industrial Electrolyzer Multiblock
-		GregtechItemList.Industrial_Electrolyzer.set(new GregtechMetaTileEntityIndustrialElectrolyzer(796, "industrialelectrolyzer.controller.tier.single", "Industrial Electrolyzer").getStackForm(1L));
-		
-	}
-}
\ No newline at end of file
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java
deleted file mode 100644
index fa3663fb81..0000000000
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package miscutil.core.handler.registration.gregtech;
-
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialMacerator;
-
-public class GregtechIndustrialMacerator
-{
-
-
-
-	public static void run()
-	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
-			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Maceration Stack Multiblock.");
-			run1();
-		}
-
-	}
-
-	private static void run1()
-	{
-		//Industrial Electrolyzer Multiblock
-		GregtechItemList.Industrial_MacerationStack.set(new GregtechMetaTileEntityIndustrialMacerator(797, "industrialmacerator.controller.tier.single", "Maceration Stack Controller").getStackForm(1L));
-		
-	}
-}
\ No newline at end of file
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java
deleted file mode 100644
index cbb4be3115..0000000000
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package miscutil.core.handler.registration.gregtech;
-
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityMassFabricator;
-
-public class GregtechIndustrialMassFabricator
-{
-
-
-
-	public static void run()
-	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
-			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Mass Fabricator Multiblock.");
-			run1();
-		}
-
-	}
-
-	private static void run1()
-	{
-		//Industrial Electrolyzer Multiblock
-		GregtechItemList.Industrial_MassFab.set(new GregtechMetaTileEntityMassFabricator(799, "industrialmassfab.controller.tier.single", "Matter Fabrication CPU").getStackForm(1L));
-		
-	}
-}
\ No newline at end of file
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java
deleted file mode 100644
index 4e25ff3475..0000000000
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package miscutil.core.handler.registration.gregtech;
-
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialPlatePress;
-
-public class GregtechIndustrialPlatePress
-{
-
-
-
-	public static void run()
-	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
-			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Press Multiblock.");
-			run1();
-		}
-
-	}
-
-	private static void run1()
-	{
-		//Industrial Centrifuge Multiblock
-		GregtechItemList.Industrial_PlatePress.set(new GregtechMetaTileEntityIndustrialPlatePress(792, "industrialbender.controller.tier.single", "Industrial Material Press").getStackForm(1L));
-		
-	}
-}
\ No newline at end of file
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialSinter.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialSinter.java
deleted file mode 100644
index 03ad7cce7f..0000000000
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialSinter.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package miscutil.core.handler.registration.gregtech;
-
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialSinter;
-
-public class GregtechIndustrialSinter{
-
-	public static void run()
-	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
-			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Sinter Furnace Multiblock.");
-			run1();
-		}
-
-	}
-
-	private static void run1()
-	{
-		//Industrial Electrolyzer Multiblock
-		GregtechItemList.Industrial_SinterFurnace.set(new GregtechMetaTileEntityIndustrialSinter(800, "industrialsinterfurnace.controller.tier.single", "Sinter Furnace").getStackForm(1L));
-		
-	}
-}
\ No newline at end of file
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialWiremill.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialWiremill.java
deleted file mode 100644
index 5672775a56..0000000000
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialWiremill.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package miscutil.core.handler.registration.gregtech;
-
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialWireMill;
-
-public class GregtechIndustrialWiremill
-{
-
-
-
-	public static void run()
-	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
-			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Wire Factory Multiblock.");
-			run1();
-		}
-
-	}
-
-	private static void run1()
-	{
-		//Industrial Electrolyzer Multiblock
-		GregtechItemList.Industrial_WireFactory.set(new GregtechMetaTileEntityIndustrialWireMill(798, "industrialwiremill.controller.tier.single", "Wire Factory Controller").getStackForm(1L));
-		
-	}
-}
\ No newline at end of file
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIronBlastFurnace.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIronBlastFurnace.java
deleted file mode 100644
index d5271181f9..0000000000
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIronBlastFurnace.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package miscutil.core.handler.registration.gregtech;
-
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIronBlastFurnace;
-
-public class GregtechIronBlastFurnace
-{
-
-
-
-	public static void run()
-	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
-			Utils.LOG_INFO("Gregtech5u Content | Registering Iron Blast Furnace.");
-			run1();
-		}
-
-	}
-
-	private static void run1()
-	{
-		GregtechItemList.Machine_Iron_BlastFurnace.set(new GregtechMetaTileEntityIronBlastFurnace(768, "ironmachine.blastfurnace", "Iron Plated Blast Furnace").getStackForm(1L));
-	}
-}
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechPowerSubStation.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechPowerSubStation.java
deleted file mode 100644
index 58319ab4b4..0000000000
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechPowerSubStation.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package miscutil.core.handler.registration.gregtech;
-
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityPowerSubStationController;
-
-public class GregtechPowerSubStation
-{
-
-
-
-	public static void run()
-	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
-			Utils.LOG_INFO("Gregtech5u Content | Registering Power Substation Node.");
-			run1();
-		}
-
-	}
-
-	private static void run1()
-	{
-		//Steam Condensors
-		GregtechItemList.PowerSubStation.set(new GregtechMetaTileEntityPowerSubStationController(802, "substation.01.input.single", "Power Substation Node").getStackForm(1L));
-		
-	}
-}
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java
deleted file mode 100644
index 3a61884782..0000000000
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package miscutil.core.handler.registration.gregtech;
-
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator;
-
-public class GregtechRocketFuelGenerator {
-	
-	public static void run()
-	{
-		if (LoadedMods.Gregtech){
-			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Rocket Engines.");
-			run1();
-		}
-
-	}
-
-	private static void run1(){
-		GregtechItemList.Rocket_Engine_EV.set(new GregtechMetaTileEntityRocketFuelGenerator(793, "advancedgenerator.rocketFuel.tier.01", "Basic Rocket Engine", 4).getStackForm(1L));
-		GregtechItemList.Rocket_Engine_IV.set(new GregtechMetaTileEntityRocketFuelGenerator(794, "advancedgenerator.rocketFuel.tier.02", "Advanced Rocket Engine", 5).getStackForm(1L));
-		GregtechItemList.Rocket_Engine_LuV.set(new GregtechMetaTileEntityRocketFuelGenerator(795, "advancedgenerator.rocketFuel.tier.03", "Turbo Rocket Engine", 6).getStackForm(1L));
-	}
-	
-}
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSafeBlock.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSafeBlock.java
deleted file mode 100644
index 5def5e1a92..0000000000
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSafeBlock.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package miscutil.core.handler.registration.gregtech;
-
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OreDictNames;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock;
-
-public class GregtechSafeBlock
-{
-	public static void run()
-	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
-			Utils.LOG_INFO("Gregtech5u Content | Registering Lockable Safe Blocks.");
-			run1();
-		}
-		
-	}
-
-	private static void run1()
-	{
-		
-		GregtechItemList.GT_Safe_ULV.set(new GregtechMetaSafeBlock(780, "protection.playersafe.tier.00", "Ultra Low Voltage Player Safe", 0).getStackForm(1L));
-		GregtechItemList.GT_Safe_LV.set(new GregtechMetaSafeBlock(781, "protection.playersafe.tier.01", "Low Voltage Player Safe", 1).getStackForm(1L));
-        GregtechItemList.GT_Safe_MV.set(new GregtechMetaSafeBlock(782, "protection.playersafe.tier.02", "Medium Voltage Player Safe", 2).getStackForm(1L));
-        GregtechItemList.GT_Safe_HV.set(new GregtechMetaSafeBlock(783, "protection.playersafe.tier.03", "High Voltage Player Safe", 3).getStackForm(1L));
-        GregtechItemList.GT_Safe_EV.set(new GregtechMetaSafeBlock(784, "protection.playersafe.tier.04", "Extreme Voltage Player Safe", 4).getStackForm(1L));
-        GregtechItemList.GT_Safe_IV.set(new GregtechMetaSafeBlock(785, "protection.playersafe.tier.05", "Insane Voltage Player Safe", 5).getStackForm(1L));
-        GregtechItemList.GT_Safe_LuV.set(new GregtechMetaSafeBlock(786, "protection.playersafe.tier.06", "Ludicrous Voltage Player Safe", 6).getStackForm(1L));
-        GregtechItemList.GT_Safe_ZPM.set(new GregtechMetaSafeBlock(787, "protection.playersafe.tier.07", "ZPM Voltage Player Safe", 7).getStackForm(1L));
-        GregtechItemList.GT_Safe_UV.set(new GregtechMetaSafeBlock(788, "protection.playersafe.tier.08", "Ultimate Voltage Player Safe", 8).getStackForm(1L));
-        GregtechItemList.GT_Safe_MAX.set(new GregtechMetaSafeBlock(789, "protection.playersafe.tier.09", "MAX Voltage Player Safe", 9).getStackForm(1L));
-
-        GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_ULV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('V'), ItemList.Circuit_Basic, Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Basic)});
-        GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_LV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('V'), ItemList.Circuit_Basic, Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Basic)});
-        GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_MV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('V'), ItemList.Circuit_Good, Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Basic)});
-        GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_HV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('V'), ItemList.Circuit_Good, Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Basic)});
-        GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_EV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('V'), ItemList.Circuit_Advanced, Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Basic)});
-        GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_IV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('V'), ItemList.Circuit_Advanced, Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Advanced)});
-        GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_LuV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('V'), ItemList.Circuit_Elite, Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Advanced)});
-        GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_ZPM.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('V'), ItemList.Circuit_Elite, Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Advanced)});
-        GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_UV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_UV, Character.valueOf('V'), ItemList.Circuit_Master, Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Advanced)});
-        GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('V'), ItemList.Circuit_Master, Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Advanced)});
-
-		
-		
-		
-
-	}
-}
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java
deleted file mode 100644
index 3c58d69209..0000000000
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package miscutil.core.handler.registration.gregtech;
-
-import miscutil.core.lib.CORE.configSwitches;
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator;
-
-public class GregtechSolarGenerators
-{
-	public static void run()
-	{
-		if (LoadedMods.Gregtech && configSwitches.enableSolarGenerators){
-			Utils.LOG_INFO("Gregtech5u Content | Registering Solar Generator Blocks.");
-			run1();
-		}
-		
-	}
-
-	private static void run1()
-	{
-		
-		GregtechItemList.GT_Solar_ULV.set(new GregtechMetaTileEntitySolarGenerator(800, "sunabsorber.tier.00", "Ultra Low Voltage Solar Generator", 0).getStackForm(1L));
-		GregtechItemList.GT_Solar_LV.set(new GregtechMetaTileEntitySolarGenerator(801, "sunabsorber.tier.01", "Low Voltage Solar Generator", 1).getStackForm(1L));
-        GregtechItemList.GT_Solar_MV.set(new GregtechMetaTileEntitySolarGenerator(802, "sunabsorber.tier.02", "Medium Voltage Solar Generator", 2).getStackForm(1L));
-        GregtechItemList.GT_Solar_HV.set(new GregtechMetaTileEntitySolarGenerator(803, "sunabsorber.tier.03", "High Voltage Solar Generator", 3).getStackForm(1L));
-        GregtechItemList.GT_Solar_EV.set(new GregtechMetaTileEntitySolarGenerator(804, "sunabsorber.tier.04", "Extreme Voltage Solar Generator", 4).getStackForm(1L));
-        GregtechItemList.GT_Solar_IV.set(new GregtechMetaTileEntitySolarGenerator(805, "sunabsorber.tier.05", "Insane Voltage Solar Generator", 5).getStackForm(1L));
-        GregtechItemList.GT_Solar_LuV.set(new GregtechMetaTileEntitySolarGenerator(806, "sunabsorber.tier.06", "Ludicrous Voltage Solar Generator", 6).getStackForm(1L));
-        GregtechItemList.GT_Solar_ZPM.set(new GregtechMetaTileEntitySolarGenerator(807, "sunabsorber.tier.07", "ZPM Voltage Solar Generator", 7).getStackForm(1L));
-        GregtechItemList.GT_Solar_UV.set(new GregtechMetaTileEntitySolarGenerator(808, "sunabsorber.tier.08", "Ultimate Voltage Solar Generator", 8).getStackForm(1L));
-        GregtechItemList.GT_Solar_MAX.set(new GregtechMetaTileEntitySolarGenerator(809, "sunabsorber.tier.09", "MAX Voltage Solar Generator", 9).getStackForm(1L));
-		
-
-	}
-}
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java
deleted file mode 100644
index 7cd222205d..0000000000
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package miscutil.core.handler.registration.gregtech;
-
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaCondensor;
-
-public class GregtechSteamCondenser
-{
-
-
-
-	public static void run()
-	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
-			Utils.LOG_INFO("Gregtech5u Content | Registering Steam Condensor.");
-			run1();
-		}
-
-	}
-
-	private static void run1()
-	{
-		//Steam Condensors
-		GregtechItemList.Condensor_MAX.set(new GregtechMetaCondensor(769, "steamcondensor.01.tier.single", "Steam Condensor").getStackForm(1L));
-		
-	}
-}
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSuperConductionPoint.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSuperConductionPoint.java
deleted file mode 100644
index d18a9ed3c3..0000000000
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSuperConductionPoint.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package miscutil.core.handler.registration.gregtech;
-
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySuperCondensor;
-
-public class GregtechSuperConductionPoint
-{
-
-
-
-	public static void run()
-	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
-			Utils.LOG_INFO("Gregtech5u Content | Registering Super Conductor Input Node.");
-			run1();
-		}
-
-	}
-
-	private static void run1()
-	{
-		//Steam Condensors
-		GregtechItemList.SuperConductorInputNode.set(new GregtechMetaTileEntitySuperCondensor(801, "superconductor.01.input.single", "Power Phase Shifting Station", 8).getStackForm(1L));
-		
-	}
-}