+ More Cyclotron Work.

+ Added Better Accelerator Tooltip.

34 files changed, 675 insertions, 717 deletions

diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 18ba3ad097..d6f2472fd0 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -72,6 +72,7 @@ public class COMPAT_HANDLER {
 			GregtechIndustrialSifter.run();
 			GregtechSimpleWasher.run();
 			GregtechRTG.run();
+			GregtechCyclotron.run();
 			
 			//New Horizons Content
 			NewHorizonsAccelerator.run();
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
index 34568f60bd..e0f94036a7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
@@ -1,5 +1,9 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
 
+import static gregtech.api.enums.GT_Values.V;
+
+import java.util.*;
+
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
@@ -9,6 +13,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
 import gregtech.api.objects.GT_RenderedTexture;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.player.PlayerUtils;
 import net.minecraft.block.Block;
@@ -20,12 +25,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-import static gregtech.api.enums.GT_Values.V;
-
 public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_TieredMachineBlock {
 
 	public static String[] BlacklistedTileEntiyClassNames;
@@ -68,7 +67,8 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
 				String.format("Accelerating things (Radius: %d EU/t: %d Speed Bonus: x%d)", mTier,
 						getEnergyDemand(mTier, false), mAccelerateStatic[mTier]),
 				"Use a screwdriver to change mode", "To accelerate TileEntities, this machine has to be adjacent to it",
-				"This machine accepts up to 8 Amps", "Accelerating TileEntities doubles Energy-Demand" };
+				"This machine accepts up to 8 Amps", "Accelerating TileEntities doubles Energy-Demand", CORE.GT_Tooltip};
+		
 	}
 
 	public GT_MetaTileEntity_WorldAccelerator(String pName, int pTier, int pInvSlotCount, String pDescription,
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java
index 48ef351679..7d2de70c9c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java
@@ -1,7 +1,6 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
 
-import gregtech.api.enums.Dyes;
-import gregtech.api.enums.Textures;
+import gregtech.api.enums.*;
 import gregtech.api.gui.GT_Container_MultiMachine;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
@@ -37,7 +36,7 @@ public class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity_MultiBlo
 
     @Override
 	public long maxEUStore() {
-        return (640010000L/4) * (Math.min(16, this.mEnergyHatches.size())) / 16L;
+        return Integer.MAX_VALUE;
     }
 
     @Override
@@ -167,21 +166,21 @@ public class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity_MultiBlo
     }
 
     private boolean addIfEnergyInjector(int aX, int aY, int aZ, IGregTechTileEntity aBaseMetaTileEntity) {
-        if (addEnergyInputToMachineList(aBaseMetaTileEntity.getIGregTechTileEntity(aX, aY, aZ), 53)) {
+        if (addEnergyInputToMachineList(aBaseMetaTileEntity.getIGregTechTileEntity(aX, aY, aZ), TAE.GTPP_INDEX(25))) {
             return true;
         }
         return isAdvancedMachineCasing(aX, aY, aZ);
     }
 
     private boolean addIfInjector(int aX, int aY, int aZ, IGregTechTileEntity aTileEntity) {
-        if (addInputToMachineList(aTileEntity.getIGregTechTileEntity(aX, aY, aZ), 53)) {
+        if (addInputToMachineList(aTileEntity.getIGregTechTileEntity(aX, aY, aZ), TAE.GTPP_INDEX(25))) {
             return true;
         }
         return isAdvancedMachineCasing(aX, aY, aZ);
     }
 
     private boolean addIfExtractor(int aX, int aY, int aZ, IGregTechTileEntity aTileEntity) {
-        if (addOutputToMachineList(aTileEntity.getIGregTechTileEntity(aX, aY, aZ), 53)) {
+        if (addOutputToMachineList(aTileEntity.getIGregTechTileEntity(aX, aY, aZ), TAE.GTPP_INDEX(25))) {
             return true;
         }
         return isAdvancedMachineCasing(aX, aY, aZ);
@@ -218,14 +217,14 @@ public class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity_MultiBlo
         		"------------------------------------------------------------",
         		"Particles are accelerated over 186 revolutions to 80% light speed",
         		"Can produce a continuous beam current of 2.2 mA at 590 MeV",
-        		"Which will be extracted from the Isochronous cyclotron",
+        		"Which will be extracted from the Isochronous Cyclotron",
         		"------------------------------------------------------------",
         		"Consists of the same layout as a Fusion Reactor",
         		"Cyclotron Machine Casings around Cyclotron Coil Blocks", 
         		"2-16 Input Hatches", 
         		"1-16 Output Hatches", 
         		"1-16 Energy Hatches", 
-        		"All Hatches must be ZPM or better"};
+        		"All Hatches must be LuV or better"};
     }
 
     @Override
@@ -304,8 +303,7 @@ public class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity_MultiBlo
         return new String[]{
                 "COMET - Compact Cyclotron MK "+tier,
                 "EU Required: "+powerRequired+"EU/t",
-                "Stored EU: "+mEUStore+" / "+maxEUStore(),
-                "Plasma Output: "+plasmaOut+"L/t"};
+                "Stored EU: "+mEUStore+" / "+maxEUStore()};
     }
 
     @Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
