Always enable all material components (#2380)

9 files changed, 30 insertions, 486 deletions

diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index 763c4210c9..6848c66a38 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -255,7 +255,7 @@ public class GregTech_API {
      * The Configuration Objects
      */
     public static GT_Config sRecipeFile = null, sMachineFile = null, sWorldgenFile = null, sMaterialProperties = null,
-        sMaterialComponents = null, sUnification = null, sSpecialFile = null, sClientDataFile, sOPStuff = null;
+        sUnification = null, sSpecialFile = null, sClientDataFile, sOPStuff = null;
 
     public static int TICKS_FOR_LAG_AVERAGING = 25, MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING = 100;
     /**
diff --git a/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java b/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java
index 0b621d4461..b65ac53499 100644
--- a/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java
+++ b/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java
@@ -623,10 +623,4 @@ public class GTNH_ExtraMaterials implements IMaterialHandler {
     public void onMaterialsInit() {
         initSubTags();
     }
-
-    @Override
-    public void onComponentInit() {}
-
-    @Override
-    public void onComponentIteration(Materials aMaterial) {}
 }
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.
      */
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java
index f0ee636f8b..e86b0ee9b1 100644
--- a/src/main/java/gregtech/api/enums/OrePrefixes.java
+++ b/src/main/java/gregtech/api/enums/OrePrefixes.java
@@ -3,7 +3,6 @@ package gregtech.api.enums;
 import static gregtech.api.enums.GT_Values.B;
 import static gregtech.api.enums.GT_Values.D2;
 import static gregtech.api.enums.GT_Values.M;
-import static gregtech.api.enums.Mods.GTPlusPlus;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -16,10 +15,8 @@ import net.minecraft.item.ItemStack;
 
 import com.google.common.collect.ImmutableList;
 
-import gregtech.api.GregTech_API;
 import gregtech.api.enums.TC_Aspects.TC_AspectStack;
 import gregtech.api.interfaces.ICondition;
-import gregtech.api.interfaces.IMaterialHandler;
 import gregtech.api.interfaces.IOreRecipeRegistrator;
 import gregtech.api.interfaces.ISubTagContainer;
 import gregtech.api.objects.GT_ArrayList;
@@ -1143,394 +1140,6 @@ public enum OrePrefixes {
         }
     }
 
-    public static void initMaterialComponents() {
-        boolean enablePerItemSettings = GregTech_API.sMaterialComponents.get("general", "enablePerItemSettings", false);
-        boolean enableUnusedIngotHot = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedIngotHot", false);
-        boolean enableUnusedPlates = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedPlates", false);
-        boolean enableUnusedDoubleIngots = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedDoubleIngots", false);
-        boolean enableUnusedTripleIngots = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedTripleIngots", false);
-        boolean enableUnusedQuadIngots = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedQuadIngots", false);
-        boolean enableUnusedQuinIngots = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedQuinIngots", false);
-        boolean enableUnusedDoublePlates = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedDoublePlates", false);
-        boolean enableUnusedTriplePlates = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedTriplePlates", false);
-        boolean enableUnusedQuadPlates = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedQuadPlates", false);
-        boolean enableUnusedQuinPlates = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedQuinPlates", false);
-        boolean enableUnusedDensePlates = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedDensePlates", false);
-        boolean enableUnusedGears = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedGears", false);
-        boolean enableUnusedSmallGears = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedSmallGears", false);
-        boolean enableUnusedRings = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedRings", false);
-        boolean enableUnusedSprings = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedSprings", false);
-        boolean enableUnusedSmallSprings = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedSmallSprings", false);
-        boolean enableUnusedRounds = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedRounds", false);
-        boolean enableUnusedRotors = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedRotors", false);
-        boolean enableUnusedFineWires = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedFineWires", false);
-        boolean enableUnusedFoil = GregTech_API.sMaterialComponents.get("globalcomponents", "enableUnusedFoil", false);
-        boolean enableUnusedArrows = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedArrowHeads", false);
-        boolean enableUnusedCrates = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedCrates", false);
-        boolean enableUnusedBolts = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedBolts", false);
-        boolean enableUnusedScrews = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedScrews", false);
-        boolean enableUnusedRods = GregTech_API.sMaterialComponents.get("globalcomponents", "enableUnusedRods", false);
-        boolean enableUnusedLongRods = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedLongRods", false);
-        boolean enableUnusedGems = GregTech_API.sMaterialComponents.get("globalcomponents", "enableUnusedGems", false);
-        boolean enableUnusedItemCasing = GregTech_API.sMaterialComponents
-            .get("globalcomponents", "enableUnusedItemCasing", false);
-
-        // TODO possibly use OrePrefix mNotGeneratedItems/mGeneratedItems instead of a static List for every material
-        // instance?
-        // TODO Make sure stuff like gem plates / standard plates / paper plates all generate with the current condition
-        for (Materials aMaterial : Materials.values()) {
-            if (aMaterial.mMetaItemSubID > 0) {
-                if (aMaterial.mBlastFurnaceTemp <= 1750) ingotHot.mDisabledItems.add(aMaterial); // Moved HotIngot code
-                                                                                                 // from
-                                                                                                 // GT_MetaGenerated_Item_01
-                                                                                                 // so all this is in
-                                                                                                 // once
-                // place
-                if (!enableUnusedSprings && (aMaterial != Materials.Titanium)) spring.mDisabledItems.add(aMaterial);
-                if (!enableUnusedSmallSprings) springSmall.mDisabledItems.add(aMaterial);
-                if (!enableUnusedRounds && !(aMaterial == Materials.HSSE || aMaterial == Materials.Neutronium
-                    || aMaterial == Materials.HSSG)) round.mDisabledItems.add(aMaterial);
-                if (!enableUnusedCrates) {
-                    if (!(aMaterial == Materials.DamascusSteel || aMaterial == Materials.Steel
-                        || aMaterial == Materials.Bronze
-                        || aMaterial == Materials.Manganese)) crateGtIngot.mDisabledItems.add(aMaterial);
-                    if (!(aMaterial == Materials.Neodymium || aMaterial == Materials.Chrome))
-                        crateGtDust.mDisabledItems.add(aMaterial);
-                    crateGtGem.mDisabledItems.add(aMaterial);
-                    crateGtPlate.mDisabledItems.add(aMaterial);
-                }
-                if (!enableUnusedArrows) {
-                    toolHeadArrow.mDisabledItems.add(aMaterial);
-                    arrowGtPlastic.mDisabledItems.add(aMaterial);
-                    if (!(aMaterial == Materials.DamascusSteel || aMaterial == Materials.SterlingSilver))
-                        arrowGtWood.mDisabledItems.add(aMaterial);
-                }
-                // Plates
-                if (!enableUnusedPlates && ((aMaterial.mTypes & 0x40) == 0)
-                    && !(aMaterial == Materials.Silicon || aMaterial == Materials.Zinc
-                        || aMaterial == Materials.Europium
-                        || aMaterial == Materials.Americium
-                        || aMaterial == Materials.RedAlloy
-                        || aMaterial == Materials.SolderingAlloy
-                        || aMaterial == Materials.BatteryAlloy
-                        || aMaterial == Materials.AnnealedCopper
-                        || aMaterial == Materials.Firestone
-                        || aMaterial == Materials.VanadiumGallium
-                        || aMaterial == Materials.YttriumBariumCuprate
-                        || aMaterial == Materials.NiobiumTitanium
-                        || aMaterial == Materials.CertusQuartz
-                        || aMaterial == Materials.NetherQuartz
-                        || aMaterial == Materials.Lazurite
-                        || aMaterial == Materials.Lapis
-                        || aMaterial == Materials.Paper
-                        || aMaterial == Materials.Jasper
-                        || aMaterial == Materials.Dilithium
-                        || aMaterial == Materials.Forcicium
-                        || aMaterial == Materials.Forcillium
-                        || aMaterial == Materials.EnderPearl
-                        || aMaterial == Materials.EnderEye
-                        || aMaterial == Materials.Glass
-                        || aMaterial == Materials.Copper
-                        || aMaterial == Materials.Tin
-                        || aMaterial == Materials.Redstone
-                        || aMaterial == Materials.Sodalite
-                        || aMaterial == Materials.Gallium
-                        || aMaterial == Materials.GalliumArsenide
-                        || aMaterial == Materials.IndiumGalliumPhosphide))
-                    plate.mDisabledItems.add(aMaterial);
-                if (!enableUnusedIngotHot) {
-                    ingotHot.mDisabledItems.add(aMaterial);
-                }
-                // Ingot/Plate Storage
-                if (!enableUnusedDoubleIngots) ingotDouble.mDisabledItems.add(aMaterial);
-                if (!enableUnusedTripleIngots) ingotTriple.mDisabledItems.add(aMaterial);
-                if (!enableUnusedQuadIngots) ingotQuadruple.mDisabledItems.add(aMaterial);
-                if (!enableUnusedQuinIngots) ingotQuintuple.mDisabledItems.add(aMaterial);
-                if (!enableUnusedDoublePlates && ((aMaterial.mTypes & 0x40) == 0)
-                    && !(aMaterial == Materials.Paper || aMaterial == Materials.Aluminium
-                        || aMaterial == Materials.Steel
-                        || aMaterial == Materials.TungstenSteel))
-                    plateDouble.mDisabledItems.add(aMaterial);
-                if (!enableUnusedTriplePlates && !(aMaterial == Materials.Paper))
-                    plateTriple.mDisabledItems.add(aMaterial);
-                if (!enableUnusedQuadPlates && !(aMaterial == Materials.Paper))
-                    plateQuadruple.mDisabledItems.add(aMaterial);
-                if (!enableUnusedQuinPlates && !(aMaterial == Materials.Paper))
-                    plateQuintuple.mDisabledItems.add(aMaterial);
-                if (!(enableUnusedDensePlates || GTPlusPlus.isModLoaded())
-                    && !(aMaterial == Materials.Iron || aMaterial == Materials.Copper
-                        || aMaterial == Materials.Lead
-                        || aMaterial == Materials.Paper
-                        || aMaterial == Materials.Thaumium
-                        || aMaterial == Materials.Titanium))
-                    plateDense.mDisabledItems.add(aMaterial);
-                // Rotors
-                if (!enableUnusedRotors && !(aMaterial == Materials.Titanium || aMaterial == Materials.Chrome
-                    || aMaterial == Materials.Tin
-                    || aMaterial == Materials.Osmium
-                    || aMaterial == Materials.Iridium
-                    || aMaterial == Materials.Bronze
-                    || aMaterial == Materials.Steel
-                    || aMaterial == Materials.StainlessSteel
-                    || aMaterial == Materials.TungstenSteel
-                    || aMaterial == Materials.HSSG
-                    || aMaterial == Materials.HSSE
-                    || aMaterial == Materials.Neutronium)) rotor.mDisabledItems.add(aMaterial);
-                // Rings
-                if (!enableUnusedRings && !(aMaterial == Materials.Titanium || aMaterial == Materials.Chrome
-                    || aMaterial == Materials.Iron
-                    || aMaterial == Materials.Tin
-                    || aMaterial == Materials.Osmium
-                    || aMaterial == Materials.Iridium
-                    || aMaterial == Materials.Bronze
-                    || aMaterial == Materials.WroughtIron
-                    || aMaterial == Materials.Steel
-                    || aMaterial == Materials.StainlessSteel
-                    || aMaterial == Materials.PigIron
-                    || aMaterial == Materials.TungstenSteel
-                    || aMaterial == Materials.Rubber
-                    || aMaterial == Materials.HSSE
-                    || aMaterial == Materials.Neutronium
-                    || aMaterial == Materials.HSSG
-                    || aMaterial == Materials.Aluminium
-                    || aMaterial == Materials.Invar
-                    || aMaterial == Materials.Brass
-                    || aMaterial == Materials.Paper
-                    || aMaterial == Materials.Silicone
-                    || aMaterial == Materials.StyreneButadieneRubber)) ring.mDisabledItems.add(aMaterial);
-                // Foil
-                if (!enableUnusedFoil && !(aMaterial == Materials.Zinc || aMaterial == Materials.Aluminium
-                    || aMaterial == Materials.Silicon
-                    || aMaterial == Materials.Gold
-                    || aMaterial == Materials.Electrum
-                    || aMaterial == Materials.Platinum
-                    || aMaterial == Materials.Osmiridium
-                    || aMaterial == Materials.Osmium
-                    || aMaterial == Materials.AnnealedCopper
-                    || aMaterial == Materials.Steel
-                    || aMaterial == Materials.Copper
-                    || aMaterial == Materials.YttriumBariumCuprate
-                    || aMaterial == Materials.VanadiumGallium
-                    || aMaterial == Materials.NiobiumTitanium
-                    || aMaterial == Materials.Naquadah
-                    || aMaterial == Materials.Manganese
-                    || aMaterial == Materials.Plastic
-                    || aMaterial == Materials.Silicone
-                    || aMaterial == Materials.PolyvinylChloride
-                    || aMaterial == Materials.PolyphenyleneSulfide
-                    || aMaterial == Materials.Nichrome
-                    || aMaterial == Materials.BlackSteel
-                    || aMaterial == Materials.Titanium
-                    || aMaterial == Materials.TungstenSteel
-                    || aMaterial == Materials.Tungsten
-                    || aMaterial == Materials.HSSG
-                    || aMaterial == Materials.NaquadahAlloy
-                    || aMaterial == Materials.Duranium
-                    || aMaterial == Materials.Europium
-                    || aMaterial == Materials.Bedrockium)) foil.mDisabledItems.add(aMaterial);
-                // Fine Wire
-                if (!enableUnusedFineWires && !(aMaterial == Materials.Steel || aMaterial == Materials.AnnealedCopper
-                    || aMaterial == Materials.Platinum
-                    || aMaterial == Materials.Osmium
-                    || aMaterial == Materials.Tin
-                    || aMaterial == Materials.Lead
-                    || aMaterial == Materials.SolderingAlloy
-                    || aMaterial == Materials.Copper
-                    || aMaterial == Materials.Electrum
-                    || aMaterial == Materials.Gold
-                    || aMaterial == Materials.RedAlloy
-                    || aMaterial == Materials.Graphene
-                    || aMaterial == Materials.NiobiumTitanium
-                    || aMaterial == Materials.YttriumBariumCuprate
-                    || aMaterial == Materials.BloodInfusedIron
-                    || aMaterial == MaterialsUEVplus.Universium
-                    || aMaterial == MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter
-                    || aMaterial == MaterialsUEVplus.Eternity)) wireFine.mDisabledItems.add(aMaterial);
-                // Gears
-                if (!enableUnusedGears && !(aMaterial == Materials.Aluminium || aMaterial == Materials.Titanium
-                    || aMaterial == Materials.Iron
-                    || aMaterial == Materials.Copper
-                    || aMaterial == Materials.Tin
-                    || aMaterial == Materials.Gold
-                    || aMaterial == Materials.Stone
-                    || aMaterial == Materials.Bronze
-                    || aMaterial == Materials.Steel
-                    || aMaterial == Materials.StainlessSteel
-                    || aMaterial == Materials.TungstenSteel
-                    || aMaterial == Materials.CobaltBrass
-                    || aMaterial == Materials.Diamond
-                    || aMaterial == Materials.Wood
-                    || aMaterial == Materials.HSSG
-                    || aMaterial == Materials.HSSE
-                    || aMaterial == Materials.Neutronium)) gearGt.mDisabledItems.add(aMaterial);
-                // Small Gears
-                if (!enableUnusedSmallGears && !(aMaterial == Materials.Aluminium || aMaterial == Materials.Titanium
-                    || aMaterial == Materials.Steel
-                    || aMaterial == Materials.StainlessSteel
-                    || aMaterial == Materials.TungstenSteel
-                    || aMaterial == Materials.HSSG
-                    || aMaterial == Materials.HSSE
-                    || aMaterial == Materials.Neutronium
-                    || aMaterial == Materials.VanadiumGallium
-                    || aMaterial == Materials.Naquadah)) gearGtSmall.mDisabledItems.add(aMaterial);
-                // Bolts
-                if (!enableUnusedBolts && ((aMaterial.mTypes & 0x40) == 0)
-                    && !(aMaterial == Materials.Titanium || aMaterial == Materials.Chrome
-                        || aMaterial == Materials.Iron
-                        || aMaterial == Materials.Tin
-                        || aMaterial == Materials.Osmium
-                        || aMaterial == Materials.Iridium
-                        || aMaterial == Materials.Neutronium
-                        || aMaterial == Materials.Bronze
-                        || aMaterial == Materials.WroughtIron
-                        || aMaterial == Materials.Steel
-                        || aMaterial == Materials.StainlessSteel
-                        || aMaterial == Materials.PigIron
-                        || aMaterial == Materials.TungstenSteel
-                        || aMaterial == Materials.Tungsten
-                        || aMaterial == Materials.HSSE
-                        || aMaterial == Materials.HSSG))
-                    bolt.mDisabledItems.add(aMaterial);
-                // Screws
-                if (!enableUnusedScrews && ((aMaterial.mTypes & 0x40) == 0)
-                    && !(aMaterial == Materials.Titanium || aMaterial == Materials.Chrome
-                        || aMaterial == Materials.Iron
-                        || aMaterial == Materials.Tin
-                        || aMaterial == Materials.Osmium
-                        || aMaterial == Materials.Iridium
-                        || aMaterial == Materials.Neutronium
-                        || aMaterial == Materials.Bronze
-                        || aMaterial == Materials.WroughtIron
-                        || aMaterial == Materials.Steel
-                        || aMaterial == Materials.StainlessSteel
-                        || aMaterial == Materials.PigIron
-                        || aMaterial == Materials.TungstenSteel
-                        || aMaterial == Materials.HSSE
-                        || aMaterial == Materials.HSSG))
-                    screw.mDisabledItems.add(aMaterial);
-                // Rods
-                if (!enableUnusedRods && ((aMaterial.mTypes & 0x40) == 0)
-                    && !(aMaterial == Materials.Titanium || aMaterial == Materials.Chrome
-                        || aMaterial == Materials.Iron
-                        || aMaterial == Materials.Tin
-                        || aMaterial == Materials.Osmium
-                        || aMaterial == Materials.Iridium
-                        || aMaterial == Materials.Neutronium
-                        || aMaterial == Materials.Bronze
-                        || aMaterial == Materials.WroughtIron
-                        || aMaterial == Materials.Steel
-                        || aMaterial == Materials.StainlessSteel
-                        || aMaterial == Materials.PigIron
-                        || aMaterial == Materials.TungstenSteel
-                        || aMaterial == Materials.HSSE
-                        || aMaterial == Materials.HSSG
-                        || aMaterial == Materials.Aluminium
-                        || aMaterial == Materials.Copper
-                        || aMaterial == Materials.Neodymium
-                        || aMaterial == Materials.Europium
-                        || aMaterial == Materials.Platinum
-                        || aMaterial == Materials.Gold
-                        || aMaterial == Materials.Uranium235
-                        || aMaterial == Materials.Plutonium241
-                        || aMaterial == Materials.Americium
-                        || aMaterial == Materials.Brass
-                        || aMaterial == Materials.Electrum
-                        || aMaterial == Materials.NaquadahEnriched
-                        || aMaterial == Materials.CobaltBrass
-                        || aMaterial == Materials.IronMagnetic
-                        || aMaterial == Materials.SteelMagnetic
-                        || aMaterial == Materials.NeodymiumMagnetic
-                        || aMaterial == Materials.Samarium
-                        || aMaterial == Materials.SamariumMagnetic
-                        || aMaterial == Materials.VanadiumGallium
-                        || aMaterial == Materials.Diamond
-                        || aMaterial == Materials.Wood
-                        || aMaterial == Materials.Plastic
-                        || aMaterial == Materials.Lead
-                        || aMaterial == Materials.SolderingAlloy
-                        || aMaterial == Materials.Lapis
-                        || aMaterial == Materials.Lazurite
-                        || aMaterial == Materials.Sodalite
-                        || aMaterial == Materials.PolyvinylChloride))
-                    stick.mDisabledItems.add(aMaterial);
-                // Long Rods
-                if (!enableUnusedLongRods && ((aMaterial.mTypes & 0x40) == 0)
-                    && !(aMaterial == Materials.Titanium || aMaterial == Materials.NeodymiumMagnetic
-                        || aMaterial == Materials.SamariumMagnetic
-                        || aMaterial == Materials.HSSG
-                        || aMaterial == Materials.HSSE
-                        || aMaterial == Materials.Neutronium
-                        || aMaterial == Materials.Americium
-                        || aMaterial == Materials.WroughtIron
-                        || aMaterial == Materials.Magnalium
-                        || aMaterial == Materials.TungstenSteel))
-                    stickLong.mDisabledItems.add(aMaterial);
-
-                if (!enableUnusedGems && ((aMaterial.mTypes & 0x04) == 0)) {
-                    gem.mDisabledItems.add(aMaterial);
-                    gemChipped.mDisabledItems.add(aMaterial);
-                    gemFlawless.mDisabledItems.add(aMaterial);
-                    gemFlawed.mDisabledItems.add(aMaterial);
-                    gemExquisite.mDisabledItems.add(aMaterial);
-                }
-                // itemCasing
-                if (!enableUnusedItemCasing) itemCasing.mDisabledItems.add(aMaterial);
-            }
-        }
-        for (IMaterialHandler aRegistrator : Materials.mMaterialHandlers) {
-            aRegistrator.onComponentInit();
-        }
-        for (Materials aMaterial : Materials.values()) {
-            if (aMaterial.mMetaItemSubID > 0) {
-                for (IMaterialHandler aRegistrator : Materials.mMaterialHandlers) {
-                    aRegistrator.onComponentIteration(aMaterial);
-                }
-                if (enablePerItemSettings) {
-                    StringBuilder aConfigPathSB = new StringBuilder();
-                    aConfigPathSB.append("materialcomponents.")
-                        .append(aMaterial.mConfigSection)
-                        .append(".")
-                        .append(aMaterial.mName);
-                    String aConfigPath = aConfigPathSB.toString();
-                    for (OrePrefixes aPrefix : mPreventableComponents) {
-                        boolean aEnableComponent = GregTech_API.sMaterialComponents
-                            .get(aConfigPath, aPrefix.toString(), !aPrefix.mDisabledItems.contains(aMaterial));
-                        if (!aEnableComponent) { // Disable component if false and is not already in disabled list
-                            aPrefix.disableComponent(aMaterial);
-                        } else { // Enable component if true and is not already in enabled list
-                            aPrefix.enableComponent(aMaterial);
-                        }
-                    }
-                    aConfigPathSB.setLength(0);
-                }
-            }
-        }
-    }
-
     public static boolean isInstanceOf(String aName, OrePrefixes aPrefix) {
         return aName != null && aName.startsWith(aPrefix.toString());
     }
diff --git a/src/main/java/gregtech/api/interfaces/IMaterialHandler.java b/src/main/java/gregtech/api/interfaces/IMaterialHandler.java
index b26951121b..ddd7e832dd 100644
--- a/src/main/java/gregtech/api/interfaces/IMaterialHandler.java
+++ b/src/main/java/gregtech/api/interfaces/IMaterialHandler.java
@@ -1,12 +1,6 @@
 package gregtech.api.interfaces;
 
-import gregtech.api.enums.Materials;
-
 public interface IMaterialHandler {
 
     void onMaterialsInit();
-
-    void onComponentInit();
-
-    void onComponentIteration(Materials aMaterial);
 }
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index a33e4571d2..e5e4fd0524 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -607,7 +607,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG
     private World mUniverse = null;
     public boolean mTEMachineRecipes = false;
     public boolean mEnableAllMaterials = false;
-    public boolean mEnableAllComponents = false;
     public boolean mEnableCleanroom = true;
     public boolean mLowGravProcessing = false;
     public boolean mAprilFool = false;
diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java
index d3003e8682..4fb7388367 100644
--- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java
+++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java
@@ -13,7 +13,7 @@ public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandle
     /**
      * To add a new material, please see the following example:
      * <blockquote>
-     * 
+     *
      * <pre>
      * int numberOfMaterialSlots = GregTech_API.sMaterialProperties.get("general", "AmountOfCustomMaterialSlots", 16);
      * for (int i = 0; i < numberOfMaterialSlots; i++) {
@@ -46,38 +46,10 @@ public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandle
      *         aID);
      * }
      * </pre>
-     * 
+     *
      * </blockquote>
      */
     @SuppressWarnings("unused")
     @Override
     public void onMaterialsInit() {}
-
-    @Override
-    public void onComponentInit() {
-        // This is left here as an example of how to add components.
-        // TODO: convert the example to a javadoc
-        /*
-         * Enabling specific components: OrePrefixes.spring.enableComponent(Materials.Cobalt);
-         * OrePrefixes.ingotDouble.enableComponent(Materials.Cobalt);
-         * OrePrefixes.ingotTriple.enableComponent(Materials.Cobalt);
-         * OrePrefixes.ingotQuadruple.enableComponent(Materials.Cobalt);
-         * OrePrefixes.ingotQuintuple.enableComponent(Materials.Cobalt);
-         * OrePrefixes.plateDouble.enableComponent(Materials.Cobalt);
-         * OrePrefixes.plateTriple.enableComponent(Materials.Cobalt);
-         * OrePrefixes.plateQuadruple.enableComponent(Materials.Cobalt);
-         * OrePrefixes.plateQuintuple.enableComponent(Materials.Cobalt);
-         * OrePrefixes.plateDense.enableComponent(Materials.Cobalt);
-         */
-    }
-
-    @Override
-    public void onComponentIteration(Materials aMaterial) {
-        // This is left here as an example of how to add components.
-        // TODO: convert the example to a javadoc
-        /*
-         * Enabling/Disabling components depending on the current Materials values: if ((aMaterial.mTypes & 0x40) != 0)
-         * { //This material can be made into tool heads OrePrefixes.plateQuadruple.mDisabledItems.remove(aMaterial); }
-         */
-    }
 }
diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
index 8d41622569..c7d5aa32e3 100644
--- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
+++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
@@ -5,7 +5,6 @@ import static gregtech.api.enums.Mods.RotaryCraft;
 import static gregtech.api.enums.Mods.UndergroundBiomes;
 
 import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
 
 public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHandler {
 
@@ -54,22 +53,4 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa
         }
 
     }
-
-    @Override
-    public void onComponentInit() {
-
-        OrePrefixes.ring.enableComponent(Materials.RedAlloy);
-        OrePrefixes.ring.enableComponent(Materials.NiobiumTitanium);
-        OrePrefixes.foil.enableComponent(Materials.StainlessSteel);
-        OrePrefixes.foil.enableComponent(Materials.ChromiumDioxide);
-        OrePrefixes.foil.enableComponent(Materials.Iron);
-        OrePrefixes.plate.enableComponent(Materials.ChromiumDioxide);
-        OrePrefixes.screw.enableComponent(Materials.Copper);
-
-    }
-
-    @Override
-    public void onComponentIteration(Materials aMaterial) {
-        // NOP
-    }
 }
diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java
index 5208c792c1..2f7ed5ca16 100644
--- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java
+++ b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java
@@ -117,8 +117,6 @@ public class GT_PreLoad {
             new Configuration(new File(new File(configDir, "GregTech"), "WorldGeneration.cfg")));
         GregTech_API.sMaterialProperties = new GT_Config(
             new Configuration(new File(new File(configDir, "GregTech"), "MaterialProperties.cfg")));
-        GregTech_API.sMaterialComponents = new GT_Config(
-            new Configuration(new File(new File(configDir, "GregTech"), "MaterialComponents.cfg")));
         GregTech_API.sUnification = new GT_Config(
             new Configuration(new File(new File(configDir, "GregTech"), "Unification.cfg")));
         GregTech_API.sSpecialFile = new GT_Config(
@@ -525,8 +523,6 @@ public class GT_PreLoad {
             .getBoolean(true);
         GT_Mod.gregtechproxy.mEnableAllMaterials = tMainConfig.get("general", "EnableAllMaterials", false)
             .getBoolean(false);
-        GT_Mod.gregtechproxy.mEnableAllComponents = tMainConfig.get("general", "EnableAllComponents", false)
-            .getBoolean(false);
 
         // Pollution: edit GT_Proxy.java to change default values
         GT_Mod.gregtechproxy.mPollution = tMainConfig