optimize imports + SA

20 files changed, 724 insertions, 639 deletions

diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java
index 5fdafdc9e2..3fccd0604c 100644
--- a/src/main/java/common/Blocks.java
+++ b/src/main/java/common/Blocks.java
@@ -4,9 +4,16 @@ import kekztech.KekzCore;
 
 import net.minecraft.block.Block;
 
-import common.blocks.*;
+import common.blocks.Block_GDCUnit;
+import common.blocks.Block_IchorJar;
+import common.blocks.Block_LapotronicEnergyUnit;
+import common.blocks.Block_LargeHexPlate;
+import common.blocks.Block_TFFTStorageField;
+import common.blocks.Block_ThaumiumReinforcedJar;
+import common.blocks.Block_YSZUnit;
 
 public class Blocks {
+
     public static Block yszUnit;
     public static Block gdcUnit;
     public static Block tfftStorageField;
diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java
index dd426daa0a..4574009b07 100644
--- a/src/main/java/common/Recipes.java
+++ b/src/main/java/common/Recipes.java
@@ -2,6 +2,16 @@ package common;
 
 import java.util.HashMap;
 
+import kekztech.KekzCore;
+
+import net.minecraft.item.ItemStack;
+
+import thaumcraft.api.ItemApi;
+import thaumcraft.api.ThaumcraftApi;
+import thaumcraft.api.aspects.Aspect;
+import thaumcraft.api.aspects.AspectList;
+import thaumcraft.api.crafting.InfusionRecipe;
+
 import common.recipeLoaders.AlloySmelter;
 import common.recipeLoaders.Assembler;
 import common.recipeLoaders.AssemblyLine;
@@ -11,17 +21,10 @@ import common.recipeLoaders.FormingPress;
 import common.recipeLoaders.Mixer;
 import common.recipeLoaders.ResearchableAssemblyLine;
 import common.recipeLoaders.Unpackager;
-import kekztech.KekzCore;
 
-import net.minecraft.item.ItemStack;
-
-import thaumcraft.api.ItemApi;
-import thaumcraft.api.ThaumcraftApi;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.AspectList;
-import thaumcraft.api.crafting.InfusionRecipe;
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.enums.*;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 
diff --git a/src/main/java/common/TileEntities.java b/src/main/java/common/TileEntities.java
index 0fa62067e9..9925e7aa27 100644
--- a/src/main/java/common/TileEntities.java
+++ b/src/main/java/common/TileEntities.java
@@ -1,8 +1,15 @@
 package common;
 
-import common.tileentities.*;
+import common.tileentities.GTMTE_LapotronicSuperCapacitor;
+import common.tileentities.GTMTE_SOFuelCellMK1;
+import common.tileentities.GTMTE_SOFuelCellMK2;
+import common.tileentities.GTMTE_SpaceElevator;
 import common.tileentities.GTMTE_TFFT;
 import common.tileentities.GTMTE_TFFTHatch;
+import common.tileentities.TE_IchorJar;
+import common.tileentities.TE_IchorVoidJar;
+import common.tileentities.TE_ThaumiumReinforcedJar;
+import common.tileentities.TE_ThaumiumReinforcedVoidJar;
 import cpw.mods.fml.common.registry.GameRegistry;
 
 public class TileEntities {
diff --git a/src/main/java/common/blocks/Block_IchorJar.java b/src/main/java/common/blocks/Block_IchorJar.java
index 88449b7e98..2328458d2d 100644
--- a/src/main/java/common/blocks/Block_IchorJar.java
+++ b/src/main/java/common/blocks/Block_IchorJar.java
@@ -100,7 +100,7 @@ public class Block_IchorJar extends BlockJar {
 
     /**
      * Handle compatibility with Essentia Phials
-     * 
+     *
      * @param world  Pass through from onBlockActivated()
      * @param player Pass through from onBlockActivated()
      * @param x      Pass through from onBlockActivated()
diff --git a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
index 5ea0d7c072..53026e1ac3 100644
--- a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
+++ b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
@@ -141,7 +141,7 @@ public class Block_ThaumiumReinforcedJar extends BlockJar {
 
     /**
      * Handle compatibility with Essentia Phials
-     * 
+     *
      * @param world  Pass through from onBlockActivated()
      * @param player Pass through from onBlockActivated()
      * @param x      Pass through from onBlockActivated()
diff --git a/src/main/java/common/recipeLoaders/AlloySmelter.java b/src/main/java/common/recipeLoaders/AlloySmelter.java
index b2c7170f3c..3ceeb8da17 100644
--- a/src/main/java/common/recipeLoaders/AlloySmelter.java
+++ b/src/main/java/common/recipeLoaders/AlloySmelter.java
@@ -1,25 +1,27 @@
 package common.recipeLoaders;
 
+import kekztech.Items;
+
 import common.items.MetaItem_CraftingComponent;
+
 import cpw.mods.fml.common.Loader;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
-import kekztech.Items;
 
-public class AlloySmelter implements Runnable{
+public class AlloySmelter implements Runnable {
+
     @Override
     public void run() {
         final MetaItem_CraftingComponent craftingItem = MetaItem_CraftingComponent.getInstance();
 
-
         // YSZ Cermic Plate
         GT_Values.RA.addAlloySmelterRecipe(
-            craftingItem.getStackOfAmountFromDamage(
-                Items.YSZCeramicDust.getMetaID(),
-                Loader.isModLoaded("bartworks") ? 3 : 10),
-            ItemList.Shape_Mold_Plate.get(0),
-            craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 1),
-            400,
-            480);
+                craftingItem.getStackOfAmountFromDamage(
+                        Items.YSZCeramicDust.getMetaID(),
+                        Loader.isModLoaded("bartworks") ? 3 : 10),
+                ItemList.Shape_Mold_Plate.get(0),
+                craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 1),
+                400,
+                480);
     }
 }
diff --git a/src/main/java/common/recipeLoaders/Assembler.java b/src/main/java/common/recipeLoaders/Assembler.java
index 26238537f3..9966a968ba 100644
--- a/src/main/java/common/recipeLoaders/Assembler.java
+++ b/src/main/java/common/recipeLoaders/Assembler.java
@@ -1,11 +1,17 @@
 package common.recipeLoaders;
 
+import kekztech.Items;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidRegistry;
+
 import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.LuVTierEnhancer;
 import com.github.bartimaeusnek.bartworks.util.BW_Util;
 import common.Blocks;
 import common.TileEntities;
 import common.items.ErrorItem;
 import common.items.MetaItem_CraftingComponent;
+
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
@@ -14,250 +20,236 @@ import gregtech.api.enums.TierEU;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
-import kekztech.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidRegistry;
 
-public class Assembler implements Runnable{
+public class Assembler implements Runnable {
+
     @Override
     public void run() {
         // TFFT Casing
         GT_Values.RA.addAssemblerRecipe(
-            new ItemStack[] { GT_Utility.getIntegratedCircuit(6),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DarkSteel, 3),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderPearl, 3), },
-            Materials.Polytetrafluoroethylene.getMolten(144),
-            new ItemStack(Blocks.tfftStorageField, 1),
-            100,
-            BW_Util.getMachineVoltageFromTier(3));
+                new ItemStack[] { GT_Utility.getIntegratedCircuit(6),
+                        GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DarkSteel, 3),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderPearl, 3), },
+                Materials.Polytetrafluoroethylene.getMolten(144),
+                new ItemStack(Blocks.tfftStorageField, 1),
+                100,
+                BW_Util.getMachineVoltageFromTier(3));
 
         // TFFT Multi Hatch
         GT_Values.RA.addAssemblerRecipe(
-            new ItemStack[] { ItemList.Hull_HV.get(1), ItemList.Cover_FluidStorageMonitor.get(1),
-                ItemList.Field_Generator_LV.get(4),
-                GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Polytetrafluoroethylene, 25) },
-            Materials.Plastic.getMolten(432),
-            TileEntities.tfftHatch.getStackForm(1),
-            400,
-            BW_Util.getMachineVoltageFromTier(3));
+                new ItemStack[] { ItemList.Hull_HV.get(1), ItemList.Cover_FluidStorageMonitor.get(1),
+                        ItemList.Field_Generator_LV.get(4),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Polytetrafluoroethylene, 25) },
+                Materials.Plastic.getMolten(432),
+                TileEntities.tfftHatch.getStackForm(1),
+                400,
+                BW_Util.getMachineVoltageFromTier(3));
 
         // TFFTStorageField1
         GT_Values.RA.addAssemblerRecipe(
-            new ItemStack[] { GT_Utility.getIntegratedCircuit(6),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CrudeSteel, 1),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrudeSteel, 6),
-                GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Steel, 3),
-                ItemList.FluidRegulator_LV.get(1) },
-            Materials.Glass.getMolten(144),
-            new ItemStack(Blocks.tfftStorageField, 1, 1),
-            100,
-            BW_Util.getMachineVoltageFromTier(3));
+                new ItemStack[] { GT_Utility.getIntegratedCircuit(6),
+                        GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CrudeSteel, 1),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrudeSteel, 6),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Steel, 3),
+                        ItemList.FluidRegulator_LV.get(1) },
+                Materials.Glass.getMolten(144),
+                new ItemStack(Blocks.tfftStorageField, 1, 1),
+                100,
+                BW_Util.getMachineVoltageFromTier(3));
 
         // TFFTStorageField2
         GT_Values.RA.addAssemblerRecipe(
-            new ItemStack[] { GT_Utility.getIntegratedCircuit(6), ItemList.Casing_Tank_1.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnergeticSilver, 6),
-                GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Plastic, 3),
-                ItemList.FluidRegulator_MV.get(1) },
-            Materials.Plastic.getMolten(288),
-            new ItemStack(Blocks.tfftStorageField, 1, 2),
-            200,
-            BW_Util.getMachineVoltageFromTier(3));
+                new ItemStack[] { GT_Utility.getIntegratedCircuit(6), ItemList.Casing_Tank_1.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnergeticSilver, 6),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Plastic, 3),
+                        ItemList.FluidRegulator_MV.get(1) },
+                Materials.Plastic.getMolten(288),
+                new ItemStack(Blocks.tfftStorageField, 1, 2),
+                200,
+                BW_Util.getMachineVoltageFromTier(3));
 
         // TFFTStorageField3
         GT_Values.RA.addAssemblerRecipe(
-            new ItemStack[] { GT_Utility.getIntegratedCircuit(6), ItemList.Casing_Tank_3.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VividAlloy, 6),
-                GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.StainlessSteel, 3),
-                ItemList.Field_Generator_LV.get(1), ItemList.FluidRegulator_HV.get(1) },
-            Materials.Plastic.getMolten(432),
-            new ItemStack(Blocks.tfftStorageField, 1, 3),
-            400,
-            BW_Util.getMachineVoltageFromTier(3));
+                new ItemStack[] { GT_Utility.getIntegratedCircuit(6), ItemList.Casing_Tank_3.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VividAlloy, 6),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.StainlessSteel, 3),
+                        ItemList.Field_Generator_LV.get(1), ItemList.FluidRegulator_HV.get(1) },
+                Materials.Plastic.getMolten(432),
+                new ItemStack(Blocks.tfftStorageField, 1, 3),
+                400,
+                BW_Util.getMachineVoltageFromTier(3));
 
         // TFFTStorageField4
         GT_Values.RA.addAssemblerRecipe(
-            new ItemStack[] { GT_Utility.getIntegratedCircuit(6), ItemList.Casing_Tank_5.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Enderium, 6),
-                GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Polytetrafluoroethylene, 3),
-                ItemList.Field_Generator_MV.get(2), ItemList.FluidRegulator_EV.get(1) },
-            Materials.Epoxid.getMolten(864),
-            new ItemStack(Blocks.tfftStorageField, 1, 4),
-            400,
-            BW_Util.getMachineVoltageFromTier(4));
+                new ItemStack[] { GT_Utility.getIntegratedCircuit(6), ItemList.Casing_Tank_5.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Enderium, 6),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Polytetrafluoroethylene, 3),
+                        ItemList.Field_Generator_MV.get(2), ItemList.FluidRegulator_EV.get(1) },
+                Materials.Epoxid.getMolten(864),
+                new ItemStack(Blocks.tfftStorageField, 1, 4),
+                400,
+                BW_Util.getMachineVoltageFromTier(4));
 
         // TFFTStorageField5
         GT_Values.RA.addAssemblerRecipe(
-            new ItemStack[] { GT_Utility.getIntegratedCircuit(6), ItemList.Casing_Tank_7.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrystallineAlloy, 6),
-                GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Enderium, 3),
-                ItemList.Field_Generator_HV.get(4), ItemList.FluidRegulator_IV.get(1) },
-            Materials.Epoxid.getMolten(1152),
-            new ItemStack(Blocks.tfftStorageField, 1, 5),
-            400,
-            BW_Util.getMachineVoltageFromTier(5));
+                new ItemStack[] { GT_Utility.getIntegratedCircuit(6), ItemList.Casing_Tank_7.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrystallineAlloy, 6),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Enderium, 3),
+                        ItemList.Field_Generator_HV.get(4), ItemList.FluidRegulator_IV.get(1) },
+                Materials.Epoxid.getMolten(1152),
+                new ItemStack(Blocks.tfftStorageField, 1, 5),
+                400,
+                BW_Util.getMachineVoltageFromTier(5));
 
         // LSC Casing
         GT_Values.RA.addAssemblerRecipe(
-            new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tantalum, 4),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 2),
-                GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 2),
-                GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lapis, 1) },
-            null,
-            new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 0),
-            100,
-            480);
+                new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tantalum, 4),
+                        GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 2),
+                        GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 2),
+                        GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lapis, 1) },
+                null,
+                new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 0),
+                100,
+                480);
 
         // EV Capacitor alt recipe
         GT_Values.RA.addAssemblerRecipe(
-            new ItemStack[] { new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6),
-                GT_ModHandler.getIC2Item("lapotronCrystal", 1L, GT_Values.W),
-                GT_Utility.getIntegratedCircuit(7) },
-            null,
-            new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 7),
-            200,
-            BW_Util.getMachineVoltageFromTier(3));
-
+                new ItemStack[] { new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6),
+                        GT_ModHandler.getIC2Item("lapotronCrystal", 1L, GT_Values.W),
+                        GT_Utility.getIntegratedCircuit(7) },
+                null,
+                new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 7),
+                200,
+                BW_Util.getMachineVoltageFromTier(3));
 
         // IV Capacitor alt recipe
         GT_Values.RA.addAssemblerRecipe(
-            new ItemStack[] { new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6),
-                ItemList.Energy_LapotronicOrb.get(1L), GT_Utility.getIntegratedCircuit(1) },
-            null,
-            new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1),
-            400,
-            BW_Util.getMachineVoltageFromTier(4));
-
-
+                new ItemStack[] { new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6),
+                        ItemList.Energy_LapotronicOrb.get(1L), GT_Utility.getIntegratedCircuit(1) },
+                null,
+                new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1),
+                400,
+                BW_Util.getMachineVoltageFromTier(4));
 
         // LuV Capacitor alt recipe
         GT_Values.RA.addAssemblerRecipe(
-            new ItemStack[] { ItemList.Energy_LapotronicOrb2.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmiridium, 4),
-                GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmiridium, 24),
-                GT_Utility.getIntegratedCircuit(6) },
-            null,
-            new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2),
-            800,
-            BW_Util.getMachineVoltageFromTier(5));
+                new ItemStack[] { ItemList.Energy_LapotronicOrb2.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmiridium, 4),
+                        GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmiridium, 24),
+                        GT_Utility.getIntegratedCircuit(6) },
+                null,
+                new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2),
+                800,
+                BW_Util.getMachineVoltageFromTier(5));
         LuVTierEnhancer.addToBlackListForOsmiridiumReplacement(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2));
 
-
-
         // ZPM Capacitor alt recipe
         GT_Values.RA.addAssemblerRecipe(
-            new ItemStack[] { ItemList.Energy_Module.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 4),
-                GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 24),
-                GT_Utility.getIntegratedCircuit(6) },
-            null,
-            new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3),
-            1600,
-            BW_Util.getMachineVoltageFromTier(6));
-
-
+                new ItemStack[] { ItemList.Energy_Module.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 4),
+                        GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 24),
+                        GT_Utility.getIntegratedCircuit(6) },
+                null,
+                new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3),
+                1600,
+                BW_Util.getMachineVoltageFromTier(6));
 
         // UV Capacitor alt recipe
         GT_Values.RA.addAssemblerRecipe(
-            new ItemStack[] { ItemList.Energy_Cluster.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 4),
-                GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 24),
-                GT_Utility.getIntegratedCircuit(6) },
-            null,
-            new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4),
-            3200,
-            BW_Util.getMachineVoltageFromTier(7));
-
-
+                new ItemStack[] { ItemList.Energy_Cluster.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 4),
+                        GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 24),
+                        GT_Utility.getIntegratedCircuit(6) },
+                null,
+                new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4),
+                3200,
+                BW_Util.getMachineVoltageFromTier(7));
 
         // UHV Capacitor alt recipe
         GT_Values.RA.addAssemblerRecipe(
-            new ItemStack[] { ItemList.ZPM3.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 4),
-                GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 24),
-                GT_Utility.getIntegratedCircuit(6) },
-            null,
-            new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 5),
-            6400,
-            BW_Util.getMachineVoltageFromTier(8));
-
-
+                new ItemStack[] { ItemList.ZPM3.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 4),
+                        GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 24),
+                        GT_Utility.getIntegratedCircuit(6) },
+                null,
+                new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 5),
+                6400,
+                BW_Util.getMachineVoltageFromTier(8));
 
         // UEV Capacitor alt recipe
         GT_Values.RA.addAssemblerRecipe(
-            new ItemStack[] { ItemList.ZPM4.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 4),
-                GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 24),
-                GT_Utility.getIntegratedCircuit(6) },
-            null,
-            new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8),
-            640 * 20,
-            (int) TierEU.RECIPE_UHV);
-
+                new ItemStack[] { ItemList.ZPM4.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 4),
+                        GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 24),
+                        GT_Utility.getIntegratedCircuit(6) },
+                null,
+                new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8),
+                640 * 20,
+                (int) TierEU.RECIPE_UHV);
 
         // UIV Capacitor alt recipe
         GT_Values.RA.addAssemblerRecipe(
-            new ItemStack[] { ItemList.ZPM5.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 4),
-                GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TranscendentMetal, 24),
-                GT_Utility.getIntegratedCircuit(6) },
-            null,
-            new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9),
-            640 * 20,
-            (int) TierEU.RECIPE_UEV);
+                new ItemStack[] { ItemList.ZPM5.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 4),
+                        GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TranscendentMetal, 24),
+                        GT_Utility.getIntegratedCircuit(6) },
+                null,
+                new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9),
+                640 * 20,
+                (int) TierEU.RECIPE_UEV);
 
         // UMV Capacitor alt recipe
         GT_Values.RA.addAssemblerRecipe(
-            new ItemStack[] { ItemList.ZPM6.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 4),
-                GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 24),
-                GT_Utility.getIntegratedCircuit(6) },
-            null,
-            new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 10),
-            640 * 20,
-            (int) TierEU.RECIPE_UIV);
+                new ItemStack[] { ItemList.ZPM6.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 4),
+                        GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 24),
+                        GT_Utility.getIntegratedCircuit(6) },
+                null,
+                new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 10),
+                640 * 20,
+                (int) TierEU.RECIPE_UIV);
 
         final MetaItem_CraftingComponent craftingItem = MetaItem_CraftingComponent.getInstance();
 
         // YSZ Unit
         final ItemStack[] yszUnit = { GT_Utility.getIntegratedCircuit(6),
-            craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 4),
-            GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Yttrium, 1),
-            GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1),
-            ItemList.Electric_Motor_HV.get(1L), };
+                craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 4),
+                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Yttrium, 1),
+                GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1),
+                ItemList.Electric_Motor_HV.get(1L), };
         GT_Values.RA.addAssemblerRecipe(
-            yszUnit,
-            Materials.Hydrogen.getGas(4000),
-            new ItemStack(Blocks.yszUnit, 1),
-            1200,
-            480);
+                yszUnit,
+                Materials.Hydrogen.getGas(4000),
+                new ItemStack(Blocks.yszUnit, 1),
+                1200,
+                480);
 
         // GDC Unit
         final ItemStack[] gdcUnit = { GT_Utility.getIntegratedCircuit(6),
-            craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicPlate.getMetaID(), 8),
-            GT_OreDictUnificator
-                .get(OrePrefixes.frameGt, Materials.Gadolinium, new ItemStack(ErrorItem.getInstance(), 1), 1),
-            GT_OreDictUnificator
-                .get(OrePrefixes.rotor, Materials.Desh, new ItemStack(ErrorItem.getInstance(), 1), 1),
-            ItemList.Electric_Motor_IV.get(1L), };
-        GT_Values.RA.addAssemblerRecipe(
-            gdcUnit,
-            Materials.Hydrogen.getGas(16000),
-            new ItemStack(Blocks.gdcUnit, 1),
-            2400,
-            1920);
+                craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicPlate.getMetaID(), 8),
+                GT_OreDictUnificator
+                        .get(OrePrefixes.frameGt, Materials.Gadolinium, new ItemStack(ErrorItem.getInstance(), 1), 1),
+                GT_OreDictUnificator
+                        .get(OrePrefixes.rotor, Materials.Desh, new ItemStack(ErrorItem.getInstance(), 1), 1),
+                ItemList.Electric_Motor_IV.get(1L), };
+        GT_Values.RA.addAssemblerRecipe(
+                gdcUnit,
+                Materials.Hydrogen.getGas(16000),
+                new ItemStack(Blocks.gdcUnit, 1),
+                2400,
+                1920);
 
         // Hex Tiles
         final ItemStack[] hexTiles = { GT_Utility.getIntegratedCircuit(6),
-            GT_OreDictUnificator.get(OrePrefixes.stone, Materials.Concrete, 1),
-            GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1),
-            GT_OreDictUnificator.get(OrePrefixes.foil, Materials.DarkSteel, 2) };
-        GT_Values.RA.addAssemblerRecipe(
-            hexTiles,
-            FluidRegistry.getFluidStack("molten.plastic", 36),
-            new ItemStack(Blocks.largeHexPlate, 2),
-            600,
-            120);
+                GT_OreDictUnificator.get(OrePrefixes.stone, Materials.Concrete, 1),
+                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1),
+                GT_OreDictUnificator.get(OrePrefixes.foil, Materials.DarkSteel, 2) };
+        GT_Values.RA.addAssemblerRecipe(
+                hexTiles,
+                FluidRegistry.getFluidStack("molten.plastic", 36),
+                new ItemStack(Blocks.largeHexPlate, 2),
+                600,
+                120);
     }
 }
diff --git a/src/main/java/common/recipeLoaders/AssemblyLine.java b/src/main/java/common/recipeLoaders/AssemblyLine.java
index 480b0540f8..cbb3cdef43 100644
--- a/src/main/java/common/recipeLoaders/AssemblyLine.java
+++ b/src/main/java/common/recipeLoaders/AssemblyLine.java
@@ -1,213 +1,216 @@
 package common.recipeLoaders;
 
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
 import com.github.bartimaeusnek.bartworks.util.BW_Util;
 import com.github.technus.tectech.recipe.TT_recipeAdder;
 import common.Blocks;
+
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
 
-public class AssemblyLine implements Runnable{
+public class AssemblyLine implements Runnable {
+
     @Override
     public void run() {
         final Fluid radoxPoly = FluidRegistry.getFluid("molten.radoxpoly") != null
-            ? FluidRegistry.getFluid("molten.radoxpoly")
-            : FluidRegistry.getFluid("molten.polybenzimidazole");
+                ? FluidRegistry.getFluid("molten.radoxpoly")
+                : FluidRegistry.getFluid("molten.polybenzimidazole");
 
         final Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null
-            ? FluidRegistry.getFluid("molten.indalloy140")
-            : FluidRegistry.getFluid("molten.solderingalloy");
+                ? FluidRegistry.getFluid("molten.indalloy140")
+                : FluidRegistry.getFluid("molten.solderingalloy");
 
         final Fluid solderUEV = FluidRegistry.getFluid("molten.mutatedlivingsolder") != null
-            ? FluidRegistry.getFluid("molten.mutatedlivingsolder")
-            : FluidRegistry.getFluid("molten.solderingalloy");
+                ? FluidRegistry.getFluid("molten.mutatedlivingsolder")
+                : FluidRegistry.getFluid("molten.solderingalloy");
 
         // TFFTStorageField6
         GT_Values.RA.addAssemblylineRecipe(
-            new ItemStack(Blocks.tfftStorageField, 1, 5),
-            40000,
-            new ItemStack[] { ItemList.Casing_Tank_7.get(4),
-                GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.CrystallinePinkSlime, 6),
-                GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Naquadah, 3),
-                GT_ModHandler.getModItem("dreamcraft", "item.ChromeBars", 6),
-                GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Quantium, 6),
-                ItemList.Field_Generator_EV.get(8), ItemList.FluidRegulator_LuV.get(1),
-                GT_ModHandler.getModItem("dreamcraft", "item.EngineeringProcessorFluidEmeraldCore", 4) },
-            new FluidStack[] { Materials.Enderium.getMolten(1440), Materials.Polybenzimidazole.getMolten(1584) },
-            new ItemStack(Blocks.tfftStorageField, 1, 6),
-            600,
-            BW_Util.getMachineVoltageFromTier(6));
+                new ItemStack(Blocks.tfftStorageField, 1, 5),
+                40000,
+                new ItemStack[] { ItemList.Casing_Tank_7.get(4),
+                        GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.CrystallinePinkSlime, 6),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Naquadah, 3),
+                        GT_ModHandler.getModItem("dreamcraft", "item.ChromeBars", 6),
+                        GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Quantium, 6),
+                        ItemList.Field_Generator_EV.get(8), ItemList.FluidRegulator_LuV.get(1),
+                        GT_ModHandler.getModItem("dreamcraft", "item.EngineeringProcessorFluidEmeraldCore", 4) },
+                new FluidStack[] { Materials.Enderium.getMolten(1440), Materials.Polybenzimidazole.getMolten(1584) },
+                new ItemStack(Blocks.tfftStorageField, 1, 6),
+                600,
+                BW_Util.getMachineVoltageFromTier(6));
 
         // TFFTStorageField7
         GT_Values.RA.addAssemblylineRecipe(
-            new ItemStack(Blocks.tfftStorageField, 1, 6),
-            80000,
-            new ItemStack[] { ItemList.Casing_Tank_10.ge