Merge pull request #20 from GTNewHorizons/dissolution-3

Increase output limit for Dissolution Tank NEI

3 files changed, 719 insertions, 873 deletions

diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java
index 73e6ec8607..f7c2569cbb 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java
@@ -1,14 +1,12 @@
 package com.elisis.gtnhlanth.common.register;
 
-import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
-import com.github.bartimaeusnek.bartworks.util.Pair;
-
-import static gregtech.api.enums.Materials.*;
-import static gregtech.api.enums.TextureSet.*;
-
 import static com.github.bartimaeusnek.bartworks.system.material.Werkstoff.Types.*;
 import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers;
+import static gregtech.api.enums.Materials.*;
+import static gregtech.api.enums.TextureSet.*;
 
+import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
+import com.github.bartimaeusnek.bartworks.util.Pair;
 
 /*
  *
@@ -18,20 +16,19 @@ import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers;
 @SuppressWarnings("unchecked")
 public class BotWerkstoffMaterialPool implements Runnable {
 
-	public static final Werkstoff TungsticAcid = new Werkstoff(
-            new short[]{0xf5, 0xf1, 0x16},
+    public static final Werkstoff TungsticAcid = new Werkstoff(
+            new short[] {0xf5, 0xf1, 0x16},
             "Tungstic Acid",
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().onlyDust().enforceUnification(),
             29900,
             SET_SHINY,
-            new Pair<>(Hydrogen,2),
-            new Pair<>(Tungsten,1),
-            new Pair<>(Oxygen,4)
-    );
+            new Pair<>(Hydrogen, 2),
+            new Pair<>(Tungsten, 1),
+            new Pair<>(Oxygen, 4));
     public static final Werkstoff TungstenTrioxide = new Werkstoff(
-            new short[]{0x0f,0x5,0x16},
+            new short[] {0x0f, 0x5, 0x16},
             "Tungsten Trioxide",
             new Werkstoff.Stats(),
             COMPOUND,
@@ -39,384 +36,347 @@ public class BotWerkstoffMaterialPool implements Runnable {
             29901,
             SET_SHINY,
             new Pair<>(Tungsten, 1),
-            new Pair<>(Oxygen,3)
-    );
-//    public static final Werkstoff TungstenSteelOxide = new Werkstoff(
-//            new short[]{0x1f,0x27,0x69},
-//            "Tungstensteel Oxide",
-//            new Werkstoff.Stats(),
-//            COMPOUND,
-//            new Werkstoff.GenerationFeatures().onlyDust(),
-//            29902,
-//            SET_FINE,
-//            new Pair<>(Tungsten, 1),
-//            new Pair<>(Oxygen,3),
-//            new Pair<>(Steel,1)
-//    );
+            new Pair<>(Oxygen, 3));
+    //    public static final Werkstoff TungstenSteelOxide = new Werkstoff(
+    //            new short[]{0x1f,0x27,0x69},
+    //            "Tungstensteel Oxide",
+    //            new Werkstoff.Stats(),
+    //            COMPOUND,
+    //            new Werkstoff.GenerationFeatures().onlyDust(),
+    //            29902,
+    //            SET_FINE,
+    //            new Pair<>(Tungsten, 1),
+    //            new Pair<>(Oxygen,3),
+    //            new Pair<>(Steel,1)
+    //    );
     public static final Werkstoff AmmoniumNitrate = new Werkstoff(
-            new short[]{0x81,0xcc,0x00},
+            new short[] {0x81, 0xcc, 0x00},
             "Ammonium Nitrate",
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().onlyDust(),
             29903,
             SET_FINE,
-            new Pair<>(Nitrogen,1),
-            new Pair<>(Hydrogen,4),
-            new Pair<>(Nitrogen,1),
-            new Pair<>(Oxygen,3)
-    );
+            new Pair<>(Nitrogen, 1),
+            new Pair<>(Hydrogen, 4),
+            new Pair<>(Nitrogen, 1),
+            new Pair<>(Oxygen, 3));
     public static final Werkstoff SodiumTungstate = new Werkstoff(
-            new short[]{0xc, 0xed, 0xd7,0},
+            new short[] {0xc, 0xed, 0xd7, 0},
             "Sodium Tungstate",
             subscriptNumbers("Na2WO4"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29904,
-            SET_FINE
-    );
+            SET_FINE);
     public static final Werkstoff Phosgene = new Werkstoff(
-            new short[]{0x15,0xa1,0x1a},
+            new short[] {0x15, 0xa1, 0x1a},
             "Phosgene",
             subscriptNumbers("COCl2"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29905,
-            SET_FINE
-    );
+            SET_FINE);
     public static final Werkstoff Ethylchloroformate = new Werkstoff(
-            new short[]{0x0a,0xc2,0xcc},
+            new short[] {0x0a, 0xc2, 0xcc},
             "Ethyl Chloroformate",
             subscriptNumbers("C3H5ClO2"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29906,
-            SET_FINE
-    );
+            SET_FINE);
     public static final Werkstoff Ethylcarbamate = new Werkstoff(
-            new short[]{0x0d,0xa9,0xb8},
+            new short[] {0x0d, 0xa9, 0xb8},
             "Ethyl Carbamate",
             subscriptNumbers("CH3CH2O2CNH2"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29907,
-            SET_FINE
-    );
+            SET_FINE);
     public static final Werkstoff EthylNnitrocarbamate = new Werkstoff(
-            new short[]{0x0d,0x85,0xb8},
+            new short[] {0x0d, 0x85, 0xb8},
             "Ethyl N-nitrocarbamate",
             subscriptNumbers("C3H6N2O4"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29908,
-            SET_FINE
-    );
+            SET_FINE);
     public static final Werkstoff AmmoniumNnitrourethane = new Werkstoff(
-            new short[]{0x0d,0x54,0xb8},
+            new short[] {0x0d, 0x54, 0xb8},
             "Ammonium N-nitrourethane",
             subscriptNumbers("C3H9N3O4"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29909,
-            SET_FINE
-    );
+            SET_FINE);
     public static final Werkstoff EthylDinitrocarbamate = new Werkstoff(
-            new short[]{0x39,0x08,0xc2},
+            new short[] {0x39, 0x08, 0xc2},
             "Ethyl Dinitrocarbamate",
             subscriptNumbers("C3H5N3O6"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29910,
-            SET_FINE
-    );
+            SET_FINE);
     public static final Werkstoff DinitrogenPentoxide = new Werkstoff(
-            new short[]{0xcf,0xeb,0x34},
+            new short[] {0xcf, 0xeb, 0x34},
             "Dinitrogen Pentoxide",
             subscriptNumbers("N2O5"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().onlyDust(),
             29911,
-            SET_FINE
-    );
+            SET_FINE);
     public static final Werkstoff AmmoniumDinitramide = new Werkstoff(
-            new short[]{0x8a,0x0f,0xd1},
+            new short[] {0x8a, 0x0f, 0xd1},
             "Ammonium Dinitramide",
             subscriptNumbers("H4N4O4"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29912,
-            SET_FINE
-    );
+            SET_FINE);
     public static final Werkstoff LMP103S = new Werkstoff(
-            new short[]{0xbf,0x2f,0xc2},
+            new short[] {0xbf, 0x2f, 0xc2},
             "LMP-103S",
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29913,
-            SET_FINE
-    );
+            SET_FINE);
     public static final Werkstoff OXylene = new Werkstoff(
-            new short[]{0x88,0x94,0xa8},
+            new short[] {0x88, 0x94, 0xa8},
             "O-Xylene",
             subscriptNumbers("C8H10"),
             new Werkstoff.Stats().setGas(true),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29915,
-            SET_FINE
-    );
+            SET_FINE);
     public static final Werkstoff PhthalicAnhydride = new Werkstoff(
-            new short[]{0x7c,0x99,0x42},
+            new short[] {0x7c, 0x99, 0x42},
             "Phthalic Anhydride",
             subscriptNumbers("C8H4O3"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().onlyDust(),
             29916,
-            SET_METALLIC
-    );
-    public static final Werkstoff  VanadiumPentoxide = new Werkstoff(
-            new short[]{0x69,0x69,0x69},
+            SET_METALLIC);
+    public static final Werkstoff VanadiumPentoxide = new Werkstoff(
+            new short[] {0x69, 0x69, 0x69},
             "Vanadium Pentoxide",
             subscriptNumbers("V2O5"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().onlyDust(),
             29917,
-            SET_METALLIC
-    );
-    public static final Werkstoff  TertButylbenzene = new Werkstoff(
-            new short[]{0,0,0},
+            SET_METALLIC);
+    public static final Werkstoff TertButylbenzene = new Werkstoff(
+            new short[] {0, 0, 0},
             "Tert-Butylbenzene",
             subscriptNumbers("C10H14"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29918,
-            SET_METALLIC
-    );
-    public static final Werkstoff  TwoTertButylAnthraquinone = new Werkstoff(
-            new short[]{0xcc,0x86,0x5a},
+            SET_METALLIC);
+    public static final Werkstoff TwoTertButylAnthraquinone = new Werkstoff(
+            new short[] {0xcc, 0x86, 0x5a},
             "2-tert-butyl-anthraquinone",
             subscriptNumbers("C18H16O2"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29919,
-            SET_METALLIC
-    );
-    public static final Werkstoff  TwoTertButylAnthrahydroquinone = new Werkstoff(
-            new short[]{0xad,0x53,0x1a},
+            SET_METALLIC);
+    public static final Werkstoff TwoTertButylAnthrahydroquinone = new Werkstoff(
+            new short[] {0xad, 0x53, 0x1a},
             "2-tert-butyl-anthrahydroquinone",
             subscriptNumbers("C18H17O2"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29920,
-            SET_METALLIC
-    );
-    public static final Werkstoff  HydrogenPeroxide = new Werkstoff(
-            new short[]{0xad,0x53,0x1a},
+            SET_METALLIC);
+    public static final Werkstoff HydrogenPeroxide = new Werkstoff(
+            new short[] {0xad, 0x53, 0x1a},
             "Hydrogen Peroxide",
             subscriptNumbers("H2O2"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells().enforceUnification(),
             29921,
-            SET_METALLIC
-    );
-    public static final Werkstoff  Hydrazine = new Werkstoff(
-            new short[]{0xb5,0x07,0x07},
+            SET_METALLIC);
+    public static final Werkstoff Hydrazine = new Werkstoff(
+            new short[] {0xb5, 0x07, 0x07},
             "hydrazine",
             subscriptNumbers("N2H4"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29922,
-            SET_METALLIC
-    );
-    public static final Werkstoff  DimethylSulfate = new Werkstoff(
-            new short[]{0xff,0xfb,0x00},
+            SET_METALLIC);
+    public static final Werkstoff DimethylSulfate = new Werkstoff(
+            new short[] {0xff, 0xfb, 0x00},
             "Dimethyl Sulfate",
             subscriptNumbers("(CH3O)2SO2"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29923,
-            SET_METALLIC
-    );
-    public static final Werkstoff  Monomethylhydrazine = new Werkstoff(
-            new short[]{0xff,0x61,0x00},
+            SET_METALLIC);
+    public static final Werkstoff Monomethylhydrazine = new Werkstoff(
+            new short[] {0xff, 0x61, 0x00},
             "Monomethylhydrazine",
             subscriptNumbers("CH6N2"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29924,
-            SET_METALLIC
-    );
-    public static final Werkstoff  Formaldehyde = new Werkstoff(
-            new short[]{0x2e,0xd9,0x83},
+            SET_METALLIC);
+    public static final Werkstoff Formaldehyde = new Werkstoff(
+            new short[] {0x2e, 0xd9, 0x83},
             "Formaldehyde",
             subscriptNumbers("CH2O"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29925,
-            SET_METALLIC
-    );
-    public static final Werkstoff  EthylAcetate = new Werkstoff(
-            new short[]{0x0c,0xfb,0x32b},
+            SET_METALLIC);
+    public static final Werkstoff EthylAcetate = new Werkstoff(
+            new short[] {0x0c, 0xfb, 0x32b},
             "Ethyl Acetate",
             subscriptNumbers("C4H8O2"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29926,
-            SET_METALLIC
-    );
-    public static final Werkstoff  Acetylhydrazine = new Werkstoff(
-            new short[]{0xd1,0x5c,0x5c},
+            SET_METALLIC);
+    public static final Werkstoff Acetylhydrazine = new Werkstoff(
+            new short[] {0xd1, 0x5c, 0x5c},
             "Acetylhydrazine",
             subscriptNumbers("C2H6N2O"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29927,
-            SET_METALLIC
-    );
-    public static final Werkstoff  UnsymmetricalDimethylhydrazine = new Werkstoff(
-            new short[]{0x80,0x06,0x00},
+            SET_METALLIC);
+    public static final Werkstoff UnsymmetricalDimethylhydrazine = new Werkstoff(
+            new short[] {0x80, 0x06, 0x00},
             "Unsymmetrical Dimethylhydrazine",
             subscriptNumbers("H2NN(CH3)2"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29928,
-            SET_METALLIC
-    );
-    public static final Werkstoff  MonomethylhydrazineFuelMix = new Werkstoff(
-            new short[]{0x78,0xe3,0xa7},
+            SET_METALLIC);
+    public static final Werkstoff MonomethylhydrazineFuelMix = new Werkstoff(
+            new short[] {0x78, 0xe3, 0xa7},
             "Monomethylhydrazine Fuel Mix",
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29929,
-            SET_METALLIC
-    );
-    public static final Werkstoff  UnsymmetricalDimethylhydrazineFuelMix = new Werkstoff(
-            new short[]{0xc8,0xff,0x00},
+            SET_METALLIC);
+    public static final Werkstoff UnsymmetricalDimethylhydrazineFuelMix = new Werkstoff(
+            new short[] {0xc8, 0xff, 0x00},
             "Unsymmetrical Dimethylhydrazine Fuel Mix",
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29930,
-            SET_METALLIC
-    );
-    public static final Werkstoff Nitromethane  = new Werkstoff(
-            new short[]{0x87,0x7d,0x60},
+            SET_METALLIC);
+    public static final Werkstoff Nitromethane = new Werkstoff(
+            new short[] {0x87, 0x7d, 0x60},
             "Nitromethane",
             subscriptNumbers("CH3NO2"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29914,
-            SET_METALLIC
-    );
-    public static final Werkstoff  BoronTrioxide = new Werkstoff(
-            new short[]{0xe3,0xa6,0xd3},
+            SET_METALLIC);
+    public static final Werkstoff BoronTrioxide = new Werkstoff(
+            new short[] {0xe3, 0xa6, 0xd3},
             "Boron Trioxide",
             subscriptNumbers("B2O3"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().onlyDust(),
             29931,
-            SET_METALLIC
-    );
-    public static final Werkstoff  BoronTrifluoride = new Werkstoff(
-            new short[]{0xd0,0xe0,0x3f},
+            SET_METALLIC);
+    public static final Werkstoff BoronTrifluoride = new Werkstoff(
+            new short[] {0xd0, 0xe0, 0x3f},
             "Boron Trifluoride",
             subscriptNumbers("BF3"),
             new Werkstoff.Stats().setGas(true),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29932,
-            SET_METALLIC
-    );
-    public static final Werkstoff  NitroniumTetrafluoroborate = new Werkstoff(
-            new short[]{0x57,0x69,0x2d},
+            SET_METALLIC);
+    public static final Werkstoff NitroniumTetrafluoroborate = new Werkstoff(
+            new short[] {0x57, 0x69, 0x2d},
             "Nitronium Tetrafluoroborate",
             subscriptNumbers("NO2BF4"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().onlyDust(),
             29933,
-            SET_METALLIC
-    );
-    public static final Werkstoff  Trinitramid  = new Werkstoff(
-            new short[]{0x28,0x2b,0x70},
+            SET_METALLIC);
+    public static final Werkstoff Trinitramid = new Werkstoff(
+            new short[] {0x28, 0x2b, 0x70},
             "Trinitramid",
             subscriptNumbers("N4O6"),
             new Werkstoff.Stats().setGas(true),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29934,
-            SET_METALLIC
-    );
-    public static final Werkstoff  AmmoniaBoronfluorideSolution  = new Werkstoff(
-            new short[]{0x28,0x2b,0x70},
+            SET_METALLIC);
+    public static final Werkstoff AmmoniaBoronfluorideSolution = new Werkstoff(
+            new short[] {0x28, 0x2b, 0x70},
             "Ammonia Boronfluoride Solution",
             subscriptNumbers("NH4BF4"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29935,
-            SET_METALLIC
-    );
-    public static final Werkstoff  SodiumTetrafluoroborate  = new Werkstoff(
-            new short[]{0xbe,0x6e,0xe0},
+            SET_METALLIC);
+    public static final Werkstoff SodiumTetrafluoroborate = new Werkstoff(
+            new short[] {0xbe, 0x6e, 0xe0},
             "Sodium Tetrafluoroborate",
             subscriptNumbers("NaBF4"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29936,
-            SET_METALLIC
-    );
-    public static final Werkstoff  SodiumFluoride  = new Werkstoff(
-            new short[]{0x9f,0x70,0xe6},
+            SET_METALLIC);
+    public static final Werkstoff SodiumFluoride = new Werkstoff(
+            new short[] {0x9f, 0x70, 0xe6},
             "Sodium Fluoride",
             subscriptNumbers("NaF"),
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().onlyDust(),
             29937,
-            SET_METALLIC
-    );
-    public static final Werkstoff  Tetrafluoroborate  = new Werkstoff(
-            new short[]{0x6a,0x53,0x8c},
+            SET_METALLIC);
+    public static final Werkstoff Tetrafluoroborate = new Werkstoff(
+            new short[] {0x6a, 0x53, 0x8c},
             "Tetrafluoroboric Acid",
             subscriptNumbers("HBF4"),
             new Werkstoff.Stats().setGas(true),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             29938,
-            SET_METALLIC
-    );
-	@Override
-	public void run() {
-		// TODO Auto-generated method stub
+            SET_METALLIC);
 
-	}
+    @Override
+    public void run() {
+        // TODO Auto-generated method stub
 
+    }
 }
diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java b/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java
index 14f58394d6..abed46df99 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java
@@ -2,21 +2,17 @@ package com.elisis.gtnhlanth.common.register;
 
 import com.elisis.gtnhlanth.common.tileentity.Digester;
 import com.elisis.gtnhlanth.common.tileentity.DissolutionTank;
-
 import net.minecraft.item.ItemStack;
 
 public final class LanthItemList {
-	
-	public static ItemStack DIGESTER;
-	public static ItemStack DISSOLUTION_TANK;
 
-	public static void register() {
-		
-		LanthItemList.DIGESTER = new Digester(10500, "Digester", "Digester").getStackForm(1L);
-		LanthItemList.DISSOLUTION_TANK = new DissolutionTank(10501, "Dissolution Tank", "Dissolution Tank").getStackForm(1L);
-		
-	}
-	
-	
+    public static ItemStack DIGESTER;
+    public static ItemStack DISSOLUTION_TANK;
+
+    public static void register() {
 
+        LanthItemList.DIGESTER = new Digester(10500, "Digester", "Digester").getStackForm(1L);
+        LanthItemList.DISSOLUTION_TANK =
+                new DissolutionTank(10501, "Dissolution Tank", "Dissolution Tank").getStackForm(1L);
+    }
 }
diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
index d12fb95510..d26cb932f5 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
@@ -2,16 +2,11 @@ package com.elisis.gtnhlanth.common.register;
 
 import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers;
 
-import java.util.Arrays;
-
 import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
-import com.github.bartimaeusnek.bartworks.util.EnumUtils;
 import com.github.bartimaeusnek.bartworks.util.Pair;
-
 import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.SubTag;
 import gregtech.api.enums.TextureSet;
+import java.util.Arrays;
 
 @SuppressWarnings({"unchecked"})
 public class WerkstoffMaterialPool implements Runnable {
@@ -21,28 +16,31 @@ public class WerkstoffMaterialPool implements Runnable {
     private static final int offsetID3 = 11_300;
 
     /*
-     * public static final Werkstoff __ = new Werkstoff(
-    		new short[] {_, _, _},
-    		"__",
-    		new Werkstoff.Stats(),
-    		Werkstoff.Types.MIXTURE,
-    		new Werkstoff.GenerationFeatures().disable(),
-    		offsetID_,
-    		TextureSet.SET_DULL
-    	);
-     */
+    * public static final Werkstoff __ = new Werkstoff(
+    	new short[] {_, _, _},
+    	"__",
+    	new Werkstoff.Stats(),
+    	Werkstoff.Types.MIXTURE,
+    	new Werkstoff.GenerationFeatures().disable(),
+    	offsetID_,
+    	TextureSet.SET_DULL
+    );
+    */
 
