Merge branch 'Refactor' into Bees

12 files changed, 4391 insertions, 1791 deletions

diff --git a/src/main/java/gregtech/api/enums/Dyes.java b/src/main/java/gregtech/api/enums/Dyes.java
index 656afc4890..c8aec75f9e 100644
--- a/src/main/java/gregtech/api/enums/Dyes.java
+++ b/src/main/java/gregtech/api/enums/Dyes.java
@@ -39,14 +39,14 @@ public enum Dyes implements IColorModulationContainer {
     CONSTRUCTION_FOAM(-1, 64, 64, 64, "Construction Foam"),
     MACHINE_METAL(-1, 210, 220, 255, "Machine Metal");
 
-    public static final Dyes VALUES[] = {dyeBlack, dyeRed, dyeGreen, dyeBrown, dyeBlue, dyePurple, dyeCyan, dyeLightGray, dyeGray, dyePink, dyeLime, dyeYellow, dyeLightBlue, dyeMagenta, dyeOrange, dyeWhite};
+    public static final Dyes[] VALUES = {dyeBlack, dyeRed, dyeGreen, dyeBrown, dyeBlue, dyePurple, dyeCyan, dyeLightGray, dyeGray, dyePink, dyeLime, dyeYellow, dyeLightBlue, dyeMagenta, dyeOrange, dyeWhite};
 
     public final byte mIndex;
     public final String mName;
     public final short[] mRGBa;
     private final ArrayList<Fluid> mFluidDyes = new GT_ArrayList<Fluid>(false, 1);
 
-    private Dyes(int aIndex, int aR, int aG, int aB, String aName) {
+    Dyes(int aIndex, int aR, int aG, int aB, String aName) {
         mIndex = (byte) aIndex;
         mName = aName;
         mRGBa = new short[]{(short) aR, (short) aG, (short) aB, 0};
diff --git a/src/main/java/gregtech/api/enums/Element.java b/src/main/java/gregtech/api/enums/Element.java
index 144a61e7be..cfbbeaa528 100644
--- a/src/main/java/gregtech/api/enums/Element.java
+++ b/src/main/java/gregtech/api/enums/Element.java
@@ -283,7 +283,7 @@ public enum Element {
     /**
      * Links to every pure Material containing just this Element.
      */
-    public ArrayList<Materials> mLinkedMaterials = new ArrayList<Materials>();
+    public ArrayList<Materials> mLinkedMaterials = new ArrayList<>();
 
     /**
      * @param aProtons         Amount of Protons. Antiprotons if negative.
@@ -292,7 +292,7 @@ public enum Element {
      * @param aDecayTo         String representing the Elements it decays to. Separated by an '&' Character.
      * @param aName            Name of the Element
      */
-    private Element(long aProtons, long aNeutrons, long aAdditionalMass, long aHalfLifeSeconds, String aDecayTo, String aName, boolean aIsIsotope) {
+    Element(long aProtons, long aNeutrons, long aAdditionalMass, long aHalfLifeSeconds, String aDecayTo, String aName, boolean aIsIsotope) {
         mProtons = aProtons;
         mNeutrons = aNeutrons;
         mAdditionalMass = aAdditionalMass;
@@ -304,7 +304,8 @@ public enum Element {
 
     public static Element get(String aMaterialName) {
         Object tObject = GT_Utility.getFieldContent(Element.class, aMaterialName, false, false);
-        if (tObject != null && tObject instanceof Element) return (Element) tObject;
+        if (tObject instanceof Element)
+            return (Element) tObject;
         return _NULL;
     }
 
diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java
index 80209db614..a0576e6a15 100644
--- a/src/main/java/gregtech/api/enums/GT_Values.java
+++ b/src/main/java/gregtech/api/enums/GT_Values.java
@@ -17,6 +17,7 @@ import java.util.Locale;
  * <p/>
  * Go to "Window > Preferences > Java > Editor > Content Assist > Favorites" to set static importable Constant Classes such as this one as AutoCompleteable.
  */
+@SuppressWarnings("ALL")
 public class GT_Values {
     // unused: A, C, D, G, H, I, J, K, N, O, Q, R, S, T
 
@@ -32,7 +33,18 @@ public class GT_Values {
     /**
      * The first 32 Bits
      */
-    public static final int[] B = new int[]{1 << 0, 1 << 1, 1 << 2, 1 << 3, 1 << 4, 1 << 5, 1 << 6, 1 << 7, 1 << 8, 1 << 9, 1 << 10, 1 << 11, 1 << 12, 1 << 13, 1 << 14, 1 << 15, 1 << 16, 1 << 17, 1 << 18, 1 << 19, 1 << 20, 1 << 21, 1 << 22, 1 << 23, 1 << 24, 1 << 25, 1 << 26, 1 << 27, 1 << 28, 1 << 29, 1 << 30, 1 << 31};
+    public static final int[] B = new int[]{
+            1 << 0, 1 << 1, 1 << 2,
+            1 << 3, 1 << 4, 1 << 5,
+            1 << 6, 1 << 7, 1 << 8,
+            1 << 9, 1 << 10, 1 << 11,
+            1 << 12, 1 << 13, 1 << 14,
+            1 << 15, 1 << 16, 1 << 17,
+            1 << 18, 1 << 19, 1 << 20,
+            1 << 21, 1 << 22, 1 << 23,
+            1 << 24, 1 << 25, 1 << 26,
+            1 << 27, 1 << 28, 1 << 29,
+            1 << 30, 1 << 31};
 
     /**
      * Renamed from "MATERIAL_UNIT" to just "M"
@@ -63,7 +75,14 @@ public class GT_Values {
     /**
      * The Voltage Tiers. Use this Array instead of the old named Voltage Variables
      */
-    public static final long[] V = new long[]{8L, 32L, 128L, 512L, 2048L, 8192L, 32768L, 131072L, 524288L, 2097152L, 8388608L, 33554432L, 134217728L, 536870912L, 1073741824L, Integer.MAX_VALUE-7};
+    public static final long[] V =
+            new long[]{
+                    8L, 32L, 128L,
+                    512L, 2048L, 8192L,
+                    32768L, 131072L, 524288L,
+                    2097152L, 8388608L, 33554432L,
+                    134217728L, 536870912L, 1073741824L,
+                    Integer.MAX_VALUE - 7};
     //TODO:Adding that in coremod!!!
     //TODO:tier 14,15 wires and transformers only (not even cables !!!)
     //TODO:tier 12,13 the above + batteries, battery buffers, (maybe cables,12 also works for machines)
@@ -77,16 +96,36 @@ public class GT_Values {
      * keeping Voltage*Amps < Integer.MAX_VALUE-7 for machines (and tier logic 4x EUt 2/ time)
      * AMV[4]= max amps at tier 4
      */
-    public static final long[] AatV = new long[]{268435455,67108863,16777215,4194303,1048575,262143,65535,16383,4095,1023,255,63,15,3,1,1};
+    public static final long[] AatV =
+            new long[]{
+                    268435455, 67108863, 16777215,
+                    4194303, 1048575, 262143,
+                    65535, 16383, 4095,
+                    1023, 255, 63,
+                    15, 3, 1,
+                    1};
     /**
      * The short Names for the Voltages
      */
-    public static final String[] VN = new String[]{"ULV", "LV", "MV", "HV", "EV", "IV", "LuV", "ZPM", "UV", "UHV", "UEV", "UIV", "UMV", "UXV", "OpV", "MAX"};
+    public static final String[] VN =
+            new String[]{"ULV", "LV", "MV",
+                    "HV", "EV", "IV",
+                    "LuV", "ZPM", "UV",
+                    "UHV", "UEV", "UIV",
+                    "UMV", "UXV", "OpV",
+                    "MAX"};
 
     /**
      * The long Names for the Voltages
      */
-    public static final String[] VOLTAGE_NAMES = new String[]{"Ultra Low Voltage", "Low Voltage", "Medium Voltage", "High Voltage", "Extreme Voltage", "Insane Voltage", "Ludicrous Voltage", "ZPM Voltage", "Ultimate Voltage", "Ultimate High Voltage", "Ultimate Extreme Voltage", "Ultimate Insane Voltage", "Ultimate Mega Voltage", "Ultimate Extended Mega Voltage", "Overpowered Voltage", "Maximum Voltage"};
+    public static final String[] VOLTAGE_NAMES =
+            new String[]{
+                    "Ultra Low Voltage", "Low Voltage", "Medium Voltage",
+                    "High Voltage", "Extreme Voltage", "Insane Voltage",
+                    "Ludicrous Voltage", "ZPM Voltage", "Ultimate Voltage",
+                    "Ultimate High Voltage", "Ultimate Extreme Voltage", "Ultimate Insane Voltage",
+                    "Ultimate Mega Voltage", "Ultimate Extended Mega Voltage", "Overpowered Voltage",
+                    "Maximum Voltage"};
     /**
      * This way it is possible to have a Call Hierarchy of NullPointers in ItemStack based Functions, and also because most of the time I don't know what kind of Data Type the "null" stands for
      */
@@ -99,12 +138,50 @@ public class GT_Values {
      * MOD ID Strings, since they are very common Parameters.
      */
     public static final String
-            MOD_ID = "gregtech", MOD_ID_IC2 = "IC2", MOD_ID_NC = "IC2NuclearControl", MOD_ID_TC = "Thaumcraft", MOD_ID_TF = "TwilightForest", MOD_ID_RC = "Railcraft", MOD_ID_TE = "ThermalExpansion", MOD_ID_AE = "appliedenergistics2", MOD_ID_TFC = "terrafirmacraft", MOD_ID_PFAA = "PFAAGeologica", MOD_ID_FR = "Forestry", MOD_ID_HaC = "harvestcraft", MOD_ID_APC = "AppleCore", MOD_ID_MaCr = "magicalcrops", MOD_ID_GaEn = "ganysend", MOD_ID_GaSu = "ganyssurface", MOD_ID_GaNe = "ganysnether", MOD_ID_BC_SILICON = "BuildCraft|Silicon", MOD_ID_BC_TRANSPORT = "BuildCraft|Transport", MOD_ID_BC_FACTORY = "BuildCraft|Factory", MOD_ID_BC_ENERGY = "BuildCraft|Energy", MOD_ID_BC_BUILDERS = "BuildCraft|Builders", MOD_ID_BC_CORE = "BuildCraft|Core", MOD_ID_GC_CORE = "GalacticraftCore", MOD_ID_GC_MARS = "GalacticraftMars", MOD_ID_GC_PLANETS = "GalacticraftPlanets";
+            MOD_ID = "gregtech",
+            MOD_ID_IC2 = "IC2",
+            MOD_ID_NC = "IC2NuclearControl",
+            MOD_ID_TC = "Thaumcraft",
+            MOD_ID_TF = "TwilightForest",
+            MOD_ID_RC = "Railcraft",
+            MOD_ID_TE = "ThermalExpansion",
+            MOD_ID_AE = "appliedenergistics2",
+            MOD_ID_TFC = "terrafirmacraft",
+            MOD_ID_PFAA = "PFAAGeologica",
+            MOD_ID_FR = "Forestry",
+            MOD_ID_HaC = "harvestcraft",
+            MOD_ID_APC = "AppleCore",
+            MOD_ID_MaCr = "magicalcrops",
+            MOD_ID_GaEn = "ganysend",
+            MOD_ID_GaSu = "ganyssurface",
+            MOD_ID_GaNe = "ganysnether",
+            MOD_ID_BC_SILICON = "BuildCraft|Silicon",
+            MOD_ID_BC_TRANSPORT = "BuildCraft|Transport",
+            MOD_ID_BC_FACTORY = "BuildCraft|Factory",
+            MOD_ID_BC_ENERGY = "BuildCraft|Energy",
+            MOD_ID_BC_BUILDERS = "BuildCraft|Builders",
+            MOD_ID_BC_CORE = "BuildCraft|Core",
+            MOD_ID_GC_CORE = "GalacticraftCore",
+            MOD_ID_GC_MARS = "GalacticraftMars",
+            MOD_ID_GC_PLANETS = "GalacticraftPlanets";
     /**
      * File Paths and Resource Paths
      */
     public static final String
-            TEX_DIR = "textures/", TEX_DIR_GUI = TEX_DIR + "gui/", TEX_DIR_ITEM = TEX_DIR + "items/", TEX_DIR_BLOCK = TEX_DIR + "blocks/", TEX_DIR_ENTITY = TEX_DIR + "entity/", TEX_DIR_ASPECTS = TEX_DIR + "aspects/", RES_PATH = MOD_ID + ":" + TEX_DIR, RES_PATH_GUI = MOD_ID + ":" + TEX_DIR_GUI, RES_PATH_ITEM = MOD_ID + ":", RES_PATH_BLOCK = MOD_ID + ":", RES_PATH_ENTITY = MOD_ID + ":" + TEX_DIR_ENTITY, RES_PATH_ASPECTS = MOD_ID + ":" + TEX_DIR_ASPECTS, RES_PATH_IC2 = MOD_ID_IC2.toLowerCase(Locale.ENGLISH) + ":", RES_PATH_MODEL = MOD_ID + ":" + TEX_DIR + "models/";
+            TEX_DIR = "textures/",
+            TEX_DIR_GUI = TEX_DIR + "gui/",
+            TEX_DIR_ITEM = TEX_DIR + "items/",
+            TEX_DIR_BLOCK = TEX_DIR + "blocks/",
+            TEX_DIR_ENTITY = TEX_DIR + "entity/",
+            TEX_DIR_ASPECTS = TEX_DIR + "aspects/",
+            RES_PATH = MOD_ID + ":" + TEX_DIR,
+            RES_PATH_GUI = MOD_ID + ":" + TEX_DIR_GUI,
+            RES_PATH_ITEM = MOD_ID + ":",
+            RES_PATH_BLOCK = MOD_ID + ":",
+            RES_PATH_ENTITY = MOD_ID + ":" + TEX_DIR_ENTITY,
+            RES_PATH_ASPECTS = MOD_ID + ":" + TEX_DIR_ASPECTS,
+            RES_PATH_IC2 = MOD_ID_IC2.toLowerCase(Locale.ENGLISH) + ":",
+            RES_PATH_MODEL = MOD_ID + ":" + TEX_DIR + "models/";
     /**
      * The Mod Object itself. That is the GT_Mod-Object. It's needed to open GUI's and similar.
      */
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index 95f323cef3..bfd455034b 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -370,16 +370,107 @@ public enum ItemList implements IItemContainer {
     Circuit_Ultimate,
     Circuit_Biowarecomputer,
     Circuit_Biowaresupercomputer,
-    Rotor_LV, Rotor_MV, Rotor_HV, Rotor_EV, Rotor_IV, Rotor_LuV, Rotor_ZPM, Rotor_UV,
-    Electric_Motor_LV, Electric_Motor_MV, Electric_Motor_HV, Electric_Motor_EV, Electric_Motor_IV, Electric_Motor_LuV, Electric_Motor_ZPM, Electric_Motor_UV, Electric_Motor_UHV, Electric_Motor_UEV,
-    Electric_Pump_LV, Electric_Pump_MV, Electric_Pump_HV, Electric_Pump_EV, Electric_Pump_IV, Electric_Pump_LuV, Electric_Pump_ZPM, Electric_Pump_UV, Electric_Pump_UHV,  Electric_Pump_UEV,
-    Conveyor_Module_LV, Conveyor_Module_MV, Conveyor_Module_HV, Conveyor_Module_EV, Conveyor_Module_IV, Conveyor_Module_LuV, Conveyor_Module_ZPM, Conveyor_Module_UV, Conveyor_Module_UHV, Conveyor_Module_UEV,
-    Electric_Piston_LV, Electric_Piston_MV, Electric_Piston_HV, Electric_Piston_EV, Electric_Piston_IV, Electric_Piston_LuV, Electric_Piston_ZPM, Electric_Piston_UV,  Electric_Piston_UHV, Electric_Piston_UEV,
-    Field_Generator_LV, Field_Generator_MV, Field_Generator_HV, Field_Generator_EV, Field_Generator_IV, Field_Generator_LuV, Field_Generator_ZPM, Field_Generator_UV, Field_Generator_UHV, Field_Generator_UEV,
-    Robot_Arm_LV, Robot_Arm_MV, Robot_Arm_HV, Robot_Arm_EV, Robot_Arm_IV, Robot_Arm_LuV, Robot_Arm_ZPM, Robot_Arm_UV, Robot_Arm_UHV, Robot_Arm_UEV,
-    Emitter_LV, Emitter_MV, Emitter_HV, Emitter_EV, Emitter_IV, Emitter_LuV, Emitter_ZPM, Emitter_UV, Emitter_UHV, Emitter_UEV,
-    Sensor_LV, Sensor_MV, Sensor_HV, Sensor_EV, Sensor_IV, Sensor_LuV, Sensor_ZPM, Sensor_UV, Sensor_UHV, Sensor_UEV,
-    Battery_Hull_LV, Battery_Hull_MV, Battery_Hull_HV,
+    Rotor_LV,
+    Rotor_MV,
+    Rotor_HV,
+    Rotor_EV,
+    Rotor_IV,
+    Rotor_LuV,
+    Rotor_ZPM,
+    Rotor_UV,
+
+    Electric_Motor_LV,
+    Electric_Motor_MV,
+    Electric_Motor_HV,
+    Electric_Motor_EV,
+    Electric_Motor_IV,
+    Electric_Motor_LuV,
+    Electric_Motor_ZPM,
+    Electric_Motor_UV,
+    Electric_Motor_UHV,
+    Electric_Motor_UEV,
+
+    Electric_Pump_LV,
+    Electric_Pump_MV,
+    Electric_Pump_HV,
+    Electric_Pump_EV,
+    Electric_Pump_IV,
+    Electric_Pump_LuV,
+    Electric_Pump_ZPM,
+    Electric_Pump_UV,
+    Electric_Pump_UHV,
+    Electric_Pump_UEV,
+
+    Conveyor_Module_LV,
+    Conveyor_Module_MV,
+    Conveyor_Module_HV,
+    Conveyor_Module_EV,
+    Conveyor_Module_IV,
+    Conveyor_Module_LuV,
+    Conveyor_Module_ZPM,
+    Conveyor_Module_UV,
+    Conveyor_Module_UHV,
+    Conveyor_Module_UEV,
+
+    Electric_Piston_LV,
+    Electric_Piston_MV,
+    Electric_Piston_HV,
+    Electric_Piston_EV,
+    Electric_Piston_IV,
+    Electric_Piston_LuV,
+    Electric_Piston_ZPM,
+    Electric_Piston_UV,
+    Electric_Piston_UHV,
+    Electric_Piston_UEV,
+
+    Field_Generator_LV,
+    Field_Generator_MV,
+    Field_Generator_HV,
+    Field_Generator_EV,
+    Field_Generator_IV,
+    Field_Generator_LuV,
+    Field_Generator_ZPM,
+    Field_Generator_UV,
+    Field_Generator_UHV,
+    Field_Generator_UEV,
+
+    Robot_Arm_LV,
+    Robot_Arm_MV,
+    Robot_Arm_HV,
+    Robot_Arm_EV,
+    Robot_Arm_IV,
+    Robot_Arm_LuV,
+    Robot_Arm_ZPM,
+    Robot_Arm_UV,
+    Robot_Arm_UHV,
+    Robot_Arm_UEV,
+
+    Emitter_LV,
+    Emitter_MV,
+    Emitter_HV,
+    Emitter_EV,
+    Emitter_IV,
+    Emitter_LuV,
+    Emitter_ZPM,
+    Emitter_UV,
+    Emitter_UHV,
+    Emitter_UEV,
+
+    Sensor_LV,
+    Sensor_MV,
+    Sensor_HV,
+    Sensor_EV,
+    Sensor_IV,
+    Sensor_LuV,
+    Sensor_ZPM,
+    Sensor_UV,
+    Sensor_UHV,
+    Sensor_UEV,
+
+    Battery_Hull_LV,
+    Battery_Hull_MV,
+    Battery_Hull_HV,
+
     Battery_SU_LV_SulfuricAcid,
     Battery_SU_LV_Mercury,
     Battery_SU_MV_SulfuricAcid,
@@ -500,10 +591,64 @@ public enum ItemList implements IItemContainer {
     Tool_Axe_Steel,
     Tool_Hoe_Steel,
 
-    Spray_Empty, Spray_Bug, Spray_Ice, Spray_Hardener, Spray_CFoam, Spray_Pepper, Spray_Hydration,
-    Color_00, Color_01, Color_02, Color_03, Color_04, Color_05, Color_06, Color_07, Color_08, Color_09, Color_10, Color_11, Color_12, Color_13, Color_14, Color_15,
-    Spray_Color_00, Spray_Color_01, Spray_Color_02, Spray_Color_03, Spray_Color_04, Spray_Color_05, Spray_Color_06, Spray_Color_07, Spray_Color_08, Spray_Color_09, Spray_Color_10, Spray_Color_11, Spray_Color_12, Spray_Color_13, Spray_Color_14, Spray_Color_15,
-    Spray_Color_Used_00, Spray_Color_Used_01, Spray_Color_Used_02, Spray_Color_Used_03, Spray_Color_Used_04, Spray_Color_Used_05, Spray_Color_Used_06, Spray_Color_Used_07, Spray_Color_Used_08, Spray_Color_Used_09, Spray_Color_Used_10, Spray_Color_Used_11, Spray_Color_Used_12, Spray_Color_Used_13, Spray_Color_Used_14, Spray_Color_Used_15,
+    Spray_Empty,
+    Spray_Bug,
+    Spray_Ice,
+    Spray_Hardener,
+    Spray_CFoam,
+    Spray_Pepper,
+    Spray_Hydration,
+
+    Color_00,
+    Color_01,
+    Color_02,
+    Color_03,
+    Color_04,
+    Color_05,
+    Color_06,
+    Color_07,
+    Color_08,
+    Color_09,
+    Color_10,
+    Color_11,
+    Color_12,
+    Color_13,
+    Color_14,
+    Color_15,
+
+    Spray_Color_00,
+    Spray_Color_01,
+    Spray_Color_02,
+    Spray_Color_03,
+    Spray_Color_04,
+    Spray_Color_05,
+    Spray_Color_06,
+    Spray_Color_07,
+    Spray_Color_08,
+    Spray_Color_09,
+    Spray_Color_10,
+    Spray_Color_11,
+    Spray_Color_12,
+    Spray_Color_13,
+    Spray_Color_14,
+    Spray_Color_15,
+
+    Spray_Color_Used_00,
+    Spray_Color_Used_01,
+    Spray_Color_Used_02,
+    Spray_Color_Used_03,
+    Spray_Color_Used_04,
+    Spray_Color_Used_05,
+    Spray_Color_Used_06,
+    Spray_Color_Used_07,
+    Spray_Color_Used_08,
+    Spray_Color_Used_09,
+    Spray_Color_Used_10,
+    Spray_Color_Used_11,
+    Spray_Color_Used_12,
+    Spray_Color_Used_13,
+    Spray_Color_Used_14,
+    Spray_Color_Used_15,
 
     Armor_Cheat,
     Armor_Cloaking,
@@ -562,149 +707,1208 @@ public enum ItemList implements IItemContainer {
     Machine_HP_Compressor,
     Machine_HP_AlloySmelter,
 
-    Hull_Bronze, Hull_HP, Hull_Bronze_Bricks, Hull_HP_Bricks,
-
-    Transformer_LV_ULV, Transformer_MV_LV, Transformer_HV_MV, Transformer_EV_HV, Transformer_IV_EV, Transformer_LuV_IV, Transformer_ZPM_LuV, Transformer_UV_ZPM, Transformer_MAX_UV,
-
-    Casing_ULV, Casing_LV, Casing_MV, Casing_HV, Casing_EV, Casing_IV, Casing_LuV, Casing_ZPM, Casing_UV, Casing_MAX, Casing_BronzePlatedBricks, Casing_HeatProof, Casing_Coil_Cupronickel_Deprecated, Casing_Coil_Kanthal_Deprecated, Casing_Coil_Nichrome_Deprecated, Casing_Coil_Superconductor,
-    Casing_SolidSteel, Casing_FrostProof, Casing_Gearbox_Bronze, Casing_Gearbox_Steel, Casing_Gearbox_Titanium, Casing_Gearbox_TungstenSteel, Casing_Processor, Casing_DataDrive, Casing_ContainmentField, Casing_Assembler, Casing_Pump, Casing_Motor, Casing_Pipe_Bronze, Casing_Pipe_Steel, Casing_Pipe_Titanium, Casing_Pipe_TungstenSteel, Casing_Pipe_Polytetrafluoroethylene,
-    Casing_Stripes_A, Casing_Stripes_B, Casing_RadioactiveHazard, Casing_BioHazard, Casing_ExplosionHazard, Casing_FireHazard, Casing_AcidHazard, Casing_MagicHazard, Casing_FrostHazard, Casing_NoiseHazard, Casing_Grate, Casing_Vent, Casing_RadiationProof, Casing_Firebox_Bronze, Casing_Firebox_Steel, Casing_Firebox_TungstenSteel, Casing_Chemically_Inert,
-    Casing_MiningOsmiridium, Casing_RobustTungstenSteel, Casing_CleanStainlessSteel, Casing_StableTitanium, Casing_Firebox_Titanium,
-    Hull_ULV, Hull_LV, Hull_MV, Hull_HV, Hull_EV, Hull_IV, Hull_LuV, Hull_ZPM, Hull_UV, Hull_MAX,
-    CompressedFireclay, Firebrick, Casing_Firebricks,
-
-    Automation_Filter_ULV, Automation_Filter_LV, Automation_Filter_MV, Automation_Filter_HV, Automation_Filter_EV, Automation_Filter_IV, Automation_Filter_LuV, Automation_Filter_ZPM, Automation_Filter_UV, Automation_Filter_MAX,
-    Automation_TypeFilter_ULV, Automation_TypeFilter_LV, Automation_TypeFilter_MV, Automation_TypeFilter_HV, Automation_TypeFilter_EV, Automation_TypeFilter_IV, Automation_TypeFilter_LuV, Automation_TypeFilter_ZPM, Automation_TypeFilter_UV, Automation_TypeFilter_MAX,
-    Automation_ChestBuffer_ULV, Automation_ChestBuffer_LV, Automation_ChestBuffer_MV, Automation_ChestBuffer_HV, Automation_ChestBuffer_EV, Automation_ChestBuffer_IV, Automation_ChestBuffer_LuV, Automation_ChestBuffer_ZPM, Automation_ChestBuffer_UV, Automation_ChestBuffer_MAX,
-    Automation_SuperBuffer_ULV, Automation_SuperBuffer_LV, Automation_SuperBuffer_MV, Automation_SuperBuffer_HV, Automation_SuperBuffer_EV, Automation_SuperBuffer_IV, Automation_SuperBuffer_LuV, Automation_SuperBuffer_ZPM, Automation_SuperBuffer_UV, Automation_SuperBuffer_MAX,
-    Automation_Regulator_ULV, Automation_Regulator_LV, Automation_Regulator_MV, Automation_Regulator_HV, Automation_Regulator_EV, Automation_Regulator_IV, Automation_Regulator_LuV, Automation_Regulator_ZPM, Automation_Regulator_UV, Automation_Regulator_MAX,
-    Automation_ItemDistributor_ULV, Automation_ItemDistributor_LV, Automation_ItemDistributor_MV, Automation_ItemDistributor_HV, Automation_ItemDistributor_EV, Automation_ItemDistributor_IV, Automation_ItemDistributor_LuV, Automation_ItemDistributor_ZPM, Automation_ItemDistributor_UV, Automation_ItemDistributor_MAX,
-
-    Hatch_Dynamo_ULV, Hatch_Dynamo_LV, Hatch_Dynamo_MV, Hatch_Dynamo_HV, Hatch_Dynamo_EV, Hatch_Dynamo_IV, Hatch_Dynamo_LuV, Hatch_Dynamo_ZPM, Hatch_Dynamo_UV, Hatch_Dynamo_MAX,
-    Hatch_Energy_ULV, Hatch_Energy_LV, Hatch_Energy_MV, Hatch_Energy_HV, Hatch_Energy_EV, Hatch_Energy_IV, Hatch_Energy_LuV, Hatch_Energy_ZPM, Hatch_Energy_UV, Hatch_Energy_MAX,
-    Hatch_Input_ULV, Hatch_Input_LV, Hatch_Input_MV, Hatch_Input_HV, Hatch_Input_EV, Hatch_Input_IV, Hatch_Input_LuV, Hatch_Input_ZPM, Hatch_Input_UV, Hatch_Input_MAX,
-    Hatch_Input_Bus_ULV, Hatch_Input_Bus_LV, Hatch_Input_Bus_MV, Hatch_Input_Bus_HV, Hatch_Input_Bus_EV, Hatch_Input_Bus_IV, Hatch_Input_Bus_LuV, Hatch_Input_Bus_ZPM, Hatch_Input_Bus_UV, Hatch_Input_Bus_MAX,
-    Hatch_Output_ULV, Hatch_Output_LV, Hatch_Output_MV, Hatch_Output_HV, Hatch_Output_EV, Hatch_Output_IV, Hatch_Output_LuV, Hatch_Output_ZPM, Hatch_Output_UV, Hatch_Output_MAX,
-    Hatch_Output_Bus_ULV, Hatch_Output_Bus_LV, Hatch_Output_Bus_MV, Hatch_Output_Bus_HV, Hatch_Output_Bus_EV, Hatch_Output_Bus_IV, Hatch_Output_Bus_LuV, Hatch_Output_Bus_ZPM, Hatch_Output_Bus_UV, Hatch_Output_Bus_MAX,
-    Hatch_Muffler_LV, Hatch_Muffler_MV, Hatch_Muffler_HV, Hatch_Muffler_EV, Hatch_Muffler_IV, Hatch_Muffler_LuV, Hatch_Muffler_ZPM, Hatch_Muffler_UV, Hatch_Muffler_MAX,
-    Hatch_Maintenance,  Hatch_DataAccess_EV, Hatch_DataAccess_LuV, Hatch_DataAccess_UV,
-
-    Battery_Buffer_1by1_ULV, Battery_Buffer_1by1_LV, Battery_Buffer_1by1_MV, Battery_Buffer_1by1_HV, Battery_Buffer_1by1_EV, Battery_Buffer_1by1_IV, Battery_Buffer_1by1_LuV, Battery_Buffer_1by1_ZPM, Battery_Buffer_1by1_UV, Battery_Buffer_1by1_MAX,
-    Battery_Buffer_2by2_ULV, Battery_Buffer_2by2_LV, Battery_Buffer_2by2_MV, Battery_Buffer_2by2_HV, Battery_Buffer_2by2_EV, Battery_Buffer_2by2_IV, Battery_Buffer_2by2_LuV, Battery_Buffer_2by2_ZPM, Battery_Buffer_2by2_UV, Battery_Buffer_2by2_MAX,
-    Battery_Buffer_3by3_ULV, Battery_Buffer_3by3_LV, Battery_Buffer_3by3_MV, Battery_Buffer_3by3_HV, Battery_Buffer_3by3_EV, Battery_Buffer_3by3_IV, Battery_Buffer_3by3_LuV, Battery_Buffer_3by3_ZPM, Battery_Buffer_3by3_UV, Battery_Buffer_3by3_MAX,
-    Battery_Buffer_4by4_ULV, Battery_Buffer_4by4_LV, Battery_Buffer_4by4_MV, Battery_Buffer_4by4_HV, Battery_Buffer_4by4_EV, Battery_Buffer_4by4_IV, Battery_Buffer_4by4_LuV, Battery_Buffer_4by4_ZPM, Battery_Buffer_4by4_UV, Battery_Buffer_4by4_MAX,
-
-    Locker_ULV, Locker_LV, Locker_MV, Locker_HV, Locker_EV, Locker_IV, Locker_LuV, Locker_ZPM, Locker_UV, Locker_MAX,
-
-    Machine_Multi_LargeBoiler_Bronze, Machine_Multi_LargeBoiler_Steel, Machine_Multi_LargeBoiler_Titanium, Machine_Multi_LargeBoiler_TungstenSteel, Machine_Multi_BlastFurnace, Machine_Multi_ImplosionCompressor, Machine_Multi_VacuumFreezer, Machine_Multi_Furnace,
-    Machine_LV_AlloySmelter, Machine_MV_AlloySmelter, Machine_HV_AlloySmelter, Machine_EV_AlloySmelter, Machine_IV_AlloySmelter,
-    Machine_LV_Assembler, Machine_MV_Assembler, Machine_HV_Assembler, Machine_EV_Assembler, Machine_IV_Assembler,
-    Machine_LV_Bender, Machine_MV_Bender, Machine_HV_Bender, Machine_EV_Bender, Machine_IV_Bender,
-    Machine_LV_Canner, Machine_MV_Canner, Machine_HV_Canner, Machine_EV_Canner, Machine_IV_Canner,
-    Machine_LV_Compressor, Machine_MV_Compressor, Machine_HV_Compressor, Machine_EV_Compressor, Machine_IV_Compressor,
-    Machine_LV_Cutter, Machine_MV_Cutter, Machine_HV_Cutter, Machine_EV_Cutter, Machine_IV_Cutter,
-    Machine_LV_Slicer, Machine_MV_Slicer, Machine_HV_Slicer, Machine_EV_Slicer, Machine_IV_Slicer,
-    Machine_LV_Sifter, Machine_MV_Sifter, Machine_HV_Sifter, Machine_EV_Sifter, Machine_IV_Sifter,
-    Machine_LV_ArcFurnace, Machine_MV_ArcFurnace, Machine_HV_ArcFurnace, Machine_EV_ArcFurnace, Machine_IV_ArcFurnace,
-    Machine_LV_PlasmaArcFurnace, Machine_MV_PlasmaArcFurnace, Machine_HV_PlasmaArcFurnace, Machine_EV_PlasmaArcFurnace, Machine_IV_PlasmaArcFurnace,
-    Machine_LV_Oven, Machine_MV_Oven, Machine_HV_Oven, Machine_EV_Oven, Machine_IV_Oven,
-    Machine_LV_E_Furnace, Machine_MV_E_Furnace, Machine_HV_E_Furnace, Machine_EV_E_Furnace, Machine_IV_E_Furnace,
-    Machine_LV_Extractor, Machine_MV_Extractor, Machine_HV_Extractor, Machine_EV_Extractor, Machine_IV_Extractor,
-    Machine_LV_Extruder, Machine_MV_Extruder, Machine_HV_Extruder, Machine_EV_Extruder, Machine_IV_Extruder,
-    Machine_LV_Lathe, Machine_MV_Lathe, Machine_HV_Lathe, Machine_EV_Lathe, Machine_IV_Lathe,
-    Machine_LV_Macerator, Machine_MV_Macerator, Machine_HV_Macerator, Machine_EV_Macerator, Machine_IV_Macerator,
-    Machine_LV_Microwave, Machine_MV_Microwave, Machine_HV_Microwave, Machine_EV_Microwave, Machine_IV_Microwave,
-    Machine_LV_Printer, Machine_MV_Printer, Machine_HV_Printer, Machine_EV_Printer, Machine_IV_Printer,
-    Machine_LV_Recycler, Machine_MV_Recycler, Machine_HV_Recycler, Machine_EV_Recycler, Machine_IV_Recycler,
-    Machine_LV_Scanner, Machine_MV_Scanner, Machine_HV_Scanner, Machine_EV_Scanner, Machine_IV_Scanner,
-    Machine_LV_Wiremill, Machine_MV_Wiremill, Machine_HV_Wiremill, Machine_EV_Wiremill, Machine_IV_Wiremill,
-    Machine_LV_Electrolyzer, Machine_MV_Electrolyzer, Machine_HV_Electrolyzer, Machine_EV_Electrolyzer, Machine_IV_Electrolyzer,
-    Machine_LV_Centrifuge, Machine_MV_Centrifuge, Machine_HV_Centrifuge, Machine_EV_Centrifuge, Machine_IV_Centrifuge,
-    Machine_LV_ThermalCentrifuge, Machine_MV_ThermalCentrifuge, Machine_HV_ThermalCentrifuge, Machine_EV_ThermalCentrifuge, Machine_IV_ThermalCentrifuge,
-    Machine_LV_OreWasher, Machine_MV_OreWasher, Machine_HV_OreWasher, Machine_EV_OreWasher, Machine_IV_OreWasher,
-    Machine_LV_RockBreaker, Machine_MV_RockBreaker, Machine_HV_RockBreaker, Machine_EV_RockBreaker, Machine_IV_RockBreaker,
-    Machine_LV_Boxinator, Machine_MV_Boxinator, Machine_HV_Boxinator, Machine_EV_Boxinator, Machine_IV_Boxinator,
-    Machine_LV_Unboxinator, Machine_MV_Unboxinator, Machine_HV_Unboxinator, Machine_EV_Unboxinator, Machine_IV_Unboxinator, Machine_LuV_Unboxinator, Machine_ZPM_Unboxinator, Machine_UV_Unboxinator,
-    Machine_LV_ChemicalReactor, Machine_MV_ChemicalReactor, Machine_HV_ChemicalReactor, Machine_EV_ChemicalReactor, Machine_IV_ChemicalReactor,
-    Machine_LV_FluidCanner, Machine_MV_FluidCanner, Machine_HV_FluidCanner, Machine_EV_FluidCanner, Machine_IV_FluidCanner,
-    Machine_LV_Disassembler, Machine_MV_Disassembler, Machine_HV_Disassembler, Machine_EV_Disassembler, Machine_IV_Disassembler,
-    Machine_LV_Bundler, Machine_MV_Bundler, Machine_HV_Bundler, Machine_EV_Bundler, Machine_IV_Bundler,
-    Machine_LV_Massfab, Machine_MV_Massfab, Machine_HV_Massfab, Machine_EV_Massfab, Machine_IV_Massfab, Machine_LuV_Massfab, Machine_ZPM_Massfab, Machine_UV_Massfab,
-    Machine_LV_Amplifab, Machine_MV_Amplifab, Machine_HV_Amplifab, Machine_EV_Amplifab, Machine_IV_Amplifab,
-    Machine_LV_Replicator, Machine_MV_Replicator, Machine_HV_Replicator, Machine_EV_Replicator, Machine_IV_Replicator,
-    Machine_LV_Brewery, Machine_MV_Brewery, Machine_HV_Brewery, Machine_EV_Brewery, Machine_IV_Brewery,
-    Machine_LV_Fermenter, Machine_MV_Fermenter, Machine_HV_Fermenter, Machine_EV_Fermenter, Machine_IV_Fermenter,
-    Machine_LV_FluidExtractor, Machine_MV_FluidExtractor, Machine_HV_FluidExtractor, Machine_EV_FluidExtractor, Machine_IV_FluidExtractor,
-    Machine_LV_FluidSolidifier, Machine_MV_FluidSolidifier, Machine_HV_FluidSolidifier, Machine_EV_FluidSolidifier, Machine_IV_FluidSolidifier,
-    Machine_LV_Distillery, Machine_MV_Distillery, Machine_HV_Distillery, Machine_EV_Distillery, Machine_IV_Distillery,
-    Machine_LV_ChemicalBath, Machine_MV_ChemicalBath, Machine_HV_ChemicalBath, Machine_EV_ChemicalBath, Machine_IV_ChemicalBath,
-    Machine_LV_Polarizer, Machine_MV_Polarizer, Machine_HV_Polarizer, Machine_EV_Polarizer, Machine_IV_Polarizer,
-    Machine_LV_ElectromagneticSeparator, Machine_MV_ElectromagneticSeparator, Machine_HV_ElectromagneticSeparator, Machine_EV_ElectromagneticSeparator, Machine_IV_ElectromagneticSeparator,
-    Machine_LV_Autoclave, Machine_MV_Autoclave, Machine_HV_Autoclave, Machine_EV_Autoclave, Machine_IV_Autoclave,
-    Machine_LV_Mixer, Machine_MV_Mixer, Machine_HV_Mixer, Machine_EV_Mixer, Machine_IV_Mixer,
-    Machine_LV_LaserEngraver, Machine_MV_LaserEngraver, Machine_HV_LaserEngraver, Machine_EV_LaserEngraver, Machine_IV_LaserEngraver,
-    Machine_LV_Press, Machine_MV_Press, Machine_HV_Press, Machine_EV_Press, Machine_IV_Press,
-    Machine_LV_Hammer, Machine_MV_Hammer, Machine_HV_Hammer, Machine_EV_Hammer, Machine_IV_Hammer,
-    Machine_LV_FluidHeater, Machine_MV_FluidHeater, Machine_HV_FluidHeater, Machine_EV_FluidHeater, Machine_IV_FluidHeater,
+    Hull_Bronze,
+    Hull_HP,
+    Hull_Bronze_Bricks,
+    Hull_HP_Bricks,
+
+    Transformer_LV_ULV,
+    Transformer_MV_LV,
+    Transformer_HV_MV,
+    Transformer_EV_HV,
+    Transformer_IV_EV,
+    Transformer_LuV_IV,
+    Transformer_ZPM_LuV,
+    Transformer_UV_ZPM,
+    Transformer_MAX_UV,
+
+    Casing_ULV,
+    Casing_LV,
+    Casing_MV,
+    Casing_HV,
+    Casing_EV,
+    Casing_IV,
+    Casing_LuV,
+    Casing_ZPM,
+    Casing_UV,
+    Casing_MAX,
+    Casing_BronzePlatedBricks,
+    Casing_HeatProof,
+    Casing_Coil_Cupronickel_Deprecated,
+    Casing_Coil_Kanthal_Deprecated,
+    Casing_Coil_Nichrome_Deprecated,
+    Casing_Coil_Superconductor,
+
+    Casing_SolidSteel,
+    Casing_FrostProof,
+    Casing_Gearbox_Bronze,
+    Casing_Gearbox_Steel,
+    Casing_Gearbox_Titanium,
+    Casing_Gearbox_TungstenSteel,
+    Casing_Processor,
+    Casing_DataDrive,
+    Casing_ContainmentField,
+    Casing_Assembler,
+    Casing_Pump,
+    Casing_Motor,
+    Casing_Pipe_Bronze,
+    Casing_Pipe_Steel,
+    Casing_Pipe_Titanium,
+    Casing_Pipe_TungstenSteel,
+    Casing_Pipe_Polytetrafluoroethylene,
+
+    Casing_Stripes_A,
+    Casing_Stripes_B,
+    Casing_RadioactiveHazard,
+    Casing_BioHazard,
+    Casing_ExplosionHazard,
+    Casing_FireHazard,
+    Casing_AcidHazard,
+    Casing_MagicHazard,
+    Casing_FrostHazard,
+    Casing_NoiseHazard,
+    Casing_Grate,
+    Casing_Vent,
+    Casing_RadiationProof,
+    Casing_Firebox_Bronze,
+    Casing_Firebox_Steel,
+    Casing_Firebox_TungstenSteel,
+    Casing_Chemically_Inert,
+
+    Casing_MiningOsmiridium,
+    Casing_RobustTungstenSteel,
+    Casing_CleanStainlessSteel,
+    Casing_StableTitanium,
+    Casing_Firebox_Titanium,
+
+    Hull_ULV,
+    Hull_LV,
+    Hull_MV,
+    Hull_HV,
+    Hull_EV,
+    Hull_IV,
+    Hull_LuV,
+    Hull_ZPM,
+    Hull_UV,
+    Hull_MAX,
+
+    CompressedFireclay,
+    Firebrick,
+    Casing_Firebricks,
+
+    Automation_Filter_ULV,
+    Automation_Filter_LV,
+    Automation_Filter_MV,
+    Automation_Filter_HV,
+    Automation_Filter_EV,
+    Automation_Filter_IV,
+    Automation_Filter_LuV,
+    Automation_Filter_ZPM,
+    Automation_Filter_UV,
+    Automation_Filter_MAX,
+
+    Automation_TypeFilter_ULV,
+    Automation_TypeFilter_LV,
+    Automation_TypeFilter_MV,
+    Automation_TypeFilter_HV,
+    Automation_TypeFilter_EV,
+    Automation_TypeFilter_IV,
+    Automation_TypeFilter_LuV,
+    Automation_TypeFilter_ZPM,
+    Automation_TypeFilter_UV,
+    Automation_TypeFilter_MAX,
+
+    Automation_ChestBuffer_ULV,
+    Automation_ChestBuffer_LV,
+    Automation_ChestBuffer_MV,
+    Automation_ChestBuffer_HV,
+    Automation_ChestBuffer_EV,
+    Automation_ChestBuffer_IV,
+    Automation_ChestBuffer_LuV,
+    Automation_ChestBuffer_ZPM,
+    Automation_ChestBuffer_UV,
+    Automation_ChestBuffer_MAX,
+
+    Automation_SuperBuffer_ULV,
+    Automation_SuperBuffer_LV,
+    Automation_SuperBuffer_MV,
+    Automation_SuperBuffer_HV,
+    Automation_SuperBuffer_EV,
+    Automation_SuperBuffer_IV,
+    Automation_SuperBuffer_LuV,
+    Automation_SuperBuffer_ZPM,
+    Automation_SuperBuffer_UV,
+    Automation_SuperBuffer_MAX,
+
+    Automation_Regulator_ULV,
+    Automation_Regulator_LV,
+    Automation_Regulator_MV,
+    Automation_Regulator_HV,
+    Automation_Regulator_EV,
+    Automation_Regulator_IV,
+    Automation_Regulator_LuV,
+    Automation_Regulator_ZPM,
+    Automation_Regulator_UV,
+    Automation_Regulator_MAX,
+
+    Automation_ItemDistributor_ULV,
+    Automation_ItemDistributor_LV,
+    Automation_ItemDistributor_MV,
+    Automation_ItemDistributor_HV,
+    Automation_ItemDistributor_EV,
+    Automation_ItemDistributor_IV,
+    Automation_ItemDistributor_LuV,
+    Automation_ItemDistributor_ZPM,
+    Automation_ItemDistributor_UV,
+    Automation_ItemDistributor_MAX,
+
+    Hatch_Dynamo_ULV,
+    Hatch_Dynamo_LV,
+    Hatch_Dynamo_MV,
+    Hatch_Dynamo_HV,
+    Hatch_Dynamo_EV,
+    Hatch_Dynamo_IV,
+    Hatch_Dynamo_LuV,
+    Hatch_Dynamo_ZPM,
+    Hatch_Dynamo_UV,
+    Hatch_Dynamo_MAX,
+
+    Hatch_Energy_ULV,
+    Hatch_Energy_LV,
+    Hatch_Energy_MV,
+    Hatch_Energy_HV,
+    Hatch_Energy_EV,
+    Hatch_Energy_IV,
+    Hatch_Energy_LuV,
+    Hatch_Energy_ZPM,
+    Hatch_Energy_UV,
+    Hatch_Energy_MAX,
+
+    Hatch_Input_ULV,
+    Hatch_Input_LV,
+    Hatch_Input_MV,
+    Hatch_Input_HV,
+    Hatch_Input_EV,
+    Hatch_Input_IV,
+    Hatch_Input_LuV,
+    Hatch_Input_ZPM,
+    Hatch_Input_UV,
+    Hatch_Input_MAX,
+
+    Hatch_Input_Bus_ULV,
+    Hatch_Input_Bus_LV,
+    Hatch_Input_Bus_MV,
+    Hatch_Input_Bus_HV,
+    Hatch_Input_Bus_EV,
+    Hatch_Input_Bus_IV,
+    Hatch_Input_Bus_LuV,
+    Hatch_Input_Bus_ZPM,
+    Hatch_Input_Bus_UV,
+    Hatch_Input_Bus_MAX,
+
+    Hatch_Output_ULV,
+    Hatch_Output_LV,
+    Hatch_Output_MV,
+    Hatch_Output_HV,
+    Hatch_Output_EV,
+    Hatch_Output_IV,
+    Hatch_Output_LuV,
+    Hatch_Output_ZPM,
+    Hatch_Output_UV,
+    Hatch_Output_MAX,
+
+    Hatch_Output_Bus_ULV,
+    Hatch_Output_Bus_LV,
+    Hatch_Output_Bus_MV,
+    Hatch_Output_Bus_HV,
+    Hatch_Output_Bus_EV,
+    Hatch_Output_Bus_IV,
+    Hatch_Output_Bus_LuV,
+    Hatch_Output_Bus_ZPM,
+    Hatch_Output_Bus_UV,
+    Hatch_Output_Bus_MAX,
+
+    Hatch_Muffler_LV,
+    Hatch_Muffler_MV,
+    Hatch_Muffler_HV,
+    Hatch_Muffler_EV,
+    Hatch_Muffler_IV,
+    Hatch_Muffler_LuV,
+    Hatch_Muffler_ZPM,
+    Hatch_Muffler_UV,
+    Hatch_Muffler_MAX,
+
+    Hatch_Maintenance,
+    Hatch_DataAccess_EV,
+    Hatch_DataAccess_LuV,
+    Hatch_