code cleanup

+added DEHP
+added travis?
+added sonarcloud?
+version increase

Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>

19 files changed, 393 insertions, 125 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
index 3f3fc8d9a5..a0364772af 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
@@ -82,6 +82,7 @@ public final class MainMod {
     @Mod.EventHandler
     public void init(FMLInitializationEvent init) {
         new LoaderRegistry().run();
+
     }
 
     @Mod.EventHandler
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/creativetabs/GT2Tab.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/creativetabs/GT2Tab.java
index 1d403a93d9..8f45b3d48d 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/client/creativetabs/GT2Tab.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/creativetabs/GT2Tab.java
@@ -34,6 +34,6 @@ public class GT2Tab extends CreativeTabs {
 
     @Override
     public Item getTabIconItem() {
-        return ItemRegistry.tab;
+        return ItemRegistry.TAB;
     }
 }
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/creativetabs/bartworksTab.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/creativetabs/bartworksTab.java
index f3e5e15882..c49fdb0aae 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/client/creativetabs/bartworksTab.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/creativetabs/bartworksTab.java
@@ -34,7 +34,7 @@ public class bartworksTab extends CreativeTabs {
 
     @Override
     public Item getTabIconItem() {
-        return ItemRegistry.RockcutterHV;
+        return ItemRegistry.ROCKCUTTER_HV;
     }
 
 }
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererSwitchingColorFluid.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererSwitchingColorFluid.java
index 15523b68f6..4f7a19e0c6 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererSwitchingColorFluid.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererSwitchingColorFluid.java
@@ -64,7 +64,7 @@ public class RendererSwitchingColorFluid implements ISimpleBlockRenderingHandler
                 ++count;
             }
         }
