From bb9da48b9975cb27e3b7c538bff2853a34b36fcd Mon Sep 17 00:00:00 2001
From: miozune <miozune@gmail.com>
Date: Sun, 5 Feb 2023 01:40:43 +0900
Subject: Remove redundant flags (#529)

* Remove CORE.GTNH

* Remove LoadedMods.Gregtech

* Remove LoadedMods.IndustrialCraft2

* Remove LoadedMods.MiscUtils

* Remove CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK

* clean

* Remove mention to GT versions

* Fix assembler mode
---
 .../java/gtPlusPlus/core/material/ELEMENT.java     | 63 +---------------------
 .../java/gtPlusPlus/core/material/Material.java    |  7 +--
 2 files changed, 3 insertions(+), 67 deletions(-)

(limited to 'src/main/java/gtPlusPlus/core/material')

diff --git a/src/main/java/gtPlusPlus/core/material/ELEMENT.java b/src/main/java/gtPlusPlus/core/material/ELEMENT.java
index f73c1af0ab..666de12f53 100644
--- a/src/main/java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/main/java/gtPlusPlus/core/material/ELEMENT.java
@@ -4,7 +4,6 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.TextureSet;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.client.CustomTextureSet.TextureSets;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.data.StringUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
@@ -597,66 +596,8 @@ public final class ELEMENT {
 
     public ELEMENT() {
         // GTNH Trinium Handling
-        if (CORE.GTNH) {
-            // yay
-            Materials a1 = MaterialUtils.getMaterial("Trinium");
-            Materials a2 = Materials.valueOf("Trinium");
-            Materials a3 = Materials.get("Trinium");
-            Materials a4;
-            if (a1 == null) {
-                Logger.INFO("[Material] First attempt to find Trinium failed, using backup method.");
-                if (a2 == null) {
-                    Logger.INFO("[Material] Fallback attempt to find Trinium failed, using second fallback.");
-                    if (a3 == null) {
-                        Logger.INFO("[Material] Fallback attempt to find Trinium failed, dumping materials.");
-                        for (Materials m : Materials.values()) {
-                            Logger.INFO("[Material] Found " + MaterialUtils.getMaterialName(m));
-                        }
-                        a4 = null;
-                    } else {
-                        Logger.INFO("[Material] a3 Found " + MaterialUtils.getMaterialName(a3));
-                        a4 = a3;
-                    }
-                } else {
-                    Logger.INFO("[Material] a2 Found " + MaterialUtils.getMaterialName(a2));
-                    a4 = a2;
-                }
-                TRINIUM = MaterialUtils.generateMaterialFromGtENUM(a4);
-            } else {
-                Logger.INFO("[Material] a1 Found " + MaterialUtils.getMaterialName(a1));
-                TRINIUM = MaterialUtils.generateMaterialFromGtENUM(a1);
-            }
-
-            TRINIUM_REFINED = TRINIUM;
-
-        } else {
-            TRINIUM = new Material(
-                    "Trinium",
-                    MaterialState.SOLID,
-                    TextureSet.SET_FINE,
-                    new short[] { 70, 110, 30 },
-                    604,
-                    4057,
-                    181,
-                    133,
-                    false,
-                    "Ke",
-                    0,
-                    false); // Not a GT Inherited Material
-            TRINIUM_REFINED = new Material(
-                    "Refined Trinium",
-                    MaterialState.SOLID,
-                    TextureSets.REFINED.get(),
-                    new short[] { 210, 255, 170 },
-                    4304,
-                    14057,
-                    181,
-                    133,
-                    false,
-                    "Ke",
-                    0,
-                    new MaterialStack[] { new MaterialStack(TRINIUM, 1) }); // Not a GT Inherited Material
-        }
+        TRINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Trinium);
+        TRINIUM_REFINED = TRINIUM;
     }
 
     public static ELEMENT getInstance() {
diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java
index 98ab4739d4..00f5139b60 100644
--- a/src/main/java/gtPlusPlus/core/material/Material.java
+++ b/src/main/java/gtPlusPlus/core/material/Material.java
@@ -33,7 +33,6 @@ import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.CustomOrePrefix;
-import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits;
 import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
 import gtPlusPlus.xmod.tinkers.material.BaseTinkersMaterial;
 
@@ -1138,11 +1137,7 @@ public class Material {
     }
 
     public final ItemStack getCable16(final int stacksize) {
-        if (GregtechConduits.cableGt16 != null) {
-            return getComponentByPrefix(GregtechConduits.cableGt16, stacksize);
-        } else {
-            return ItemUtils.getErrorStack(stacksize);
-        }
+        return getComponentByPrefix(OrePrefixes.cableGt16, stacksize);
     }
 
     /**
-- 
cgit