index dec1d3f746..3bbdd48a0a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
@@ -9,14 +9,12 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GT4Entity_Aut
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GT4Entity_ThermalBoiler;
 import gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving.*;
 
-public class Gregtech4Content
-{
+public class Gregtech4Content {
 
-	//ID Range 828, 829, 833 - 850
+	// ID Range 828, 829, 833 - 850
 
-	public static void run()
-	{
-		if (LoadedMods.Gregtech){
+	public static void run() {
+		if (LoadedMods.Gregtech) {
 			workbenches();
 			thermalBoiler();
 			multiCrafter();
@@ -25,40 +23,57 @@ public class Gregtech4Content
 		}
 	}
 
-	private static void workbenches(){
-		//Gregtech 4 Workbenches
+	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));
+		// 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 Tesseracts
+	private static void tesseracts() {
+		// Gregtech 4 Tesseracts
 		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));
+		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));
 	}
-	
-	private static void shelves(){
-		//Gregtech 4 Shelves
+
+	private static void shelves() {
+		// Gregtech 4 Shelves
 		Utils.LOG_INFO("Gregtech 4 Content | Registering Shelves.");
-		GregtechItemList.GT4_Shelf.set(new GT4Entity_Shelf(870, "gtplusplus.shelf.wooden", "Wood encased Shelf", "Stores Books & Things").getStackForm(1L));
-		GregtechItemList.GT4_Shelf_Iron.set(new GT4Entity_Shelf_Iron(871, "gtplusplus.shelf.iron", "Metal encased Shelf", "Stores Books & Things").getStackForm(1L));
-		GregtechItemList.GT4_Shelf_FileCabinet.set(new GT4Entity_Shelf_FileCabinet(872, "gtplusplus.shelf.filecabinet", "File Cabinet", "Stores Books & Things").getStackForm(1L));
-	    GregtechItemList.GT4_Shelf_Desk.set(new GT4Entity_Shelf_Desk(873, "gtplusplus.shelf.desk", "Metal encased Desk", "Stores Books & Things").getStackForm(1L));
-		GregtechItemList.GT4_Shelf_Compartment.set(new GT4Entity_Shelf_Compartment(874, "gtplusplus.shelf.compartment", "Compartment", "Stores Books & Things").getStackForm(1L));
-		}
+		GregtechItemList.GT4_Shelf
+				.set(new GT4Entity_Shelf(870, "gtplusplus.shelf.wooden", "Wood encased Shelf", "Stores Books & Things")
+						.getStackForm(1L));
+		GregtechItemList.GT4_Shelf_Iron.set(
+				new GT4Entity_Shelf_Iron(871, "gtplusplus.shelf.iron", "Metal encased Shelf", "Stores Books & Things")
+						.getStackForm(1L));
+		GregtechItemList.GT4_Shelf_FileCabinet.set(new GT4Entity_Shelf_FileCabinet(872, "gtplusplus.shelf.filecabinet",
+				"File Cabinet", "Stores Books & Things").getStackForm(1L));
+		GregtechItemList.GT4_Shelf_Desk.set(
+				new GT4Entity_Shelf_Desk(873, "gtplusplus.shelf.desk", "Metal encased Desk", "Stores Books & Things")
+						.getStackForm(1L));
+		GregtechItemList.GT4_Shelf_Compartment.set(new GT4Entity_Shelf_Compartment(874, "gtplusplus.shelf.compartment",
+				"Compartment", "Stores Books & Things").getStackForm(1L));
+	}
 
