Merge remote-tracking branch 'upstream/master'

5 files changed, 60 insertions, 802 deletions

diff --git a/build.gradle b/build.gradle
index b894d64772..6a54d13b0c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1692122114
+//version: 1695474595
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -89,6 +89,23 @@ def out = services.get(StyledTextOutputFactory).create('an-output')
 def projectJavaVersion = JavaLanguageVersion.of(8)
 
 boolean disableSpotless = project.hasProperty("disableSpotless") ? project.disableSpotless.toBoolean() : false
+boolean disableCheckstyle = project.hasProperty("disableCheckstyle") ? project.disableCheckstyle.toBoolean() : false
+
+final String CHECKSTYLE_CONFIG = """
+<!DOCTYPE module PUBLIC
+  "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+  "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<module name="Checker">
+  <module name="TreeWalker">
+    <!-- Use CHECKSTYLE:OFF and CHECKSTYLE:ON comments to suppress checkstyle lints in a block -->
+    <module name="SuppressionCommentFilter"/>
+    <module name="AvoidStarImport">
+      <!-- Allow static wildcard imports for cases like Opcodes and LWJGL classes, these don't get created accidentally by the IDE -->
+      <property name="allowStaticMemberImports" value="true"/>
+    </module>
+  </module>
+</module>
+"""
 
 checkPropertyExists("modName")
 checkPropertyExists("modId")
@@ -140,6 +157,17 @@ if (!disableSpotless) {
     apply from: Blowdryer.file('spotless.gradle')
 }
 
+if (!disableCheckstyle) {
+    apply plugin: 'checkstyle'
+    tasks.named("checkstylePatchedMc") { enabled = false }
+    tasks.named("checkstyleMcLauncher") { enabled = false }
+    tasks.named("checkstyleIdeVirtualMain") { enabled = false }
+    tasks.named("checkstyleInjectedTags") { enabled = false }
+    checkstyle {
+        config = resources.text.fromString(CHECKSTYLE_CONFIG)
+    }
+}
+
 String javaSourceDir = "src/main/java/"
 String scalaSourceDir = "src/main/scala/"
 String kotlinSourceDir = "src/main/kotlin/"