-        if (end == 0.0f) {
+        if (end == 0.0f && count != 0) {
             end = total / count;
         }
         return end;
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java
index b4f28fd33a..0db716071e 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java
@@ -39,6 +39,7 @@ public class ConfigHandler {
     public static boolean newStuff = true;
     public static boolean BioLab = true;
     public static Configuration c;
+    public static boolean DEHPDirectSteam = false;
     private static boolean ezmode = false;
 
     public ConfigHandler(@Nonnull FMLPreInitializationEvent e) {
@@ -51,7 +52,7 @@ public class ConfigHandler {
         teslastaff = c.get("System", "Enable Teslastaff", false, "Enables the Teslastaff, an Item used to destroy Electric Armors").getBoolean(false);
         newStuff = !c.get("System", "Disable non-original-GT-stuff", false, "This switch disables my new content, that is not part of the GT2 compat").getBoolean(false);
         BioLab = !c.get("System", "Disable BioLab", false, "This switch disables the BioLab, BioVat etc. If you use GT5.08 or equivalent, this needs to be turned off!").getBoolean(false);
-
+        DEHPDirectSteam = c.get("Multiblocks", "DEHP Direct Steam Mode", false, "This switch enables the Direct Steam Mode of the DEHP. If enabled it will take in Waterand output steam. If disabled it will Input IC2Coolant and output hot coolant").getBoolean(false);
         if (ConfigHandler.IDOffset == 0) {
             ConfigHandler.IDOffset = 12600;
             c.get("System", "ID Offset", 12600, "ID Offset for this mod. This Mod uses " + IDU + " IDs. DO NOT CHANGE IF YOU DONT KNOW WHAT THIS IS").set(12600);
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java
index 5fa2064026..da80a83eb3 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java
@@ -72,7 +72,10 @@ public class LabParts extends SimpleSubItemClass {
 
     @Override
     public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List list, boolean b) {
-        if (itemStack == null || itemStack.getTagCompound() == null) {
+        if (itemStack == null)
+            return;
+
+        if (itemStack.getTagCompound() == null) {
             switch (itemStack.getItemDamage()) {
                 case 0:
                     list.add("An empty Sterilized Petri Dish.");
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioItemList.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioItemList.java
index 60614afde0..0c7b559b03 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioItemList.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioItemList.java
@@ -76,9 +76,9 @@ public class BioItemList {
             }, null, null, true, true);
 
 
-    private static final Item mItemBioLabParts = new LabModule(new String[]{"DNAExtractionModule", "PCRThermoclyclingModule", "PlasmidSynthesisModule", "TransformationModule", "ClonalCellularSynthesisModule"});
+    private static final Item mItemBioLabParts = new LabModule(new String[]{"DNAExtractionModule", "PCRThermoclyclingModule", "PlasmidSynthesisModule", "TransformationModule", "ClonalCellularSynthesisModule" });
     public static final ItemStack[] mBioLabParts = {new ItemStack(mItemBioLabParts), new ItemStack(mItemBioLabParts, 1, 1), new ItemStack(mItemBioLabParts, 1, 2), new ItemStack(mItemBioLabParts, 1, 3), new ItemStack(mItemBioLabParts, 1, 4)};
-    private static final Item vanillaBioLabParts = new LabParts(new String[]{"petriDish", "DNASampleFlask", "PlasmidCell", "DetergentPowder", "Agarose", "IncubationModule", "PlasmaMembrane"});
+    private static final Item vanillaBioLabParts = new LabParts(new String[]{"petriDish", "DNASampleFlask", "PlasmidCell", "DetergentPowder", "Agarose", "IncubationModule", "PlasmaMembrane" });
 
     public BioItemList() {
         GameRegistry.registerItem(mItemBioLabParts, "BioLabModules");
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
index d90b99029d..4ca992e984 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
@@ -27,10 +27,7 @@ import com.github.bartimaeusnek.bartworks.common.blocks.BW_Blocks;
 import com.github.bartimaeusnek.bartworks.common.blocks.BW_TileEntityContainer;
 import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler;
 import com.github.bartimaeusnek.bartworks.common.items.*;
-import com.github.bartimaeusnek.bartworks.common.tileentities.BW_RotorBlock;
-import com.github.bartimaeusnek.bartworks.common.tileentities.GT_MetaTileEntity_AcidGenerator;
-import com.github.bartimaeusnek.bartworks.common.tileentities.GT_MetaTileEntity_Diode;
-import com.github.bartimaeusnek.bartworks.common.tileentities.GT_MetaTileEntity_EnergyDistributor;
+import com.github.bartimaeusnek.bartworks.common.tileentities.*;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
@@ -47,22 +44,23 @@ import static com.github.bartimaeusnek.bartworks.MainMod.BWT;
 import static com.github.bartimaeusnek.bartworks.MainMod.GT2;
 import static com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler.newStuff;
 
-public class ItemRegistry implements Runnable {
+public class ItemRegistry {
 
-    public static final Item Destructopack = new GT_Destructopack_Item();
-    public static final Item Teslastaff = new GT_Teslastaff_Item();
-    public static final Item RockcutterLV = new GT_Rockcutter_Item(1);
-    public static final Item RockcutterMV = new GT_Rockcutter_Item(2);
-    public static final Item RockcutterHV = new GT_Rockcutter_Item(3);
-    public static final Item CircuitProgrammer = new Circuit_Programmer();
+    public static final Item DESTRUCTOPACK = new GT_Destructopack_Item();
+    public static final Item TESLASTAFF = new GT_Teslastaff_Item();
+    public static final Item ROCKCUTTER_LV = new GT_Rockcutter_Item(1);
+    public static final Item ROCKCUTTER_MV = new GT_Rockcutter_Item(2);
+    public static final Item ROCKCUTTER_HV = new GT_Rockcutter_Item(3);
+    public static final Item CIRCUIT_PROGRAMMER = new Circuit_Programmer();
     public static final Block ROTORBLOCK = new BW_TileEntityContainer(Material.wood, BW_RotorBlock.class, "BWRotorBlock");
-    public static final Item LeatherRotor = new BW_Stonage_Rotors(5, 0.15f, 15, 30, 2400, IKineticRotor.GearboxType.WIND, new ResourceLocation(MainMod.modID, "textures/items/rotors/rotorLeather.png"), "BW_LeatherRotor", "rotors/itemRotorLeather");
-    public static final Item WoolRotor = new BW_Stonage_Rotors(7, 0.18f, 10, 20, 1600, IKineticRotor.GearboxType.WIND, new ResourceLocation(MainMod.modID, "textures/items/rotors/rotorWool.png"), "BW_WoolRotor", "rotors/itemRotorWool");
-    public static final Item PaperRotor = new BW_Stonage_Rotors(9, 0.2f, 1, 10, 800, IKineticRotor.GearboxType.WIND, new ResourceLocation(MainMod.modID, "textures/items/rotors/rotorPaper.png"), "BW_PaperRotor", "rotors/itemRotorPaper");
-    public static final Item CombinedRotor = new BW_Stonage_Rotors(11, 0.22f, 1, 50, 5800, IKineticRotor.GearboxType.WIND, new ResourceLocation(MainMod.modID, "textures/items/rotors/rotorCombined.png"), "BW_CombinedRotor", "rotors/itemRotorCombined");
-    public static final Item craftingParts = new SimpleSubItemClass(new String[]{"grindstone_top", "grindstone_bottom", "completed_grindstone", "rotors/leatherParts", "rotors/woolParts", "rotors/paperParts", "rotors/combinedParts"});
-    public static final Item tab = new SimpleIconItem("GT2Coin");
+    public static final Item LEATHER_ROTOR = new BW_Stonage_Rotors(5, 0.15f, 15, 30, 2400, IKineticRotor.GearboxType.WIND, new ResourceLocation(MainMod.modID, "textures/items/rotors/rotorLeather.png"), "BW_LeatherRotor", "rotors/itemRotorLeather");
+    public static final Item WOOL_ROTOR = new BW_Stonage_Rotors(7, 0.18f, 10, 20, 1600, IKineticRotor.GearboxType.WIND, new ResourceLocation(MainMod.modID, "textures/items/rotors/rotorWool.png"), "BW_WoolRotor", "rotors/itemRotorWool");
+    public static final Item PAPER_ROTOR = new BW_Stonage_Rotors(9, 0.2f, 1, 10, 800, IKineticRotor.GearboxType.WIND, new ResourceLocation(MainMod.modID, "textures/items/rotors/rotorPaper.png"), "BW_PaperRotor", "rotors/itemRotorPaper");
+    public static final Item COMBINED_ROTOR = new BW_Stonage_Rotors(11, 0.22f, 1, 50, 5800, IKineticRotor.GearboxType.WIND, new ResourceLocation(MainMod.modID, "textures/items/rotors/rotorCombined.png"), "BW_CombinedRotor", "rotors/itemRotorCombined");
+    public static final Item CRAFTING_PARTS = new SimpleSubItemClass(new String[]{"grindstone_top", "grindstone_bottom", "completed_grindstone", "rotors/leatherParts", "rotors/woolParts", "rotors/paperParts", "rotors/combinedParts" });
+    public static final Item TAB = new SimpleIconItem("GT2Coin");
     public static final Item WINDMETER = new BW_SimpleWindMeter();
+    public static ItemStack dehp;
     public static final Block[] BW_BLOCKS = {
             new BW_Blocks("BW_ItemBlocks", new String[]
                     {
@@ -82,42 +80,41 @@ public class ItemRegistry implements Runnable {
 
     };
 
-    public static ItemStack[] Diode2A = new ItemStack[GT_Values.VN.length];
-    public static ItemStack[] Diode4A = new ItemStack[GT_Values.VN.length];
-    public static ItemStack[] Diode8A = new ItemStack[GT_Values.VN.length];
-    public static ItemStack[] Diode12A = new ItemStack[GT_Values.VN.length];
-    public static ItemStack[] Diode16A = new ItemStack[GT_Values.VN.length];
-    public static ItemStack[] EnergyDistributor = new ItemStack[GT_Values.VN.length];
-    public static ItemStack[] AcidGens = new ItemStack[3];
+    public static ItemStack[] diode2A = new ItemStack[GT_Values.VN.length];
+    public static ItemStack[] diode4A = new ItemStack[GT_Values.VN.length];
+    public static ItemStack[] diode8A = new ItemStack[GT_Values.VN.length];
+    public static ItemStack[] diode12A = new ItemStack[GT_Values.VN.length];
+    public static ItemStack[] diode16A = new ItemStack[GT_Values.VN.length];
+    public static ItemStack[] energyDistributor = new ItemStack[GT_Values.VN.length];
+    public static ItemStack[] acidGens = new ItemStack[3];
 
-    @Override
-    public void run() {
+    public static void run() {
 
         if (newStuff) {
             GameRegistry.registerBlock(BW_BLOCKS[2], BW_ItemBlocks.class, "BW_Machinery_Casings");
             GT_OreDictUnificator.registerOre(OrePrefixes.block, Materials.NickelZincFerrite, new ItemStack(BW_BLOCKS[2]));
-            GameRegistry.registerItem(LeatherRotor, "BW_LeatherRotor");
-            GameRegistry.registerItem(WoolRotor, "BW_WoolRotor");
-            GameRegistry.registerItem(PaperRotor, "BW_PaperRotor");
-            GameRegistry.registerItem(CombinedRotor, "BW_CombinedRotor");
-            GameRegistry.registerItem(craftingParts, "craftingParts");
+            GameRegistry.registerItem(LEATHER_ROTOR, "BW_LeatherRotor");
+            GameRegistry.registerItem(WOOL_ROTOR, "BW_WoolRotor");
+            GameRegistry.registerItem(PAPER_ROTOR, "BW_PaperRotor");
+            GameRegistry.registerItem(COMBINED_ROTOR, "BW_CombinedRotor");
+            GameRegistry.registerItem(CRAFTING_PARTS, "craftingParts");
             GameRegistry.registerTileEntity(BW_RotorBlock.class, "BWRotorBlockTE");
             GameRegistry.registerBlock(ROTORBLOCK, "BWRotorBlock");
             GameRegistry.registerItem(WINDMETER, "BW_SimpleWindMeter");
 
             for (int i = 0; i < GT_Values.VN.length; i++) {
-                ItemRegistry.Diode2A[i] = new GT_MetaTileEntity_Diode(ConfigHandler.IDOffset + GT_Values.VN.length + 1 + i, "Cable Diode 2A " + GT_Values.VN[i], "Cable Diode 2A " + GT_Values.VN[i], i, 2).getStackForm(1L);
-                ItemRegistry.Diode4A[i] = new GT_MetaTileEntity_Diode(ConfigHandler.IDOffset + GT_Values.VN.length * 2 + 1 + i, "Cable Diode 4A " + GT_Values.VN[i], "Cable Diode 4A " + GT_Values.VN[i], i, 4).getStackForm(1L);
-                ItemRegistry.Diode8A[i] = new GT_MetaTileEntity_Diode(ConfigHandler.IDOffset + GT_Values.VN.length * 3 + 1 + i, "Cable Diode 8A " + GT_Values.VN[i], "Cable Diode 8A " + GT_Values.VN[i], i, 8).getStackForm(1L);
-                ItemRegistry.Diode12A[i] = new GT_MetaTileEntity_Diode(ConfigHandler.IDOffset + GT_Values.VN.length * 4 + 1 + i, "Cable Diode 12A " + GT_Values.VN[i], "Cable Diode 12A " + GT_Values.VN[i], i, 12).getStackForm(1L);
-                ItemRegistry.Diode16A[i] = new GT_MetaTileEntity_Diode(ConfigHandler.IDOffset + GT_Values.VN.length * 5 + 1 + i, "Cable Diode 16A " + GT_Values.VN[i], "Cable Diode 16A " + GT_Values.VN[i], i, 16).getStackForm(1L);
-                ItemRegistry.EnergyDistributor[i] = new GT_MetaTileEntity_EnergyDistributor(ConfigHandler.IDOffset + 1 + i, "Energy Distributor " + GT_Values.VN[i], "Energy Distributor " + GT_Values.VN[i], i, "Splits Amperage into several Sides").getStackForm(1L);
+                ItemRegistry.diode2A[i] = new GT_MetaTileEntity_Diode(ConfigHandler.IDOffset + GT_Values.VN.length + 1 + i, "Cable Diode 2A " + GT_Values.VN[i], "Cable Diode 2A " + GT_Values.VN[i], i, 2).getStackForm(1L);
+                ItemRegistry.diode4A[i] = new GT_MetaTileEntity_Diode(ConfigHandler.IDOffset + GT_Values.VN.length * 2 + 1 + i, "Cable Diode 4A " + GT_Values.VN[i], "Cable Diode 4A " + GT_Values.VN[i], i, 4).getStackForm(1L);
+                ItemRegistry.diode8A[i] = new GT_MetaTileEntity_Diode(ConfigHandler.IDOffset + GT_Values.VN.length * 3 + 1 + i, "Cable Diode 8A " + GT_Values.VN[i], "Cable Diode 8A " + GT_Values.VN[i], i, 8).getStackForm(1L);
+                ItemRegistry.diode12A[i] = new GT_MetaTileEntity_Diode(ConfigHandler.IDOffset + GT_Values.VN.length * 4 + 1 + i, "Cable Diode 12A " + GT_Values.VN[i], "Cable Diode 12A " + GT_Values.VN[i], i, 12).getStackForm(1L);
+                ItemRegistry.diode16A[i] = new GT_MetaTileEntity_Diode(ConfigHandler.IDOffset + GT_Values.VN.length * 5 + 1 + i, "Cable Diode 16A " + GT_Values.VN[i], "Cable Diode 16A " + GT_Values.VN[i], i, 16).getStackForm(1L);
+                ItemRegistry.energyDistributor[i] = new GT_MetaTileEntity_EnergyDistributor(ConfigHandler.IDOffset + 1 + i, "Energy Distributor " + GT_Values.VN[i], "Energy Distributor " + GT_Values.VN[i], i, "Splits Amperage into several Sides").getStackForm(1L);
 
             }
             for (int i = 0; i < 3; i++) {
-                ItemRegistry.AcidGens[i] = new GT_MetaTileEntity_AcidGenerator(ConfigHandler.IDOffset + GT_Values.VN.length * 8 - 2 + i, "Acid Generator " + GT_Values.VN[i + 2], "Acid Generator " + GT_Values.VN[i + 2], i + 2, new String[]{"An Acid Generator", "Creates Power from Chemical Energy Potentials."}).getStackForm(1);
+                ItemRegistry.acidGens[i] = new GT_MetaTileEntity_AcidGenerator(ConfigHandler.IDOffset + GT_Values.VN.length * 8 - 2 + i, "Acid Generator " + GT_Values.VN[i + 2], "Acid Generator " + GT_Values.VN[i + 2], i + 2, new String[]{"An Acid Generator", "Creates Power from Chemical Energy Potentials." }).getStackForm(1);
             }
-
+            dehp = new GT_TileEntity_DEHP(ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 1, 1, "DEHP", "Deep Earth Heating Pump").getStackForm(1L);
         }
 
 
@@ -125,11 +122,11 @@ public class ItemRegistry implements Runnable {
         GameRegistry.registerBlock(BW_BLOCKS[0], BW_ItemBlocks.class, "BW_ItemBlocks");
         GameRegistry.registerBlock(BW_BLOCKS[1], BW_ItemBlocks.class, "GT_LESU_CASING");
         if (ConfigHandler.teslastaff)
-            GameRegistry.registerItem(Teslastaff, Teslastaff.getUnlocalizedName());
+            GameRegistry.registerItem(TESLASTAFF, TESLASTAFF.getUnlocalizedName());
 
-        GameRegistry.registerItem(RockcutterLV, RockcutterLV.getUnlocalizedName());
-        GameRegistry.registerItem(RockcutterMV, RockcutterMV.getUnlocalizedName());
-        GameRegistry.registerItem(RockcutterHV, RockcutterHV.getUnlocalizedName());
-        GameRegistry.registerItem(tab, "tabIconGT2");
+        GameRegistry.registerItem(ROCKCUTTER_LV, ROCKCUTTER_LV.getUnlocalizedName());
+        GameRegistry.registerItem(ROCKCUTTER_MV, ROCKCUTTER_MV.getUnlocalizedName());
+        GameRegistry.registerItem(ROCKCUTTER_HV, ROCKCUTTER_HV.getUnlocalizedName());
+        GameRegistry.registerItem(TAB, "tabIconGT2");
     }
 }
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java
index 6a651b3c2b..5e191fbc8a 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java
@@ -27,6 +27,7 @@ import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler;
 import com.github.bartimaeusnek.bartworks.common.tileentities.GT_TileEntity_LESU;
 import com.github.bartimaeusnek.bartworks.common.tileentities.GT_TileEntity_ManualTrafo;
 import com.github.bartimaeusnek.bartworks.common.tileentities.GT_TileEntity_Windmill;
+import com.github.bartimaeusnek.bartworks.util.BW_Util;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
@@ -39,6 +40,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 import static com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler.newStuff;
@@ -103,7 +105,7 @@ public class RecipeLoader implements Runnable {
                 });
 
         GT_ModHandler.addCraftingRecipe(
-                new ItemStack(ItemRegistry.Destructopack),
+                new ItemStack(ItemRegistry.DESTRUCTOPACK),
                 RecipeLoader.BITSD,
                 new Object[]{
                         "CPC",
@@ -115,7 +117,7 @@ public class RecipeLoader implements Runnable {
                 });
 
         GT_ModHandler.addCraftingRecipe(
-                new ItemStack(ItemRegistry.Destructopack),
+                new ItemStack(ItemRegistry.DESTRUCTOPACK),
                 RecipeLoader.BITSD,
                 new Object[]{
                         "CPC",
@@ -127,7 +129,7 @@ public class RecipeLoader implements Runnable {
                 });
 
         GT_ModHandler.addCraftingRecipe(
-                new ItemStack(ItemRegistry.RockcutterMV),
+                new ItemStack(ItemRegistry.ROCKCUTTER_MV),
                 RecipeLoader.BITSD,
                 new Object[]{
                         "DS ",
@@ -141,7 +143,7 @@ public class RecipeLoader implements Runnable {
                 });
 
         GT_ModHandler.addCraftingRecipe(
-                new ItemStack(ItemRegistry.RockcutterLV),
+                new ItemStack(ItemRegistry.ROCKCUTTER_LV),
                 RecipeLoader.BITSD,
                 new Object[]{
                         "DS ",
@@ -155,7 +157,7 @@ public class RecipeLoader implements Runnable {
                 });
 
         GT_ModHandler.addCraftingRecipe(
-                new ItemStack(ItemRegistry.RockcutterHV),
+                new ItemStack(ItemRegistry.ROCKCUTTER_HV),
                 RecipeLoader.BITSD,
                 new Object[]{
                         "DS ",
@@ -170,7 +172,7 @@ public class RecipeLoader implements Runnable {
 
         if (ConfigHandler.teslastaff)
             GT_ModHandler.addCraftingRecipe(
-                    new ItemStack(ItemRegistry.Teslastaff),
+                    new ItemStack(ItemRegistry.TESLASTAFF),
                     RecipeLoader.BITSD,
                     new Object[]{
                             "BO ",
@@ -182,6 +184,22 @@ public class RecipeLoader implements Runnable {
                     });
 
         if (newStuff) {
+            if (!MainMod.GTNH)
+                GT_ModHandler.addCraftingRecipe(
+                        ItemRegistry.dehp,
+                        BITSD,
+                        new Object[]{
+                                "GPG",
+                                "NCN",
+                                "GPG",
+                                'G', GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.HSSE, 1L),
+                                'P', ItemList.Pump_IV.get(1L),
+                                'N', GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Ultimate, 1L),
+                                'C', ItemList.MACHINE_HULLS[5],
+                        }
+                );
+            else
+                GT_Values.RA.addAssemblylineRecipe(ItemList.Pump_IV.get(1L), 72000, new ItemStack[]{ItemList.Pump_IV.get(16), GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Ultimate, 32L), GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.HSSE, 32L), ItemList.Field_Generator_LuV.get(8)}, new FluidStack[]{Materials.SolderingAlloy.getMolten(32 * 144), Materials.Polytetrafluoroethylene.getMolten(32 * 144)}, ItemRegistry.dehp, 5000, BW_Util.getMachineVoltageFromTier(6));
 
             GT_ModHandler.addCraftingRecipe(
                     new ItemStack(ItemRegistry.WINDMETER),
@@ -205,7 +223,7 @@ public class RecipeLoader implements Runnable {
                 Materials cable = cables[i + 2];
                 ItemStack machinehull = ItemList.MACHINE_HULLS[i + 2].get(1L);
                 GT_ModHandler.addCraftingRecipe(
-                        ItemRegistry.AcidGens[i],
+                        ItemRegistry.acidGens[i],
                         RecipeLoader.BITSD,
                         new Object[]{
                                 "HRH",
@@ -226,7 +244,7 @@ public class RecipeLoader implements Runnable {
                     ItemStack machinehull = ItemList.MACHINE_HULLS[i].get(1L);
 
                     GT_ModHandler.addCraftingRecipe(
-                            ItemRegistry.EnergyDistributor[i],
+                            ItemRegistry.energyDistributor[i],
                             RecipeLoader.BITSD,
                             new Object[]{
                                     "PWP",
@@ -237,7 +255,7 @@ public class RecipeLoader implements Runnable {
                                     'C', machinehull
                             });
                     GT_ModHandler.addCraftingRecipe(
-                            ItemRegistry.Diode12A[i],
+                            ItemRegistry.diode12A[i],
                             RecipeLoader.BITSD,
                             new Object[]{
                                     "WDW",
@@ -250,7 +268,7 @@ public class RecipeLoader implements Runnable {
                             }
                     );
                     GT_ModHandler.addCraftingRecipe(
-                            ItemRegistry.Diode12A[i],
+                            ItemRegistry.diode12A[i],
                             RecipeLoader.BITSD,
                             new Object[]{
                                     "WDW",
@@ -263,7 +281,7 @@ public class RecipeLoader implements Runnable {
                             }
                     );
                     GT_ModHandler.addCraftingRecipe(
-                            ItemRegistry.Diode8A[i],
+                            ItemRegistry.diode8A[i],
                             RecipeLoader.BITSD,
                             new Object[]{
                                     "WDW",
@@ -276,7 +294,7 @@ public class RecipeLoader implements Runnable {
                             }
                     );
                     GT_ModHandler.addCraftingRecipe(
-                            ItemRegistry.Diode8A[i],
+                            ItemRegistry.diode8A[i],
                             RecipeLoader.BITSD,
                             new Object[]{
                                     "WDW",
@@ -289,7 +307,7 @@ public class RecipeLoader implements Runnable {
                             }
                     );
                     GT_ModHandler.addCraftingRecipe(
-                            ItemRegistry.Diode4A[i],
+                            ItemRegistry.diode4A[i],
                             RecipeLoader.BITSD,
                             new Object[]{
                                     "WDW",
@@ -302,7 +320,7 @@ public class RecipeLoader implements Runnable {
                             }
                     );
                     GT_ModHandler.addCraftingRecipe(
-                            ItemRegistry.Diode4A[i],
+                            ItemRegistry.diode4A[i],
                             RecipeLoader.BITSD,
                             new Object[]{
                                     "WDW",
@@ -315,7 +333,7 @@ public class RecipeLoader implements Runnable {
                             }
                     );
                     GT_ModHandler.addCraftingRecipe(
-                            ItemRegistry.Diode2A[i],
+                            ItemRegistry.diode2A[i],
                             RecipeLoader.BITSD,
                             new Object[]{
                                     "WDW",
@@ -328,7 +346,7 @@ public class RecipeLoader implements Runnable {
                             }
                     );
                     GT_ModHandler.addCraftingRecipe(
-                            ItemRegistry.Diode2A[i],
+                            ItemRegistry.diode2A[i],
                             RecipeLoader.BITSD,
                             new Object[]{
                                     "WDW",
@@ -341,7 +359,7 @@ public class RecipeLoader implements Runnable {
                             }
                     );
                     GT_ModHandler.addCraftingRecipe(
-                            ItemRegistry.Diode16A[i],
+                            ItemRegistry.diode16A[i],
                             RecipeLoader.BITSD,
                             new Object[]{
                                     "WHW",
@@ -355,7 +373,7 @@ public class RecipeLoader implements Runnable {
                             }
                     );
                     GT_ModHandler.addCraftingRecipe(
-                            ItemRegistry.Diode16A[i],
+                            ItemRegistry.diode16A[i],
                             RecipeLoader.BITSD,
                             new Object[]{
                                     "WHW",
@@ -396,7 +414,7 @@ public class RecipeLoader implements Runnable {
                     }
             );
 
-            GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L), Materials.Aluminium.getPlates(1), ItemList.Circuit_Board_Plastic.get(1L), ItemList.Battery_RE_LV_Lithium.get(1L)}, Materials.SolderingAlloy.getMolten(288L), new ItemStack(ItemRegistry.CircuitProgrammer), 600, (int) (GT_Values.V[2] - (GT_Values.V[2] / 10)));
+            GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L), Materials.Aluminium.getPlates(1), ItemList.Circuit_Board_Plastic.get(1L), ItemList.Battery_RE_LV_Lithium.get(1L)}, Materials.SolderingAlloy.getMolten(288L), new ItemStack(ItemRegistry.CIRCUIT_PROGRAMMER), 600, (int) (GT_Values.V[2] - (GT_Values.V[2] / 10)));
 
             GT_ModHandler.addCraftingRecipe(
                     new GT_TileEntity_Windmill(ConfigHandler.IDOffset + GT_Values.VN.length * 6 + 2, "Windmill", "Windmill").getStackForm(1L),
@@ -408,16 +426,16 @@ public class RecipeLoader implements Runnable {
                             'B', new ItemStack(Blocks.brick_block),
                             'W', GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L),
                             'H', new ItemStack(Blocks.hopper),
-                            'G', new ItemStack(ItemRegistry.craftingParts, 1, 2),
+                            'G', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 2),
                     }
             );
 
-            String[] stones = {"stone", "stoneSmooth"};
-            String[] granites = {"blockGranite", "stoneGranite", "Granite", "granite"};
+            String[] stones = {"stone", "stoneSmooth" };
+            String[] granites = {"blockGranite", "stoneGranite", "Granite", "granite" };
             for (String granite : granites) {
                 for (String stone : stones) {
                     GT_ModHandler.addCraftingRecipe(
-                            new ItemStack(ItemRegistry.craftingParts, 1, 0),
+                            new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 0),
                             GT_ModHandler.RecipeBits.NOT_REMOVABLE,
                             new Object[]{
                                     "SSS",
@@ -428,7 +446,7 @@ public class RecipeLoader implements Runnable {
                             }
                     );
                     GT_ModHandler.addCraftingRecipe(
-                            new ItemStack(ItemRegistry.craftingParts, 1, 1),
+                            new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 1),
                             GT_ModHandler.RecipeBits.NOT_REMOVABLE,
                             new Object[]{
                                     "hDf",
@@ -438,7 +456,7 @@ public class RecipeLoader implements Runnable {
                             }
                     );
                     GT_ModHandler.addCraftingRecipe(
-                            new ItemStack(ItemRegistry.craftingParts, 1, 0),
+                            new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 0),
                             GT_ModHandler.RecipeBits.NOT_REMOVABLE,
                             new Object[]{
                                     "SSS",
@@ -449,7 +467,7 @@ public class RecipeLoader implements Runnable {
                             }
                     );
                     GT_ModHandler.addCraftingRecipe(
-                            new ItemStack(ItemRegistry.craftingParts, 1, 1),
+                            new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 1),
                             GT_ModHandler.RecipeBits.NOT_REMOVABLE,
                             new Object[]{
                                     "hDf",
@@ -460,32 +478,32 @@ public class RecipeLoader implements Runnable {
                     );
                 }
                 GT_ModHandler.addCraftingRecipe(
-                        new ItemStack(ItemRegistry.craftingParts, 1, 2),
+                        new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 2),
                         GT_ModHandler.RecipeBits.NOT_REMOVABLE,
                         new Object[]{
                                 "STS",
                                 "h f",
                                 "SBS",
                                 'S', granite,
-                                'T', new ItemStack(ItemRegistry.craftingParts, 1, 0),
-                                'B', new ItemStack(ItemRegistry.craftingParts, 1, 1),
+                                'T', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 0),
+                                'B', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 1),
                         }