-	private static void thermalBoiler(){
-		//Gregtech 4 Thermal Boiler
+	private static void thermalBoiler() {
+		// Gregtech 4 Thermal Boiler
 		Utils.LOG_INFO("Gregtech 4 Content | Registering Thermal Boiler.");
-		GregtechItemList.GT4_Thermal_Boiler.set(new GT4Entity_ThermalBoiler(875, "gtplusplus.thermal.boiler", "Thermal Boiler").getStackForm(1L));
+		GregtechItemList.GT4_Thermal_Boiler
+				.set(new GT4Entity_ThermalBoiler(875, "gtplusplus.thermal.boiler", "Thermal Boiler").getStackForm(1L));
 	}
-	
-	private static void multiCrafter(){
-		//Gregtech 4 Multiblock Auto-Crafter
+
+	private static void multiCrafter() {
+		// Gregtech 4 Multiblock Auto-Crafter
 		Utils.LOG_INFO("Gregtech 4 Content | Registering Multiblock Crafter.");
-		GregtechItemList.GT4_Multi_Crafter.set(new GT4Entity_AutoCrafter(876, "gtplusplus.autocrafter.multi", "Large Autocrafter").getStackForm(1L));
+		GregtechItemList.GT4_Multi_Crafter.set(
+				new GT4Entity_AutoCrafter(876, "gtplusplus.autocrafter.multi", "Large Autocrafter").getStackForm(1L));
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
index ea1279126d..0ac4379e7e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
@@ -14,95 +14,85 @@ import net.minecraft.item.ItemStack;
 public class GregtechAdvancedBoilers {
 
 	public static void run() {
-		if (LoadedMods.Gregtech){
+		if (LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Advanced Boilers.");
 			run1();
 		}
 	}
 
-	private static void run1(){
-		//Boilers
-		GregtechItemList.Boiler_Advanced_LV.set(new GT_MetaTileEntity_Boiler_LV(753, "Advanced Boiler [LV]", 1).getStackForm(1L));
-		GregtechItemList.Boiler_Advanced_MV.set(new GT_MetaTileEntity_Boiler_MV(754, "Advanced Boiler [MV]", 2).getStackForm(1L));
-		GregtechItemList.Boiler_Advanced_HV.set(new GT_MetaTileEntity_Boiler_HV(755, "Advanced Boiler [HV]", 3).getStackForm(1L));
-		
-		
-		ItemStack chassisT1 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 0, 1);
-		ItemStack chassisT2 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 1, 1);
-		ItemStack chassisT3 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 2, 1);
+	private static void run1() {
+		// Boilers
+		GregtechItemList.Boiler_Advanced_LV
+				.set(new GT_MetaTileEntity_Boiler_LV(753, "Advanced Boiler [LV]", 1).getStackForm(1L));
+		GregtechItemList.Boiler_Advanced_MV
+				.set(new GT_MetaTileEntity_Boiler_MV(754, "Advanced Boiler [MV]", 2).getStackForm(1L));
+		GregtechItemList.Boiler_Advanced_HV
+				.set(new GT_MetaTileEntity_Boiler_HV(755, "Advanced Boiler [HV]", 3).getStackForm(1L));
 
+		ItemStack chassisT1 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1",
+				0, 1);
+		ItemStack chassisT2 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1",
+				1, 1);
+		ItemStack chassisT3 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1",
+				2, 1);
 
-		//Make the Coil in each following recipe a hammer and a Screwdriver.
+		// Make the Coil in each following recipe a hammer and a Screwdriver.
 
-		
-		//Chassis Recipes
-		GT_ModHandler.addCraftingRecipe(
-		chassisT1,
-		GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-		new Object[]{"WCW", "GMG", "WPW",
-			Character.valueOf('M'), ItemList.Hull_ULV,
-			Character.valueOf('P'), OrePrefixes.pipeLarge.get(Materials.Bronze),
-			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Primitive),
-			Character.valueOf('W'), OrePrefixes.plate.get(Materials.Lead),
-			Character.valueOf('G'), OrePrefixes.pipeSmall.get(Materials.Copper)});
+		// Chassis Recipes
+		GT_ModHandler.addCraftingRecipe(chassisT1,
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "WCW", "GMG", "WPW", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('P'),
+						OrePrefixes.pipeLarge.get(Materials.Bronze), Character.valueOf('C'),
+						OrePrefixes.circuit.get(Materials.Primitive), Character.valueOf('W'),
+						OrePrefixes.plate.get(Materials.Lead), Character.valueOf('G'),
+						OrePrefixes.pipeSmall.get(Materials.Copper) });
 