-    //Misc.
+    // Misc.
     public static final Werkstoff Hafnium = new Werkstoff(
             new short[] {232, 224, 219},
             "Hafnium",
             subscriptNumbers("Hf"),
             new Werkstoff.Stats(),
             Werkstoff.Types.ELEMENT,
-            new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems().enforceUnification(), //Perhaps use hafnia liquid in elemental hafnium synthesis
+            new Werkstoff.GenerationFeatures()
+                    .disable()
+                    .onlyDust()
+                    .addMetalItems()
+                    .enforceUnification(), // Perhaps use hafnia liquid in elemental hafnium synthesis
             offsetID,
-            TextureSet.SET_DULL
-        );
+            TextureSet.SET_DULL);
 
     public static final Werkstoff LowPurityHafnium = new Werkstoff(
             new short[] {240, 223, 208},
@@ -50,10 +48,11 @@ public class WerkstoffMaterialPool implements Runnable {
             subscriptNumbers("??Hf??"),
             new Werkstoff.Stats(),
             Werkstoff.Types.COMPOUND,
-            new Werkstoff.GenerationFeatures().disable().onlyDust(), //Perhaps use hafnia liquid in elemental hafnium synthesis
+            new Werkstoff.GenerationFeatures()
+                    .disable()
+                    .onlyDust(), // Perhaps use hafnia liquid in elemental hafnium synthesis
             offsetID + 1,
-            TextureSet.SET_DULL
-        );
+            TextureSet.SET_DULL);
 
     public static final Werkstoff Hafnia = new Werkstoff(
             new short[] {247, 223, 203},
@@ -61,10 +60,11 @@ public class WerkstoffMaterialPool implements Runnable {
             subscriptNumbers("HfO2"),
             new Werkstoff.Stats(),
             Werkstoff.Types.COMPOUND,
-            new Werkstoff.GenerationFeatures().disable().onlyDust(), //Perhaps use hafnia liquid in elemental hafnium synthesis
+            new Werkstoff.GenerationFeatures()
+                    .disable()
+                    .onlyDust(), // Perhaps use hafnia liquid in elemental hafnium synthesis
             offsetID + 2,
-            TextureSet.SET_DULL
-        );
+            TextureSet.SET_DULL);
 
     public static final Werkstoff HafniumTetrachloride = new Werkstoff(
             new short[] {238, 247, 249},
@@ -74,8 +74,7 @@ public class WerkstoffMaterialPool implements Runnable {
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().disable().onlyDust(),
             offsetID + 3,
-            TextureSet.SET_DULL
-        );
+            TextureSet.SET_DULL);
 
     public static final Werkstoff HafniumTetrachlorideSolution = new Werkstoff(
             new short[] {238, 247, 249},
@@ -85,8 +84,7 @@ public class WerkstoffMaterialPool implements Runnable {
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             offsetID + 4,
-            TextureSet.SET_FLUID
-        );
+            TextureSet.SET_FLUID);
 
     public static final Werkstoff HafniumIodide = new Werkstoff(
             new short[] {216, 60, 1},
@@ -96,43 +94,41 @@ public class WerkstoffMaterialPool implements Runnable {
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().disable().onlyDust(),
             offsetID + 5,
-            TextureSet.SET_DULL
-        );
+            TextureSet.SET_DULL);
 
     public static final Werkstoff HafniumRunoff = new Werkstoff(
-            new short[] {74, 65, 42}, //Literally the statistically ugliest colour
+            new short[] {74, 65, 42}, // Literally the statistically ugliest colour
             "Hafnium Runoff",
             subscriptNumbers("??????"),
             new Werkstoff.Stats(),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().disable().onlyDust(),
             offsetID + 6,
-            TextureSet.SET_DULL
-        );
+            TextureSet.SET_DULL);
 
     public static final Werkstoff Zirconium = new Werkstoff(
-            new short[] {225,230,225},
+            new short[] {225, 230, 225},
             "Zirconium",
             subscriptNumbers("Zr"),
             new Werkstoff.Stats().setBlastFurnace(true),
             Werkstoff.Types.COMPOUND,
-            new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems().enforceUnification(),
+            new Werkstoff.GenerationFeatures()
+                    .disable()
+                    .onlyDust()
+                    .addMetalItems()
+                    .enforceUnification(),
             offsetID + 7,
-            TextureSet.SET_DULL
-
-        );
+            TextureSet.SET_DULL);
 
     public static final Werkstoff Zirconia = new Werkstoff(
-            new short[] {177,152,101},
+            new short[] {177, 152, 101},
             "Zirconia",
             subscriptNumbers("ZrO2"),
             new Werkstoff.Stats(),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().disable().onlyDust(),
             offsetID + 8,
-            TextureSet.SET_DULL
-
-        );
+            TextureSet.SET_DULL);
 
     public static final Werkstoff ZirconiumTetrachloride = new Werkstoff(
             new short[] {179, 164, 151},
@@ -142,8 +138,7 @@ public class WerkstoffMaterialPool implements Runnable {
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().disable().onlyDust(),
             offsetID + 9,
-            TextureSet.SET_DULL
-        );
+            TextureSet.SET_DULL);
 
     public static final Werkstoff ZirconiumTetrachlorideSolution = new Werkstoff(
             new short[] {179, 164, 151},
@@ -151,10 +146,12 @@ public class WerkstoffMaterialPool implements Runnable {
             subscriptNumbers("ZrCl4"),
             new Werkstoff.Stats(),
             Werkstoff.Types.COMPOUND,
-            new Werkstoff.GenerationFeatures().disable().addCells(), //Blast Furnace needs liquid input because it can't do 3 item inputs so have a shitty material
+            new Werkstoff.GenerationFeatures()
+                    .disable()
+                    .addCells(), // Blast Furnace needs liquid input because it can't do 3 item inputs so have a shitty
+            // material
             offsetID + 10,
-            TextureSet.SET_FLUID
-        );
+            TextureSet.SET_FLUID);
 
     public static final Werkstoff HafniaZirconiaBlend = new Werkstoff(
             new short[] {247, 223, 203},
@@ -164,22 +161,24 @@ public class WerkstoffMaterialPool implements Runnable {
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().disable().onlyDust(),
             offsetID + 11,
-            TextureSet.SET_DULL
-        );
+            TextureSet.SET_DULL);
 
     public static final Werkstoff Iodine = new Werkstoff(
             new short[] {171, 40, 175},
             "Iodine",
             subscriptNumbers("I"),
-            new Werkstoff.Stats().setProtons(53).setMass(127).setSublimation(true).setBoilingPoint(484).setGas(true),
+            new Werkstoff.Stats()
+                    .setProtons(53)
+                    .setMass(127)
+                    .setSublimation(true)
+                    .setBoilingPoint(484)
+                    .setGas(true),
             Werkstoff.Types.ELEMENT,
             new Werkstoff.GenerationFeatures().disable().onlyDust().addCells().enforceUnification(),
             offsetID + 12,
-            TextureSet.SET_FLUID
-        );
-
+            TextureSet.SET_FLUID);
 
