Merge branch 'master' of https://github.com/draknyte1/GTplusplus

19 files changed, 279 insertions, 161 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
new file mode 100644
index 0000000000..0b71b612f4
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
@@ -0,0 +1,35 @@
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
+
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator;
+import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal;
+
+public class Gregtech4Content
+{
+
+	//ID Range 828, 829, 833 - 850
+	
+	public static void run()
+	{
+		if (LoadedMods.Gregtech){
+			workbenches();
+			tesseracts();
+		}
+	}
+
+	private static void workbenches(){
+        //Gregtech 4 Workbenches
+		Utils.LOG_INFO("Gregtech 4 Content | Registering Workbenches.");
+		//Free	//GregtechItemList.GT4_Workbench_Bronze.set(new GT_MetaTileEntity_BronzeCraftingTable(828, "workbench.bronze", "Bronze Workbench", 0).getStackForm(1L));
+		//Free	//GregtechItemList.GT4_Workbench_Advanced.set(new GT_MetaTileEntity_AdvancedCraftingTable(829, "workbench.advanced", "Advanced Workbench", 1).getStackForm(1L));
+	}
+	
+	private static void tesseracts(){
+        //Gregtech 4 Workbenches
+		Utils.LOG_INFO("Gregtech 4 Content | Registering Tesseracts.");
+		GregtechItemList.GT4_Tesseract_Generator.set(new GT_MetaTileEntity_TesseractGenerator(833, "tesseract.generator", "Tesseract Generator", 4).getStackForm(1L));
+		GregtechItemList.GT4_Tesseract_Terminal.set(new GT_MetaTileEntity_TesseractTerminal(834, "tesseract.terminal", "Tesseract Terminal", 4).getStackForm(1L));
+	}
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
index 28b86a8b10..ad0db9f927 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -9,9 +9,12 @@ import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.material.ALLOY;
+import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.recipe.RecipeUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntityFluid;
@@ -30,20 +33,20 @@ public class GregtechConduits {
 	 * 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);
@@ -53,25 +56,26 @@ public class GregtechConduits {
 		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);
+
+		superConductorFactory(GT_Materials.Superconductor, 524288, 30660, 0, 0, 8);
 		if (LoadedMods.Thaumcraft){
-		generateNonGTFluidPipes(GT_Materials.VoidMetal, BasePipeID+15, 250, 25000, true);}
+			superConductorFactory(GT_Materials.Void, 512, 30661, 0, 0, 8);}
+
+		generateNonGTFluidPipes(GT_Materials.Staballoy, ALLOY.STABALLOY, BasePipeID, 6250, 7500, true);
+		generateNonGTFluidPipes(GT_Materials.Tantalloy60, ALLOY.TANTALLOY_60, BasePipeID+5, 5000, 4250, true);
+		generateNonGTFluidPipes(GT_Materials.Tantalloy61, ALLOY.TANTALLOY_61, BasePipeID+10, 6000, 5800, true);
+		if (LoadedMods.Thaumcraft){
+			generateNonGTFluidPipes(GT_Materials.Void, null, 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);
-		
+		generateNonGTFluidPipes(GT_Materials.Potin, ALLOY.POTIN, BasePipeID+25, 375, 2000, true);
+		generateNonGTFluidPipes(GT_Materials.MaragingSteel300, ALLOY.MARAGING300, BasePipeID+30, 7000, 2500, true);
+		generateNonGTFluidPipes(GT_Materials.MaragingSteel350, ALLOY.MARAGING350, BasePipeID+35, 8000, 2500, true);
+		generateNonGTFluidPipes(GT_Materials.Inconel690, ALLOY.INCONEL_690, BasePipeID+40, 7500, 4800, true);
+		generateNonGTFluidPipes(GT_Materials.Inconel792, ALLOY.INCONEL_792, BasePipeID+45, 8000, 5500, true);
+		generateNonGTFluidPipes(GT_Materials.HastelloyX, ALLOY.HASTELLOY_X, 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;
@@ -133,9 +137,9 @@ public class GregtechConduits {
 			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);
+
+	private static void superConductorFactory(GT_Materials Material, int Voltage, int ID, long insulatedLoss, long uninsulatedLoss, long Amps){
+		GT_Materials T = Material;
 		int V = 0;
 		if (Voltage == 8){
 			V = 0;
@@ -168,149 +172,164 @@ public class GregtechConduits {
 			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.");
+			Utils.LOG_ERROR("Failed to set voltage on "+Material.name()+". Invalid voltage of "+Voltage+"V set.");
+			Utils.LOG_ERROR(Material.name()+" 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);
-    }
-	
-	
+		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;
+		long mass = material.getMass();
+		long voltage = material.mMeltingPoint >= 2800 ? 64 : 16;
 		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);
+		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, mass, voltage);
 	}
-	
-	private static void generateNonGTFluidPipes(GT_Materials material, int startID, int transferRatePerSec, int heatResistance, boolean isGasProof){
+
+	private static void generateNonGTFluidPipes(GT_Materials material, Material myMaterial, 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);
-	
+		long mass;
+		long voltage;
+		if (myMaterial != null){
+			mass = myMaterial.getMass();
+			voltage = myMaterial.vVoltageMultiplier;
+			if (myMaterial.getLocalizedName().equals(ALLOY.POTIN.getLocalizedName())){
+				voltage = 4;
+			}			
+		}
+		else {
+			mass = ELEMENT.getInstance().IRON.getMass();
+			voltage = 8;			
+		}
+
+		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, mass, voltage);
+
 	}
-	
-	private static void generatePipeRecipes(String materialName){
-		
+
+	private static void generatePipeRecipes(String materialName, long Mass, long vMulti){
+
 		String output = materialName.substring(0, 1).toUpperCase() + materialName.substring(1);
 		output = output.replace("-", "").replace("_", "").replace(" ", "");
-		
+
+		if (output.equals("VoidMetal")){
+			output = "Void";
+		}
+
 		Utils.LOG_INFO("Generating "+output+" pipes & respective recipes.");		
-		
-		ItemStack pipeIngot = UtilsItems.getItemStackOfAmountFromOreDict("ingot"+output, 1).copy();
-		ItemStack pipePlate = UtilsItems.getItemStackOfAmountFromOreDict("plate"+output, 1).copy();
-		
+
+		ItemStack pipeIngot = ItemUtils.getItemStackOfAmountFromOreDict("ingot"+output, 1).copy();
+		ItemStack pipePlate = ItemUtils.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));
-				
+		Utils.LOG_INFO("Generated pipeTiny from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 1) != null) ? true : false));
+		Utils.LOG_INFO("Generated pipeSmall from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1) != null) ? true : false));
+		Utils.LOG_INFO("Generated pipeNormal from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1) != null) ? true : false));
+		Utils.LOG_INFO("Generated pipeLarge from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1) != null) ? true : false));
+		Utils.LOG_INFO("Generated pipeHuge from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1) != null) ? true : false));
+
 		int eut = 128;
-		if (
-				materialName.toLowerCase().contains("hastelloy") ||
-				materialName.toLowerCase().contains("staballoy") ||
-				materialName.toLowerCase().contains("tantalloy") ||
-				materialName.toLowerCase().contains("europium") ||
-				materialName.toLowerCase().contains("crystal") ||
-				materialName.toLowerCase().contains("zeron") ||
-				materialName.toLowerCase().contains("inconel")
-				){
-			eut = 512;
-		}
-		else {
-			eut = 128;
-		}
-		
+		int time = 0;
+		int bonusMulti = 5*20;
+
+		time = (int) Math.max(Mass * 8L, 1);
+		eut = (int) (10 * vMulti);
+
+
 		//Add the Three Shaped Recipes First		
-		UtilsRecipe.recipeBuilder(
+		RecipeUtils.recipeBuilder(
 				pipePlate, "craftingToolWrench", pipePlate,
 				pipePlate, null, pipePlate,
 				pipePlate, "craftingToolHardHammer", pipePlate,
-				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 6));
-		
-		UtilsRecipe.recipeBuilder(
+				ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 6));
+
+		RecipeUtils.recipeBuilder(
 				pipePlate, pipePlate, pipePlate,
 				"craftingToolWrench", null, "craftingToolHardHammer",
 				pipePlate, pipePlate, pipePlate,
-				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 2));
-		
-		UtilsRecipe.recipeBuilder(
+				ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 2));
+
+		RecipeUtils.recipeBuilder(
 				pipePlate, "craftingToolHardHammer", pipePlate,
 				pipePlate, null, pipePlate,
 				pipePlate, "craftingToolWrench", pipePlate,
-				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1));
-		
+				ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1));
+
 		GT_Values.RA.addExtruderRecipe(
-				UtilsItems.getSimpleStack(pipeIngot, 1),
+				ItemUtils.getSimpleStack(pipeIngot, 1),
 				ItemList.Shape_Extruder_Pipe_Tiny.get(0),
-				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 2),
-				5, eut);
-		
+				ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 2),
+				time, eut);
+
 		GT_Values.RA.addExtruderRecipe(
-				UtilsItems.getSimpleStack(pipeIngot, 1),
+				ItemUtils.getSimpleStack(pipeIngot, 1),
 				ItemList.Shape_Extruder_Pipe_Small.get(0),
-				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1),
-				10, eut);
-		
+				ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1),
+				time+=bonusMulti, eut);
+
 		GT_Values.RA.addExtruderRecipe(
-				UtilsItems.getSimpleStack(pipeIngot, 3),
+				ItemUtils.getSimpleStack(pipeIngot, 3),
 				ItemList.Shape_Extruder_Pipe_Medium.get(0),
-				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1),
-				20, eut);
-		
+				ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1),
+				time+=bonusMulti, eut);
+
 		GT_Values.RA.addExtruderRecipe(
-				UtilsItems.getSimpleStack(pipeIngot, 6),
+				ItemUtils.getSimpleStack(pipeIngot, 6),
 				ItemList.Shape_Extruder_Pipe_Large.get(0),
-				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1),
-				2*20, eut);
-		
+				ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1),
+				time+=bonusMulti, eut);
+
 		GT_Values.RA.addExtruderRecipe(
-				UtilsItems.getSimpleStack(pipeIngot, 12),
+				ItemUtils.getSimpleStack(pipeIngot, 12),
 				ItemList.Shape_Extruder_Pipe_Huge.get(0),
-				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1),
-				4*20, eut);
-		
-		if (eut < 512){
-			ItemStack pipePlateDouble = UtilsItems.getItemStackOfAmountFromOreDict("plateDouble"+output, 1).copy();
-			UtilsRecipe.recipeBuilder(
-					pipePlateDouble, "craftingToolHardHammer", pipePlateDouble,
-					pipePlateDouble, null, pipePlateDouble,
-					pipePlateDouble, "craftingToolWrench", pipePlateDouble,
-					UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1));
+				ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1),
+				time+=bonusMulti, eut);
+
+		if (eut < 512 && !output.equals("Void")){
+			ItemStack pipePlateDouble = ItemUtils.getItemStackOfAmountFromOreDict("plateDouble"+output, 1).copy();
+			if (pipePlateDouble != null)
+				RecipeUtils.recipeBuilder(
+						pipePlateDouble, "craftingToolHardHammer", pipePlateDouble,
+						pipePlateDouble, null, pipePlateDouble,
+						pipePlateDouble, "craftingToolWrench", pipePlateDouble,
+						ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1));
+			else
+				Utils.LOG_INFO("Failed to add a recipe for "+materialName+" Huge pipes. Double plates probably do not exist.");
 		}
