+ Added some Geothermal Generators.

+ Added recipes and fuels for all Geothermals. (Normal Lava and Pahoehoe Lava)
$ Fixed workbench not saving crafting table contents when closed.
% Changed internal loading of Workbenches, Tanks and Geothermals.
% Disabled old workbench buttons, now using Gregtech Holo slots.

3 files changed, 96 insertions, 9 deletions

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..961abedc8d
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
@@ -0,0 +1,66 @@
+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.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'), OrePrefixes.gearGt.get(Materials.Titanium)});
+		
+		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'), OrePrefixes.gearGt.get(Materials.TungstenSteel)});
+		
+		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'), OrePrefixes.gearGt.get(Materials.Chrome)});
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java
index 4632b306ed..690ebcc0ec 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java
@@ -3,8 +3,6 @@ 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.storage.GT_MetaTileEntity_AdvancedCraftingTable;
-import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_BronzeCraftingTable;
 import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredTank;
 import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_NBT_Tank;
 
@@ -32,13 +30,7 @@ public class GregtechTieredFluidTanks
         GregtechItemList.GT_FluidTank_LuV.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.06", "Ludicrous Voltage Fluid Tank", 6).getStackForm(1L));
         GregtechItemList.GT_FluidTank_ZPM.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.07", "ZPM Voltage Fluid Tank", 7).getStackForm(1L));
         GregtechItemList.GT_FluidTank_UV.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.08", "Ultimate Voltage Fluid Tank", 8).getStackForm(1L));
-        GregtechItemList.GT_FluidTank_MAX.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.09", "MAX Voltage Fluid Tank", 9).getStackForm(1L));
-        
-        //Gregtech 4 Workbenches
-		GregtechItemList.GT4_Workbench_Bronze.set(new GT_MetaTileEntity_BronzeCraftingTable(828, "workbench.bronze", "Bronze Workbench", 0).getStackForm(1L));
-		GregtechItemList.GT4_Workbench_Advanced.set(new GT_MetaTileEntity_AdvancedCraftingTable(829, "workbench.advanced", "Advanced Workbench", 1).getStackForm(1L));
-        
-        
+        GregtechItemList.GT_FluidTank_MAX.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.09", "MAX Voltage Fluid Tank", 9).getStackForm(1L));        
 	}
 	
 	private static void run2()
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWorkbenches.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWorkbenches.java
new file mode 100644
index 0000000000..4486bc5cd5
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWorkbenches.java
@@ -0,0 +1,29 @@
+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.storage.GT_MetaTileEntity_AdvancedCraftingTable;
+import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_BronzeCraftingTable;
+
+public class GregtechWorkbenches
+{
+	public static void run()
+	{
+		if (LoadedMods.Gregtech){
+			Utils.LOG_INFO("Gregtech5u Content | Registering Workbenches.");
+			run1();
+			//run2();
+		}
+		
+	}
+
+	private static void run1()
+	{
+        //Gregtech 4 Workbenches
+		GregtechItemList.GT4_Workbench_Bronze.set(new GT_MetaTileEntity_BronzeCraftingTable(828, "workbench.bronze", "Bronze Workbench", 0).getStackForm(1L));
+		GregtechItemList.GT4_Workbench_Advanced.set(new GT_MetaTileEntity_AdvancedCraftingTable(829, "workbench.advanced", "Advanced Workbench", 1).getStackForm(1L));
+        
+        
+	}
+}