@@ -600,15 +628,10 @@ repositories {
         }
         maven {
             name = "ic2"
-            url = "https://maven.ic2.player.to/"
-            metadataSources {
-                mavenPom()
-                artifact()
+            url = getURL("https://maven.ic2.player.to/", "https://maven2.ic2.player.to/")
+            content {
+                includeGroup "net.industrial-craft"
             }
-        }
-        maven {
-            name = "ic2-mirror"
-            url = "https://maven2.ic2.player.to/"
             metadataSources {
                 mavenPom()
                 artifact()
@@ -770,23 +793,14 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
 }
 
 dependencies {
-    def lwjgl3ifyVersion = '1.4.0'
-    def asmVersion = '9.4'
+    def lwjgl3ifyVersion = '1.5.0'
     if (modId != 'lwjgl3ify') {
         java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
     }
     if (modId != 'hodgepodge') {
-        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.26')
+        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.5')
     }
 
-    java17PatchDependencies('net.minecraft:launchwrapper:1.17.2') {transitive = false}
-    java17PatchDependencies("org.ow2.asm:asm:${asmVersion}")
-    java17PatchDependencies("org.ow2.asm:asm-commons:${asmVersion}")
-    java17PatchDependencies("org.ow2.asm:asm-tree:${asmVersion}")
-    java17PatchDependencies("org.ow2.asm:asm-analysis:${asmVersion}")
-    java17PatchDependencies("org.ow2.asm:asm-util:${asmVersion}")
-    java17PatchDependencies('org.ow2.asm:asm-deprecated:7.1')
-    java17PatchDependencies("org.apache.commons:commons-lang3:3.12.0")
     java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
 }
 
@@ -1576,6 +1590,25 @@ def getSecondaryArtifacts() {
     return secondaryArtifacts
 }
 
+def getURL(String main, String fallback) {
+    return pingURL(main, 10000) ? main : fallback
+}
+
+// credit: https://stackoverflow.com/a/3584332
+def pingURL(String url, int timeout) {
+    url = url.replaceFirst("^https", "http") // Otherwise an exception may be thrown on invalid SSL certificates.
+    try {
+        HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection()
+        connection.setConnectTimeout(timeout)
+        connection.setReadTimeout(timeout)
+        connection.setRequestMethod("HEAD")
+        int responseCode = connection.getResponseCode()
+        return 200 <= responseCode && responseCode <= 399
+    } catch (IOException ignored) {
+        return false
+    }
+}
+
 // For easier scripting of things that require variables defined earlier in the buildscript
 if (file('addon.late.gradle.kts').exists()) {
     apply from: 'addon.late.gradle.kts'
diff --git a/dependencies.gradle b/dependencies.gradle
index a3e0264024..656ac9269d 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,7 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.153:dev')
-    implementation('com.github.GTNewHorizons:GTplusplus:1.10.2:dev')
-    implementation('com.github.GTNewHorizons:GoodGenerator:0.6.27:dev')
+    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.23:dev')
+    implementation('com.github.GTNewHorizons:GTplusplus:1.10.10:dev')
+    implementation('com.github.GTNewHorizons:GoodGenerator:0.7.1:dev')
 }
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 6fc5f2f81e..3b9f63b020 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
@@ -16,8 +16,6 @@ public class WerkstoffMaterialPool implements Runnable {
     private static final int offsetID = 11_000;
     private static final int offsetID2 = 11_100;
     private static final int offsetID3 = 11_300;
-    private static final int offsetID4 = 11_400;
-    private static final int offsetID5 = 11_460;
 
     /*
      * public static final Werkstoff __ = new Werkstoff( new short[] {_, _, _}, "__", new Werkstoff.Stats(),
@@ -949,778 +947,6 @@ public class WerkstoffMaterialPool implements Runnable {
             offsetID3 + 16,
             TextureSet.SET_FLUID);
 
-    // TODO Samarium Processing Line Material regist
-
-    public static final Werkstoff MuddySamariumRareEarthSolution = new Werkstoff(
-            new short[] { 226, 180, 108 },
-            "Muddy Samarium Rare Earth Solution",
-            subscriptNumbers("???Sm???"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID5 + 1,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff SamariumRareEarthMud = new Werkstoff(
-            new short[] { 226, 180, 128 },
-            "Samarium Rare Earth Mud",
-            subscriptNumbers("??Sm??"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID5 + 2,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff DilutedSamariumRareEarthSolution = new Werkstoff(
-            new short[] { 226, 180, 148 },
-            "Diluted Samarium Rare Earth Solution",
-            subscriptNumbers("?Sm?"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID5 + 3,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff ImpureSamariumOxalate = new Werkstoff(
-            new short[] { 248, 248, 180 },
-            "Samarium Oxalate Enriched",
-            subscriptNumbers("?Sm2(C2O4)3"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().onlyDust(),
-            offsetID5 + 4,
-            TextureSet.SET_DULL);
-
-    public static final Werkstoff ImpureSamariumChloride = new Werkstoff(
-            new short[] { 248, 248, 120 },
-            "Impure Samarium Chloride",
-            subscriptNumbers("?SmCl3"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten(),
-            offsetID5 + 5,
-            TextureSet.SET_DULL);
-
-    public static final Werkstoff SamariumChlorideSodiumChlorideBlend = new Werkstoff(
-            new short[] { 255, 200, 230 },
-            "Samarium Chloride-Sodium Chloride Blend",
-            subscriptNumbers("?SmCl3NaCl"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().onlyDust(),
-            offsetID5 + 6,
-            TextureSet.SET_DULL);
-
-    public static final Werkstoff ImpureLanthanumChloride = new Werkstoff(
-            new short[] { 90, 100, 30 },
-            "Impure Lanthanum Chloride",
-            subscriptNumbers("?LaCl3"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().onlyDust(),
-            offsetID5 + 7,
-            TextureSet.SET_DULL);
-
-    public static final Werkstoff SamariumOxide = new Werkstoff(
-            new short[] { 223, 182, 193 },
-            "Samarium Oxide",
-            subscriptNumbers("Sm2O3"),
-            new Werkstoff.Stats().setElektrolysis(true),
-            Werkstoff.Types.COMPOUND,
-            new Werkstoff.GenerationFeatures().disable().onlyDust(),
-            offsetID5 + 8,
-            TextureSet.SET_DULL,
-            Arrays.asList(Materials.Samarium, Materials.Oxygen),
-            new Pair<>(Materials.Samarium, 2),
-            new Pair<>(Materials.Oxygen, 3));
-
-    public static final Werkstoff ChlorinatedRareEarthConcentrate = new Werkstoff(
-            new short[] { 130, 80, 60 },
-            "Chlorinated Rare Earth Concentrate",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID5 + 9,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff ChlorinatedRareEarthEnrichedSolution = new Werkstoff(
-            new short[] { 130, 90, 60 },
-            "Chlorinated Rare Earth Enriched Solution",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID5 + 10,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff ChlorinatedRareEarthDilutedSolution = new Werkstoff(
-            new short[] { 216, 180, 100 },
-            "Chlorinated Rare Earth Diluted Solution",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID5 + 11,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff RarestEarthResidue = new Werkstoff(
-            new short[] { 224, 211, 211 },
-            "Rarest Earth Residue",
-            subscriptNumbers("???"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().onlyDust(),
-            offsetID5 + 12,
-            TextureSet.SET_DULL);
-
-    // TODO reg Lanth Ore Concentrate
-    /**
-     * Extracted Nano Resin Lanthanum1.2 Praseodymium3.4 Cerium5.6 Neodymium7.8 Promethium9.10 Samarium11.12 √
-     * Europium13.14 Gadolinium15.16 Terbium17.18 Dysprosium19.20 Holmium21.22 Erbium23.24 Thulium25.26 Ytterbium27.28
-     * Lutetium29.30
-     */
-
-    public static final Werkstoff LanthanumExtractingNanoResin = new Werkstoff(
-            new short[] { 50, 80, 40 },
-            "Lanthanum Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 1,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff FilledLanthanumExtractingNanoResin = new Werkstoff(
-            new short[] { 128, 128, 80 },
-            "Filled Lanthanum Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 2,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff PraseodymiumExtractingNanoResin = new Werkstoff(
-            new short[] { 80, 192, 130 },
-            "Praseodymium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 3,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff FilledPraseodymiumExtractingNanoResin = new Werkstoff(
-            new short[] { 140, 192, 130 },
-            "Filled Praseodymium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 4,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff CeriumExtractingNanoResin = new Werkstoff(
-            new short[] { 80, 240, 160 },
-            "Cerium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 5,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff FilledCeriumExtractingNanoResin = new Werkstoff(
-            new short[] { 160, 240, 180 },
-            "Filled Cerium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 6,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff NeodymiumExtractingNanoResin = new Werkstoff(
-            new short[] { 128, 140, 128 },
-            "Neodymium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 7,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff FilledNeodymiumExtractingNanoResin = new Werkstoff(
-            new short[] { 150, 150, 150 },
-            "Filled Neodymium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 8,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff PromethiumExtractingNanoResin = new Werkstoff(
-            new short[] { 110, 255, 60 },
-            "Promethium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 9,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff FilledPromethiumExtractingNanoResin = new Werkstoff(
-            new short[] { 150, 255, 140 },
-            "Filled Promethium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 10,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff SamariumExtractingNanoResin = new Werkstoff(
-            new short[] { 255, 240, 100 },
-            "Samarium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 11,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff FilledSamariumExtractingNanoResin = new Werkstoff(
-            new short[] { 255, 240, 196 },
-            "Filled Samarium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 12,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff EuropiumExtractingNanoResin = new Werkstoff(
-            new short[] { 240, 160, 240 },
-            "Europium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 13,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff FilledEuropiumExtractingNanoResin = new Werkstoff(
-            new short[] { 240, 200, 240 },
-            "Filled Europium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 14,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff GadoliniumExtractingNanoResin = new Werkstoff(
-            new short[] { 120, 255, 80 },
-            "Gadolinium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 15,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff FilledGadoliniumExtractingNanoResin = new Werkstoff(
-            new short[] { 160, 255, 140 },
-            "Filled Gadolinium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 16,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff TerbiumExtractingNanoResin = new Werkstoff(
-            new short[] { 200, 200, 200 },
-            "Terbium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 17,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff FilledTerbiumExtractingNanoResin = new Werkstoff(
-            new short[] { 255, 255, 255 },
-            "Filled Terbium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 18,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff DysprosiumExtractingNanoResin = new Werkstoff(
-            new short[] { 110, 240, 180 },
-            "Dysprosium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 19,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff FilledDysprosiumExtractingNanoResin = new Werkstoff(
-            new short[] { 150, 240, 180 },
-            "Filled Dysprosium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 20,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff HolmiumExtractingNanoResin = new Werkstoff(
-            new short[] { 16, 16, 216 },
-            "Holmium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 21,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff FilledHolmiumExtractingNanoResin = new Werkstoff(
-            new short[] { 60, 90, 255 },
-            "Filled Holmium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 22,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff ErbiumExtractingNanoResin = new Werkstoff(
-            new short[] { 200, 160, 80 },
-            "Erbium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 23,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff FilledErbiumExtractingNanoResin = new Werkstoff(
-            new short[] { 233, 170, 100 },
-            "Filled Erbium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 24,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff ThuliumExtractingNanoResin = new Werkstoff(
-            new short[] { 128, 178, 255 },
-            "Thulium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 25,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff FilledThuliumExtractingNanoResin = new Werkstoff(
-            new short[] { 160, 200, 255 },
-            "Filled Thulium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 26,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff YtterbiumExtractingNanoResin = new Werkstoff(
-            new short[] { 0, 255, 0 },
-            "Ytterbium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 27,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff FilledYtterbiumExtractingNanoResin = new Werkstoff(
-            new short[] { 100, 255, 100 },
-            "Filled Ytterbium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 28,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff LutetiumExtractingNanoResin = new Werkstoff(
-            new short[] { 230, 16, 230 },
-            "Lutetium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 29,
-            TextureSet.SET_FLUID);
-
-    public static final Werkstoff FilledLutetiumExtractingNanoResin = new Werkstoff(
-            new short[] { 240, 100, 240 },
-            "Filled Lutetium Extracting Nano Resin",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 30,
-            TextureSet.SET_FLUID);
-
-    // enum Lanthanides {
-    // Lanthanum,
-    // Praseodymium,
-    // Cerium,
-    // Neodymium,
-    // Promethium,
-    // Samarium,
-    // Europium,
-    // Gadolinium,
-    // Terbium,
-    // Dysprosium,
-    // Holmium,
-    // Erbium,
-    // Thulium,
-    // Ytterbium,
-    // Lutetium
-    // }
-
-    // Lanthanides Chloride Concentrate
-    // Lanthanum
-    public static final Werkstoff LanthanumChlorideConcentrate = new Werkstoff(
-            new short[] { 128, 128, 80 },
-            "Lanthanum Chloride Concentrate",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 31,
-            TextureSet.SET_FLUID);
-
-    // Praseodymium
-    public static final Werkstoff PraseodymiumChlorideConcentrate = new Werkstoff(
-            new short[] { 140, 192, 130 },
-            "Praseodymium Chloride Concentrate",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 32,
-            TextureSet.SET_FLUID);
-
-    // Cerium
-    public static final Werkstoff CeriumChlorideConcentrate = new Werkstoff(
-            new short[] { 160, 240, 180 },
-            "Cerium Chloride Concentrate",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 33,
-            TextureSet.SET_FLUID);
-
-    // Neodymium
-    public static final Werkstoff NeodymiumChlorideConcentrate = new Werkstoff(
-            new short[] { 150, 150, 150 },
-            "Neodymium Chloride Concentrate",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 34,
-            TextureSet.SET_FLUID);
-
-    //
-    public static final Werkstoff PromethiumChlorideConcentrate = new Werkstoff(
-            new short[] { 150, 255, 140 },
-            "Promethium Chloride Concentrate",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 35,
-            TextureSet.SET_FLUID);
-
-    //
-    public static final Werkstoff SamariumChlorideConcentrate = new Werkstoff(
-            new short[] { 255, 240, 196 },
-            "Samarium Chloride Concentrate",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 36,
-            TextureSet.SET_FLUID);
-
-    //
-    public static final Werkstoff EuropiumChlorideConcentrate = new Werkstoff(
-            new short[] { 240, 200, 240 },
-            "Europium Chloride Concentrate",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 37,
-            TextureSet.SET_FLUID);
-
-    //
-    public static final Werkstoff GadoliniumChlorideConcentrate = new Werkstoff(
-            new short[] { 160, 255, 140 },
-            "Gadolinium Chloride Concentrate",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 38,
-            TextureSet.SET_FLUID);
-
-    //
-    public static final Werkstoff TerbiumChlorideConcentrate = new Werkstoff(
-            new short[] { 255, 255, 255 },
-            "Terbium Chloride Concentrate",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 39,
-            TextureSet.SET_FLUID);
-
-    //
-    public static final Werkstoff DysprosiumChlorideConcentrate = new Werkstoff(
-            new short[] { 150, 240, 180 },
-            "Dysprosium Chloride Concentrate",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 40,
-            TextureSet.SET_FLUID);
-
-    //
-    public static final Werkstoff HolmiumChlorideConcentrate = new Werkstoff(
-            new short[] { 60, 90, 255 },
-            "Holmium Chloride Concentrate",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 41,
-            TextureSet.SET_FLUID);
-
-    //
-    public static final Werkstoff ErbiumChlorideConcentrate = new Werkstoff(
-            new short[] { 233, 170, 100 },
-            "Erbium Chloride Concentrate",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 42,
-            TextureSet.SET_FLUID);
-
-    //
-    public static final Werkstoff ThuliumChlorideConcentrate = new Werkstoff(
-            new short[] { 160, 200, 255 },
-            "Thulium Chloride Concentrate",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 43,
-            TextureSet.SET_FLUID);
-
-    //
-    public static final Werkstoff YtterbiumChlorideConcentrate = new Werkstoff(
-            new short[] { 100, 255, 100 },
-            "Ytterbium Chloride Concentrate",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 44,
-            TextureSet.SET_FLUID);
-
-    //
-    public static final Werkstoff LutetiumChlorideConcentrate = new Werkstoff(
-            new short[] { 240, 100, 240 },
-            "Lutetium Chloride Concentrate",
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().addCells(),
-            offsetID4 + 45,
-            TextureSet.SET_FLUID);
-
-    // Lanthanides Ore Concentrate
-
-    // Lanthanum
-    public static final Werkstoff LanthanumOreConcentrate = new Werkstoff(
-            new short[] { 128, 128, 96 },
-            "Lanthanum Ore Concentrate",
-            subscriptNumbers("??La??"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().onlyDust(),
-            offsetID4 + 46,
-            TextureSet.SET_DULL);
-
-    // Praseodymium
-    public static final Werkstoff PraseodymiumOreConcentrate = new Werkstoff(
-            new short[] { 140, 192, 130 },
-            "Praseodymium Ore Concentrate",
-            subscriptNumbers("??Pr??"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().onlyDust(),
-            offsetID4 + 47,
-            TextureSet.SET_DULL);
-
-    // Cerium
-    public static final Werkstoff CeriumOreConcentrate = CeriumRichMixture;
-
-    // Neodymium
-    public static final Werkstoff NeodymiumOreConcentrate = new Werkstoff(
-            new short[] { 128, 128, 128 },
-            "Neodymium Ore Concentrate",
-            subscriptNumbers("??Nd??"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().onlyDust(),
-            offsetID4 + 49,
-            TextureSet.SET_DULL);
-
-    // Promethium
-    public static final Werkstoff PromethiumOreConcentrate = new Werkstoff(
-            new short[] { 150, 255, 140 },
-            "Promethium Ore Concentrate",
-            subscriptNumbers("??Po??"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().onlyDust(),
-            offsetID4 + 50,
-            TextureSet.SET_DULL);
-
-    // Samarium
-    // public static final Werkstoff SamariumOreConcentrate = new Werkstoff(
-    // new short[] { 255, 200, 230 },
-    // "Samarium Ore Concentrate",
-    // subscriptNumbers("??Sm??"),
-    // new Werkstoff.Stats(),
-    // Werkstoff.Types.MIXTURE,
-    // new Werkstoff.GenerationFeatures().disable().onlyDust(),
-    // offsetID2 + 28,
-    // TextureSet.SET_DULL);
-
-    // Europium
-    public static final Werkstoff EuropiumOreConcentrate = new Werkstoff(
-            new short[] { 240, 200, 240 },
-            "Europium Ore Concentrate",
-            subscriptNumbers("??Eu??"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().onlyDust(),
-            offsetID4 + 51,
-            TextureSet.SET_DULL);
-
-    // Gadolinium
-    public static final Werkstoff GadoliniumOreConcentrate = new Werkstoff(
-            new short[] { 160, 255, 140 },
-            "Gadolinium Ore Concentrate",
-            subscriptNumbers("??Gd??"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().onlyDust(),
-            offsetID4 + 52,
-            TextureSet.SET_DULL);
-
-    // Terbium
-    public static final Werkstoff TerbiumOreConcentrate = new Werkstoff(
-            new short[] { 255, 255, 255 },
-            "Terbium Ore Concentrate",
-            subscriptNumbers("??Tb??"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().onlyDust(),
-            offsetID4 + 53,
-            TextureSet.SET_DULL);
-
-    // Dysprosium
-    public static final Werkstoff DysprosiumOreConcentrate = new Werkstoff(
-            new short[] { 150, 240, 180 },
-            "Dysprosium Ore Concentrate",
-            subscriptNumbers("??Dy??"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().onlyDust(),
-            offsetID4 + 54,
-            TextureSet.SET_DULL);
-
-    // Holmium
-    public static final Werkstoff HolmiumOreConcentrate = new Werkstoff(
-            new short[] { 60, 90, 255 },
-            "Holmium Ore Concentrate",
-            subscriptNumbers("??Ho??"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().onlyDust(),
-            offsetID4 + 55,
-            TextureSet.SET_DULL);
-
-    // Erbium
-    public static final Werkstoff ErbiumOreConcentrate = new Werkstoff(
-            new short[] { 233, 170, 100 },
-            "Erbium Ore Concentrate",
-            subscriptNumbers("??Eb??"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().onlyDust(),
-            offsetID4 + 56,
-            TextureSet.SET_DULL);
-
-    // Thulium
-    public static final Werkstoff ThuliumOreConcentrate = new Werkstoff(
-            new short[] { 160, 200, 255 },
-            "Thulium Ore Concentrate",
-            subscriptNumbers("??Tm??"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().onlyDust(),
-            offsetID4 + 57,
-            TextureSet.SET_DULL);
-
-    // Ytterbium
-    public static final Werkstoff YtterbiumOreConcentrate = new Werkstoff(
-            new short[] { 100, 255, 100 },
-            "Ytterbium Ore Concentrate",
-            subscriptNumbers("??Yb??"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().onlyDust(),
-            offsetID4 + 58,
-            TextureSet.SET_DULL);
-
-    // Lutetium
-    public static final Werkstoff LutetiumOreConcentrate = new Werkstoff(
-            new short[] { 240, 100, 240 },
-            "Lutetium Ore Concentrate",
-            subscriptNumbers("??Lu??"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().disable().onlyDust(),
-            offsetID4 + 59,
-            TextureSet.SET_DULL);
-
-    // LuAG
-    public static final Werkstoff CeriumDopedLutetiumAluminiumOxygenBlend = new Werkstoff(
-            new short[] { 128, 192, 80 },
-            "Cerium-doped Lutetium Aluminium Oxygen Blend",
-            subscriptNumbers("(Ce)Lu3Al5O12"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten(),
-            offsetID5 + 38,
-            TextureSet.SET_DULL);
-
-    public static final Werkstoff CeriumDopedLutetiumAluminiumGarnet = new Werkstoff(
-            new short[] { 144, 255, 63 },
-            "Cerium-doped Lutetium Aluminium Garnet (Ce:LuAG)",
-            subscriptNumbers("(Ce)Lu3Al5O12"),
-            new Werkstoff.Stats(),
-            Werkstoff.Types.MATERIAL,
-            new Werkstoff.GenerationFeatures().disable().addGems(),
-            offsetID5 + 39,
-            TextureSet.SET_GEM_VERTICAL);
-
-    // public static final Werkstoff RawCeriumDopedLutetiumAluminiumGarnetPart = new Werkstoff(
-    // new short[] { 63, 255, 63 },
-    // "Raw Cerium Doped Lutetium Aluminium Garnet Part",
-    // subscriptNumbers("(Ce)Lu3Al5O12"),
-    // new Werkstoff.Stats(),
-    // Werkstoff.Types.MATERIAL,
-    // new Werkstoff.GenerationFeatures().disable().addGems(),
-    // offsetID4 + 33,
-    // TextureSet.SET_GEM_VERTICAL);
-
-    // public static final Werkstoff C272 = new Werkstoff(
-    // new short[] { 0x29, 0xc2, 0x2a },
-    // "C-272",
-    // subscriptNumbers("(C8H17)2PO2H"),
-    // new Werkstoff.Stats().setElektrolysis(true),
-    // Werkstoff.Types.COMPOUND,
-    // new Werkstoff.GenerationFeatures().disable().addCells(),
-    // offsetID4 + 59,
-    // TextureSet.SET_FLUID,
-    // new Pair<>(Carbon, 16),
-    // new Pair<>(Phosphorus, 1),
-    // new Pair<>(Oxygen, 3),
-    // new Pair<>(Hydrogen, 35));
-
     public static void runInit() {
 
         addSubTags();
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java
index 1d30dce68c..b465ecfab3 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java
@@ -140,15 +140,15 @@ public class BotRecipes {
         // 2Cl + CO = COCl2
 
         GT_Values.RA.stdBuilder().itemInputs(Materials.CarbonMonoxide.getCells(1), GT_Utility.getIntegratedCircuit(12))
-                .itemOutputs(Phosgene.get(cell, 1)).fluidInputs(Materials.Chlorine.getGas(2000)).noFluidOutputs()
+                .itemOutputs(Phosgene.get(cell, 1)).fluidInputs(Materials.Chlorine.getGas(2000))
                 .duration(2 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_HV).addTo(sChemicalRecipes);
         GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(12))
                 .itemOutputs(Phosgene.get(cell, 1), Materials.Empty.getCells(1))
-                .fluidInputs(Materials.CarbonMonoxide.getGas(1000)).noFluidOutputs().duration(2 * SECONDS + 10 * TICKS)
+                .fluidInputs(Materials.CarbonMonoxide.getGas(1000)).duration(2 * SECONDS + 10 * TICKS)
                 .eut(TierEU.RECIPE_HV).addTo(sChemicalRecipes);
         GT_Values.RA.stdBuilder().itemInputs(Materials.CarbonMonoxide.getCells(1), Materials.Chlorine.getCells(2))
-                .itemOutputs(Phosgene.get(cell, 1), Materials.Empty.getCells(2)).noFluidInputs().noFluidOutputs()
-                .duration(2 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_HV).addTo(sChemicalRecipes);
+                .itemOutputs(Phosgene.get(cell, 1), Materials.Empty.getCells(2)).duration(2 * SECONDS + 10 * TICKS)
+                .eut(TierEU.RECIPE_HV).addTo(sChemicalRecipes);
         GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(2))
                 .itemOutputs(Materials.Empty.getCells(2)).fluidInputs(Materials.CarbonMonoxide.getGas(1000))
                 .fluidOutputs(BotWerkstoffMaterialPool.Phosgene.getFluidOrGas(1000)).duration(2 * SECONDS + 10 * TICKS)
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
index 83c99c8976..91ace2aef2 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
@@ -31,7 +31,6 @@ import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.Platinu
 import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
 
 import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.registry.GameRegistry;
 import goodgenerator.items.MyMaterial;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;