-		GT_ModHandler.addCraftingRecipe(
-		chassisT2,
-		GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-		new Object[]{"WCW", "GMG", "WPW",
-			Character.valueOf('M'), ItemList.Hull_LV,
-			Character.valueOf('P'), OrePrefixes.pipeLarge.get(Materials.Steel),
-			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic),
-			Character.valueOf('W'), OrePrefixes.plate.get(Materials.Steel),
-			Character.valueOf('G'), OrePrefixes.pipeSmall.get(Materials.Bronze)});
+		GT_ModHandler.addCraftingRecipe(chassisT2,
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "WCW", "GMG", "WPW", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('P'),
+						OrePrefixes.pipeLarge.get(Materials.Steel), Character.valueOf('C'),
+						OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('W'),
+						OrePrefixes.plate.get(Materials.Steel), Character.valueOf('G'),
+						OrePrefixes.pipeSmall.get(Materials.Bronze) });
 
-		GT_ModHandler.addCraftingRecipe(
-		chassisT3,
-		GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-		new Object[]{"WCW", "GMG", "WPW",
-			Character.valueOf('M'), ItemList.Hull_MV,
-			Character.valueOf('P'), OrePrefixes.pipeLarge.get(Materials.StainlessSteel),
-			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good),
-			Character.valueOf('W'), OrePrefixes.plate.get(Materials.Aluminium),
-			Character.valueOf('G'), OrePrefixes.pipeSmall.get(Materials.Steel)});
+		GT_ModHandler.addCraftingRecipe(chassisT3,
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "WCW", "GMG", "WPW", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('P'),
+						OrePrefixes.pipeLarge.get(Materials.StainlessSteel), Character.valueOf('C'),
+						OrePrefixes.circuit.get(Materials.Good), Character.valueOf('W'),
+						OrePrefixes.plate.get(Materials.Aluminium), Character.valueOf('G'),
+						OrePrefixes.pipeSmall.get(Materials.Steel) });
 
-		
 		ItemStack pipeTier1 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier7, 1);
 		ItemStack pipeTier2 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier8, 1);
 		ItemStack pipeTier3 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier9, 1);
-		
-		//Boiler Recipes
-		GT_ModHandler.addCraftingRecipe(
-		GregtechItemList.Boiler_Advanced_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[]{"dCw", "WMW", "GPG",
-			Character.valueOf('M'), ItemList.Hull_LV,
-			Character.valueOf('P'), pipeTier1,
-			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic),
-			Character.valueOf('W'), chassisT1,
-			Character.valueOf('G'), OrePrefixes.gear.get(Materials.Steel)});
 
-		GT_ModHandler.addCraftingRecipe(
-		GregtechItemList.Boiler_Advanced_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[]{"dCw", "WMW", "GPG",
-			Character.valueOf('M'), ItemList.Hull_MV,
-			Character.valueOf('P'), pipeTier2,
-			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good),
-			Character.valueOf('W'), chassisT2,
-			Character.valueOf('G'), ALLOY.SILICON_CARBIDE.getGear(1)});
+		// Boiler Recipes
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Boiler_Advanced_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[] { "dCw", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('P'),
+						pipeTier1, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic),
+						Character.valueOf('W'), chassisT1, Character.valueOf('G'),
+						OrePrefixes.gear.get(Materials.Steel) });
 
-		GT_ModHandler.addCraftingRecipe(
-		GregtechItemList.Boiler_Advanced_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[]{"dCw", "WMW", "GPG",
-			Character.valueOf('M'), ItemList.Hull_HV,
-			Character.valueOf('P'), pipeTier3,
-			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced),
-			Character.valueOf('W'), chassisT3,
-			Character.valueOf('G'), ALLOY.SILICON_CARBIDE.getGear(1)});
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Boiler_Advanced_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[] { "dCw", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('P'),
+						pipeTier2, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good),
+						Character.valueOf('W'), chassisT2, Character.valueOf('G'), ALLOY.SILICON_CARBIDE.getGear(1) });
+
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Boiler_Advanced_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[] { "dCw", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('P'),
+						pipeTier3, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced),
+						Character.valueOf('W'), chassisT3, Character.valueOf('G'), ALLOY.SILICON_CARBIDE.getGear(1) });
 