-    //Lanthanide Line
+    // Lanthanide Line
     public static final Werkstoff MuddyRareEarthMonaziteSolution = new Werkstoff(
             new short[] {111, 78, 55},
             "Muddy Monazite Rare Earth Solution",
@@ -188,8 +187,7 @@ public class WerkstoffMaterialPool implements Runnable {
             Werkstoff.Types.MIXTURE,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             offsetID + 14,
-            TextureSet.SET_FLUID
-        );
+            TextureSet.SET_FLUID);
 
     public static final Werkstoff DilutedRareEarthMonaziteMud = new Werkstoff(
             new short[] {160, 120, 90},
@@ -199,8 +197,7 @@ public class WerkstoffMaterialPool implements Runnable {
             Werkstoff.Types.MIXTURE,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             offsetID + 15,
-            TextureSet.SET_FLUID
-        );
+            TextureSet.SET_FLUID);
 
     public static final Werkstoff DilutedMonaziteSulfate = new Werkstoff(
             new short[] {237, 201, 175},
@@ -210,8 +207,7 @@ public class WerkstoffMaterialPool implements Runnable {
             Werkstoff.Types.MIXTURE,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             offsetID + 16,
-            TextureSet.SET_FLUID
-        );
+            TextureSet.SET_FLUID);
 
     public static final Werkstoff NitratedRareEarthMonaziteConcentrate = new Werkstoff(
             new short[] {250, 223, 173},
@@ -221,8 +217,7 @@ public class WerkstoffMaterialPool implements Runnable {
             Werkstoff.Types.MIXTURE,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             offsetID + 17,
-            TextureSet.SET_FLUID
-        );
+            TextureSet.SET_FLUID);
 
     public static final Werkstoff NitricMonaziteLeachedConcentrate = new Werkstoff(
             new short[] {244, 202, 22},
@@ -232,8 +227,7 @@ public class WerkstoffMaterialPool implements Runnable {
             Werkstoff.Types.MIXTURE,
             new Werkstoff.GenerationFeatures().disable().addCells(),
             offsetID + 18,
-            TextureSet.SET_FLUID
-        );
+            TextureSet.SET_FLUID);
 
     public static final Werkstoff MonaziteSulfate = new Werkstoff(
             new short[] {152, 118, 84},
@@ -243,8 +237,7 @@ public class WerkstoffMaterialPool implements Runnable {
             Werkstoff.Types.MIXTURE,
             new Werkstoff.GenerationFeatures().disable().onlyDust(),
             offsetID + 19,
-            TextureSet.SET_DULL
-        );
+            TextureSet.SET_DULL);
 
     public static final Werkstoff AcidicMonazitePowder = new Werkstoff(
             new short[] {50, 23, 77},
@@ -254,8 +247,7 @@ public class WerkstoffMaterialPool implements Runnable {
             Werkstoff.Types.MIXTURE,
             new Werkstoff.GenerationFeatures().disable().onlyDust(),
             offsetID + 20,
-            TextureSet.SET_DULL
-        );
+            TextureSet.SET_DULL);
 
     public static final Werkstoff MonaziteRareEarthFiltrate = new Werkstoff(
             new short[] {72, 60, 50},