-		
-		
+
+
 	}
-	
+
 	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;
+			ItemStack returnValue = oreDictList.get(0).copy();
+			returnValue.stackSize = amount;
+			return returnValue;
 		}
-	 return UtilsItems.getSimpleStack(ModItems.AAA_Broken, amount);
+		return ItemUtils.getSimpleStack(ModItems.AAA_Broken, amount);
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
index fd4ec45fbb..33dfb60e3f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
@@ -40,7 +40,7 @@ public class GregtechDehydrator
 
 		GregtechItemList.GT_Dehydrator_EV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(
 				813, "advancedmachine.dehydrator.tier.01", "Chemical Dehydrator I", 4,
-				"Remind Alkalus to add something here."+System.getProperty("line.separator")+CORE.GT_Tooltip,
+				"This dehydrates your Grapes into Raisins. "+CORE.GT_Tooltip,
 				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes,
 				2, 9,
 				10000,
@@ -52,7 +52,7 @@ public class GregtechDehydrator
 				null).getStackForm(1L));
 		GregtechItemList.GT_Dehydrator_IV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(
 				814, "advancedmachine.dehydrator.tier.02", "Chemical Dehydrator II", 5,
-				"Remind Alkalus to add something here."+System.getProperty("line.separator")+CORE.GT_Tooltip,
+				"A hangover is the way your body reacts to dehydration. "+CORE.GT_Tooltip,
 				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes,
 				2, 9,
 				10000,
@@ -64,7 +64,7 @@ public class GregtechDehydrator
 				null).getStackForm(1L));
 		GregtechItemList.GT_Dehydrator_LuV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(
 				815, "advancedmachine.dehydrator.tier.03", "Chemical Dehydrator III", 6,
-				"Remind Alkalus to add something here."+System.getProperty("line.separator")+CORE.GT_Tooltip,
+				"You could probably make space icecream with this.. "+CORE.GT_Tooltip,
 				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes,
 				2, 9,
 				10000,
@@ -76,7 +76,7 @@ public class GregtechDehydrator
 				null).getStackForm(1L));
 		GregtechItemList.GT_Dehydrator_ZPM.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(
 				816, "advancedmachine.dehydrator.tier.04", "Chemical Dehydrator IV", 7,
-				"Remind Alkalus to add something here."+System.getProperty("line.separator")+CORE.GT_Tooltip,
+				"You can definitely make space icecream with this.. "+CORE.GT_Tooltip,
 				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes,
 				2, 9,
 				10000,
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
index 6f81f5c44c..01ecf1650d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
@@ -25,7 +25,6 @@ public class GregtechEnergyBuffer
 		
 	}
 