-		
 	}
-	
+
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java
index 44b10d81cf..193ab09b4b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java
@@ -6,15 +6,17 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaT
 
 public class GregtechCyclotron {
 
-	public static void run(){
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering COMET Cyclotron.");
 			run1();
 		}
 	}
 
-	private static void run1(){
-		GregtechItemList.COMET_Cyclotron.set(new GregtechMetaTileEntity_Cyclotron(801, "cyclotron.tier.single", "COMET - Compact Cyclotron", 6).getStackForm(1L));
+	private static void run1() {
+		GregtechItemList.COMET_Cyclotron
+				.set(new GregtechMetaTileEntity_Cyclotron(801, "cyclotron.tier.single", "COMET - Compact Cyclotron", 6)
+						.getStackForm(1L));
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
index 63621c627e..aed701d6cd 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
@@ -14,11 +14,9 @@ import gtPlusPlus.core.util.recipe.RecipeUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.item.ItemStack;
 
-public class GregtechDehydrator
-{
-	public static void run()
-	{
-		if (LoadedMods.Gregtech){
+public class GregtechDehydrator {
+	public static void run() {
+		if (LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Chemical Dehydrators.");
 			if (CORE.configSwitches.enableMachine_Dehydrators) {
 				run1();
@@ -27,79 +25,49 @@ public class GregtechDehydrator
 
 	}
 
-	private static void run1()
-	{
+	private static void run1() {
 
 		/*
-
-		 public GT_MetaTileEntity_BasicMachine_GT_Recipe(
-		  int aID, String aName, String aNameRegional, int aTier,
-		  String aDescription,
-		  GT_Recipe_Map aRecipes,
-		  int aInputSlots, int aOutputSlots,
-		  int aTankCapacity,
-		  int aGUIParameterA, int aGUIParameterB,
-		  String aGUIName, String aSound,
-		  boolean aSharedTank, boolean aRequiresFluidForFiltering,
-		  int aSpecialEffect,
-		  String aOverlays,
-		  Object[] aRecipe) {
-
+		 * 
+		 * public GT_MetaTileEntity_BasicMachine_GT_Recipe( int aID, String
+		 * aName, String aNameRegional, int aTier, String aDescription,
+		 * GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int
+		 * aTankCapacity, int aGUIParameterA, int aGUIParameterB, String
+		 * aGUIName, String aSound, boolean aSharedTank, boolean
+		 * aRequiresFluidForFiltering, int aSpecialEffect, String aOverlays,
+		 * Object[] aRecipe) {
+		 * 
 		 */
 
-		GregtechItemList.GT_Dehydrator_EV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(
-				813, "advancedmachine.dehydrator.tier.01", "Chemical Dehydrator I", 4,
-				"This dehydrates your Grapes into Raisins. "+CORE.GT_Tooltip,
-				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes,
-				2, 9,
-				10000,
-				2, 5,
-				"Dehydrator.png", "",
-				false, false,
-				0,
-				"UNBOXINATOR",
-				null).getStackForm(1L));
-		GregtechItemList.GT_Dehydrator_IV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(
-				814, "advancedmachine.dehydrator.tier.02", "Chemical Dehydrator II", 5,
-				"A hangover is the way your body reacts to dehydration. "+CORE.GT_Tooltip,
-				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes,
-				2, 9,
-				10000,
-				2, 5,
-				"Dehydrator.png", "",
-				false, false,
-				0,
-				"UNBOXINATOR",
-				null).getStackForm(1L));
-		GregtechItemList.GT_Dehydrator_LuV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(
-				815, "advancedmachine.dehydrator.tier.03", "Chemical Dehydrator III", 6,
-				"You could probably make space icecream with this.. "+CORE.GT_Tooltip,
-				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes,
-				2, 9,
-				10000,
-				2, 5,
-				"Dehydrator.png", "",
-				false, false,
-				0,
-				"UNBOXINATOR",
-				null).getStackForm(1L));
-		GregtechItemList.GT_Dehydrator_ZPM.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(
-				816, "advancedmachine.dehydrator.tier.04", "Chemical Dehydrator IV", 7,
-				"You c