Always enable all material components (#2380)

1 files changed, 27 insertions, 28 deletions

diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index bf6cab4925..3bb2ab6487 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -2,7 +2,6 @@ package gregtech.api.enums;
 
 import static gregtech.api.enums.FluidState.GAS;
 import static gregtech.api.enums.GT_Values.M;
-import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
 import static gregtech.api.enums.Mods.Thaumcraft;
 
 import java.util.ArrayList;
@@ -2409,37 +2408,37 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
             .toArray(new Materials[0]); // Generate standard object array. This is a
                                         // lot faster to loop over.
         VALUES = Arrays.asList(MATERIALS_ARRAY);
-        if (!NewHorizonsCoreMod.isModLoaded() && !GT_Mod.gregtechproxy.mEnableAllComponents)
-            OrePrefixes.initMaterialComponents();
-        else {
-            OrePrefixes.ingotHot.mDisabledItems.addAll(
-                Arrays.stream(Materials.values())
-                    .parallel()
-                    .filter(OrePrefixes.ingotHot::doGenerateItem)
-                    .filter(m -> m.mBlastFurnaceTemp < 1750 && m.mAutoGenerateBlastFurnaceRecipes)
-                    .collect(Collectors.toSet()));
-            OrePrefixes.ingotHot.disableComponent(Materials.Reinforced);
-            OrePrefixes.ingotHot.disableComponent(Materials.ConductiveIron);
-            OrePrefixes.ingotHot.disableComponent(Materials.FierySteel);
-            OrePrefixes.ingotHot.disableComponent(Materials.ElectricalSteel);
-            OrePrefixes.ingotHot.disableComponent(Materials.EndSteel);
-            OrePrefixes.ingotHot.disableComponent(Materials.Soularium);
-            OrePrefixes.ingotHot.disableComponent(Materials.EnergeticSilver);
-            OrePrefixes.ingotHot.disableComponent(Materials.Cheese);
-            OrePrefixes.ingotHot.disableComponent(Materials.Calcium);
-            OrePrefixes.ingotHot.disableComponent(Materials.Flerovium);
-            OrePrefixes.ingotHot.disableComponent(Materials.Cobalt);
-            OrePrefixes.ingotHot.disableComponent(Materials.RedstoneAlloy);
-            OrePrefixes.ingotHot.disableComponent(Materials.Ardite);
-            OrePrefixes.ingotHot.disableComponent(Materials.DarkSteel);
-            OrePrefixes.ingotHot.disableComponent(Materials.EnergeticAlloy);
-            OrePrefixes.ingotHot.disableComponent(Materials.PulsatingIron);
-            OrePrefixes.ingotHot.disableComponent(Materials.CrudeSteel);
-        }
 
+        disableUnusedHotIngots();
         fillGeneratedMaterialsMap();
     }
 
+    private static void disableUnusedHotIngots() {
+        OrePrefixes.ingotHot.mDisabledItems.addAll(
+            Arrays.stream(Materials.values())
+                .parallel()
+                .filter(OrePrefixes.ingotHot::doGenerateItem)
+                .filter(m -> m.mBlastFurnaceTemp < 1750 && m.mAutoGenerateBlastFurnaceRecipes)
+                .collect(Collectors.toSet()));
+        OrePrefixes.ingotHot.disableComponent(Materials.Reinforced);
+        OrePrefixes.ingotHot.disableComponent(Materials.ConductiveIron);
+        OrePrefixes.ingotHot.disableComponent(Materials.FierySteel);
+        OrePrefixes.ingotHot.disableComponent(Materials.ElectricalSteel);
+        OrePrefixes.ingotHot.disableComponent(Materials.EndSteel);
+        OrePrefixes.ingotHot.disableComponent(Materials.Soularium);
+        OrePrefixes.ingotHot.disableComponent(Materials.EnergeticSilver);
+        OrePrefixes.ingotHot.disableComponent(Materials.Cheese);
+        OrePrefixes.ingotHot.disableComponent(Materials.Calcium);
+        OrePrefixes.ingotHot.disableComponent(Materials.Flerovium);
+        OrePrefixes.ingotHot.disableComponent(Materials.Cobalt);
+        OrePrefixes.ingotHot.disableComponent(Materials.RedstoneAlloy);
+        OrePrefixes.ingotHot.disableComponent(Materials.Ardite);
+        OrePrefixes.ingotHot.disableComponent(Materials.DarkSteel);
+        OrePrefixes.ingotHot.disableComponent(Materials.EnergeticAlloy);
+        OrePrefixes.ingotHot.disableComponent(Materials.PulsatingIron);
+        OrePrefixes.ingotHot.disableComponent(Materials.CrudeSteel);
+    }
+
     /**
      * Init rendering properties. Will be called at pre init by GT client proxy.
      */