-	@SuppressWarnings("deprecation")
 	private static void run1()
 	{
 		
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
new file mode 100644
index 0000000000..844ba03ec9
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
@@ -0,0 +1,67 @@
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
+
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_ModHandler;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.material.ALLOY;
+import gtPlusPlus.core.recipe.RECIPE_CONSTANTS;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityGeothermalGenerator;
+import net.minecraft.item.ItemStack;
+
+public class GregtechGeothermalThermalGenerator {
+
+	public static void run()
+	{
+		if (LoadedMods.Gregtech){
+			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Geothermal Engines.");
+			run1();
+		}
+
+	}
+
+	private static void run1(){
+		GregtechItemList.Geothermal_Engine_EV.set(new GregtechMetaTileEntityGeothermalGenerator(830, "advancedgenerator.geothermalFuel.tier.01", "Basic Geothermal Engine", 4).getStackForm(1L));
+		GregtechItemList.Geothermal_Engine_IV.set(new GregtechMetaTileEntityGeothermalGenerator(831, "advancedgenerator.geothermalFuel.tier.02", "Turbo Geothermal Engine", 5).getStackForm(1L));
+		GregtechItemList.Geothermal_Engine_LuV.set(new GregtechMetaTileEntityGeothermalGenerator(832, "advancedgenerator.geothermalFuel.tier.03", "Vulcan Geothermal Engine", 6).getStackForm(1L));
+
+		GT_ModHandler.addCraftingRecipe(
+				GregtechItemList.Geothermal_Engine_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[]{"CEC", "GMG", "PWP",
+					Character.valueOf('M'), ItemList.Hull_EV,
+					Character.valueOf('P'), ItemList.Electric_Piston_EV,
+					Character.valueOf('E'), ItemList.Electric_Motor_EV,
+					Character.valueOf('C'), GregtechOrePrefixes.circuit.get(Materials.Ultimate),
+					Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Aluminium),
+					Character.valueOf('G'), ALLOY.TANTALLOY_61.getGear(1)});
+		
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Geothermal_Engine_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[]{"CEC", "GMG", "PWP",
+			Character.valueOf('M'), ItemList.Hull_IV,
+			Character.valueOf('P'), ItemList.Electric_Piston_IV,
+			Character.valueOf('E'), ItemList.Electric_Motor_IV,
+			Character.valueOf('C'), GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic),
+			Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Platinum),
+			Character.valueOf('G'), ALLOY.STELLITE.getGear(1)});
+		
+		final ItemStack INGREDIENT_1 = RECIPE_CONSTANTS.electricPiston_LuV;
+		final ItemStack INGREDIENT_2 = RECIPE_CONSTANTS.electricMotor_LuV;
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Geothermal_Engine_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[]{"CEC", "GMG", "PWP", 
+			Character.valueOf('M'), ItemList.Hull_LuV,
+			Character.valueOf('P'), INGREDIENT_1, 
+			Character.valueOf('E'), INGREDIENT_2, 
+			Character.valueOf('C'), GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic), 
+			Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Tungsten),
+			Character.valueOf('G'), ALLOY.ZERON_100.getGear(1)});
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSinter.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java
index d8ce73f460..0e08c4b135 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSinter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java
@@ -2,14 +2,14 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialSinter;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_AlloyBlastSmelter;
 
-public class GregtechIndustrialSinter{
+public class GregtechIndustrialBlastSmelter{
 
 	public static void run()
 	{
 		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
-			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Sinter Furnace Multiblock.");
+			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Blast Smelter Multiblock.");
 			run1();
 		}
 
@@ -18,7 +18,7 @@ public class GregtechIndustrialSinter{
 	private static void run1()
 	{
 		//Industrial Electrolyzer Multiblock
-		GregtechItemList.Industrial_SinterFurnace.set(new GregtechMetaTileEntityIndustrialSinter(810, "industrialsinterfurnace.controller.tier.single", "Sinter Furnace").getStackForm(1L));
+		GregtechItemList.Industrial_AlloyBlastSmelter.set(new GregtechMetaTileEntity_AlloyBlastSmelter(810, "industrialsalloyamelter.controller.tier.single", "Blast Smelter").getStackForm(1L));
 		
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
index 14ccd6a142..226e0a44e1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
@@ -2,7 +2,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.e