Do some recipe cleanup once again (#2897)

* remove unused config "HardCoreCableLoss"

* remove unused config "DisableIC2Cables"

* remove unused booleans

* Spotless apply for branch sort_recipes for #2897 (#2898)

spotlessApply

Co-authored-by: GitHub GTNH Actions <>

* remove unused config "NerfCombs"

* remove unused config "NerfCrops"

* remove unused config "ArcSmeltIntoAnnealedWrought"

* remove unused boolean

* remove unused config "online"

* remove unused stuff

* remove unused config "HardMachineCasings"

* remove unused config "NerfDustCrafting"

* exit early

* remove unused config "harderstone"

* decouple recipes from machine registration for
alloy smelter, arc furnace, assembler, autoclave, bending machine, canner, printer, recycler, sifter, slicer, thermal centrifuge, unpackager, wiremill

* decouple recipes from machine registration for
microwave, polarizer,plasma arc furnace, oven, ore washer, mixer, microwave

* decouple recipes from machine registration for
forming press, laser engraver, lathe, macerator, matter amplifier

* decouple recipes from machine registration for
centrifuge, extruder, fermenter, fluid canner, fluid extractor, fluid heater, fluid solidifier, forge hammer

* decouple recipes from machine registration for
chemical bath, chemical reactor, circuit assembler, compressor, cutting machine, distillery, electric furnace, electrolyzer, electromagnetic separator,
extractor

* spotless apply

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>

1 files changed, 226 insertions, 887 deletions

diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index 8fd37fd0d9..2e5cdc10bb 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -41,7 +41,6 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.core.Tabs;
 import forestry.api.recipes.RecipeManagers;
-import gregtech.GT_Mod;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
@@ -187,53 +186,24 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
             new ItemStack[] { Materials.Mica.getDust(2), ItemList.FR_Wax.get(1) },
             new int[] { 100 * 100, 75 * 100 },
             Voltage.HV);
-        if (GT_Mod.gregtechproxy.mNerfedCombs) {
-            addCentrifugeToItemStack(
-                CombType.LIGNIE,
-                new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 1),
-                    ItemList.FR_Wax.get(1) },
-                new int[] { 90 * 100, 50 * 100 },
-                Voltage.ULV);
-            addCentrifugeToItemStack(
-                CombType.COAL,
-                new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1),
-                    ItemList.FR_Wax.get(1) },
-                new int[] { 5 * 100, 50 * 100 },
-                Voltage.ULV);
-            addCentrifugeToItemStack(
-                CombType.OIL,
-                new ItemStack[] { ItemList.Crop_Drop_OilBerry.get(6), GT_Bees.drop.getStackForType(DropType.OIL),
-                    ItemList.FR_Wax.get(1) },
-                new int[] { 100 * 100, 100 * 100, 50 * 100 },
-                Voltage.ULV);
-        } else {
-            addCentrifugeToItemStack(
-                CombType.LIGNIE,
-                new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lignite, 1), ItemList.FR_Wax.get(1) },
-                new int[] { 90 * 100, 100 * 100, 50 * 100 },
-                Voltage.ULV);
-            addCentrifugeToItemStack(
-                CombType.COAL,
-                new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Coal, 1), ItemList.FR_Wax.get(1) },
-                new int[] { 5 * 100, 100 * 100, 50 * 100 },
-                Voltage.ULV);
-            addCentrifugeToItemStack(
-                CombType.OIL,
-                new ItemStack[] { ItemList.Crop_Drop_OilBerry.get(6), GT_Bees.drop.getStackForType(DropType.OIL),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Oilsands, 1), ItemList.FR_Wax.get(1) },
-                new int[] { 100 * 100, 100 * 100, 100 * 100, 50 * 100 },
-                Voltage.ULV);
-            addCentrifugeToMaterial(
-                CombType.APATITE,
-                new Materials[] { Materials.Apatite, Materials.Phosphate },
-                new int[] { 100 * 100, 80 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-        }
+
+        addCentrifugeToItemStack(
+            CombType.LIGNIE,
+            new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 1), ItemList.FR_Wax.get(1) },
+            new int[] { 90 * 100, 50 * 100 },
+            Voltage.ULV);
+        addCentrifugeToItemStack(
+            CombType.COAL,
+            new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1), ItemList.FR_Wax.get(1) },
+            new int[] { 5 * 100, 50 * 100 },
+            Voltage.ULV);
+        addCentrifugeToItemStack(
+            CombType.OIL,
+            new ItemStack[] { ItemList.Crop_Drop_OilBerry.get(6), GT_Bees.drop.getStackForType(DropType.OIL),
+                ItemList.FR_Wax.get(1) },
+            new int[] { 100 * 100, 100 * 100, 50 * 100 },
+            Voltage.ULV);
+
         // ic2
         addCentrifugeToItemStack(
             CombType.COOLANT,
@@ -292,171 +262,88 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
                 GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Enderium, 1) },
             new int[] { 50 * 100, 30 * 100, 50 * 100 },
             Voltage.HV);
-        if (GT_Mod.gregtechproxy.mNerfedCombs) {
-            addCentrifugeToMaterial(
-                CombType.REDALLOY,
-                new Materials[] { Materials.RedAlloy },
-                new int[] { 100 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                ItemList.FR_RefractoryWax.get(1),
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.REDSTONEALLOY,
-                new Materials[] { Materials.RedstoneAlloy },
-                new int[] { 100 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                ItemList.FR_RefractoryWax.get(1),
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.CONDUCTIVEIRON,
-                new Materials[] { Materials.ConductiveIron },
-                new int[] { 90 * 100 },
-                new int[] {},
-                Voltage.MV,
-                ItemList.FR_RefractoryWax.get(1),
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.VIBRANTALLOY,
-                new Materials[] { Materials.VibrantAlloy },
-                new int[] { 70 * 100 },
-                new int[] {},
-                Voltage.HV,
-                ItemList.FR_RefractoryWax.get(1),
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.ENERGETICALLOY,
-                new Materials[] { Materials.EnergeticAlloy },
-                new int[] { 80 * 100 },
-                new int[] {},
-                Voltage.HV,
-                ItemList.FR_RefractoryWax.get(1),
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.ELECTRICALSTEEL,
-                new Materials[] { Materials.ElectricalSteel },
-                new int[] { 100 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                ItemList.FR_RefractoryWax.get(1),
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.DARKSTEEL,
-                new Materials[] { Materials.DarkSteel },
-                new int[] { 100 * 100 },
-                new int[] {},
-                Voltage.MV,
-                ItemList.FR_RefractoryWax.get(1),
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.PULSATINGIRON,
-                new Materials[] { Materials.PulsatingIron },
-                new int[] { 80 * 100 },
-                new int[] {},
-                Voltage.HV,
-                ItemList.FR_RefractoryWax.get(1),
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.STAINLESSSTEEL,
-                new Materials[] { Materials.StainlessSteel },
-                new int[] { 50 * 100 },
-                new int[] {},
-                Voltage.HV,
-                ItemList.FR_RefractoryWax.get(1),
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.BEDROCKIUM,
-                new Materials[] { Materials.Bedrockium },
-                new int[] { 50 * 100 },
-                new int[] {},
-                Voltage.EV,
-                ItemList.FR_RefractoryWax.get(1),
-                50 * 100);
 
-        } else {
-            addCentrifugeToMaterial(
-                CombType.REDALLOY,
-                new Materials[] { Materials.RedAlloy, Materials.Redstone, Materials.Copper },
-                new int[] { 100 * 100, 75 * 100, 90 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                ItemList.FR_RefractoryWax.get(1),
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.REDSTONEALLOY,
-                new Materials[] { Materials.RedstoneAlloy, Materials.Redstone, Materials.Silicon, Materials.Coal },
-                new int[] { 100 * 100, 90 * 100, 75 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                ItemList.FR_RefractoryWax.get(1),
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.CONDUCTIVEIRON,
-                new Materials[] { Materials.ConductiveIron, Materials.Silver, Materials.Iron },
-                new int[] { 90 * 100, 55 * 100, 65 * 100 },
-                new int[] {},
-                Voltage.MV,
-                ItemList.FR_RefractoryWax.get(1),
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.VIBRANTALLOY,
-                new Materials[] { Materials.VibrantAlloy, Materials.Chrome },
-                new int[] { 70 * 100, 50 * 100 },
-                new int[] {},
-                Voltage.HV,
-                ItemList.FR_RefractoryWax.get(1),
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.ENERGETICALLOY,
-                new Materials[] { Materials.EnergeticAlloy, Materials.Gold },
-                new int[] { 80 * 100, 60 * 100 },
-                new int[] {},
-                Voltage.HV,
-                ItemList.FR_RefractoryWax.get(1),
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.ELECTRICALSTEEL,
-                new Materials[] { Materials.ElectricalSteel, Materials.Silicon, Materials.Coal },
-                new int[] { 100 * 100, 75 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                ItemList.FR_RefractoryWax.get(1),
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.DARKSTEEL,
-                new Materials[] { Materials.DarkSteel, Materials.Coal },
-                new int[] { 100 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.MV,
-                ItemList.FR_RefractoryWax.get(1),
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.PULSATINGIRON,
-                new Materials[] { Materials.PulsatingIron, Materials.Iron },
-                new int[] { 80 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.HV,
-                ItemList.FR_RefractoryWax.get(1),
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.STAINLESSSTEEL,
-                new Materials[] { Materials.StainlessSteel, Materials.Iron, Materials.Chrome, Materials.Manganese,
-                    Materials.Nickel },
-                new int[] { 50 * 100, 75 * 100, 55 * 100, 75 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.HV,
-                ItemList.FR_RefractoryWax.get(1),
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.BEDROCKIUM,
-                new Materials[] { Materials.Bedrockium },
-                new int[] { 50 * 100 },
-                new int[] {},
-                Voltage.EV,
-                ItemList.FR_RefractoryWax.get(1),
-                50 * 100);
-        }
+        addCentrifugeToMaterial(
+            CombType.REDALLOY,
+            new Materials[] { Materials.RedAlloy },
+            new int[] { 100 * 100 },
+            new int[] {},
+            Voltage.ULV,
+            ItemList.FR_RefractoryWax.get(1),
+            50 * 100);
+        addCentrifugeToMaterial(
+            CombType.REDSTONEALLOY,
+            new Materials[] { Materials.RedstoneAlloy },
+            new int[] { 100 * 100 },
+            new int[] {},
+            Voltage.ULV,
+            ItemList.FR_RefractoryWax.get(1),
+            50 * 100);
+        addCentrifugeToMaterial(
+            CombType.CONDUCTIVEIRON,
+            new Materials[] { Materials.ConductiveIron },
+            new int[] { 90 * 100 },
+            new int[] {},
+            Voltage.MV,
+            ItemList.FR_RefractoryWax.get(1),
+            50 * 100);
+        addCentrifugeToMaterial(
+            CombType.VIBRANTALLOY,
+            new Materials[] { Materials.VibrantAlloy },
+            new int[] { 70 * 100 },
+            new int[] {},
+            Voltage.HV,
+            ItemList.FR_RefractoryWax.get(1),
+            50 * 100);
+        addCentrifugeToMaterial(
+            CombType.ENERGETICALLOY,
+            new Materials[] { Materials.EnergeticAlloy },
+            new int[] { 80 * 100 },
+            new int[] {},
+            Voltage.HV,
+            ItemList.FR_RefractoryWax.get(1),
+            50 * 100);
+        addCentrifugeToMaterial(
+            CombType.ELECTRICALSTEEL,
+            new Materials[] { Materials.ElectricalSteel },
+            new int[] { 100 * 100 },
+            new int[] {},
+            Voltage.ULV,
+            ItemList.FR_RefractoryWax.get(1),
+            50 * 100);
+        addCentrifugeToMaterial(
+            CombType.DARKSTEEL,
+            new Materials[] { Materials.DarkSteel },
+            new int[] { 100 * 100 },
+            new int[] {},
+            Voltage.MV,
+            ItemList.FR_RefractoryWax.get(1),
+            50 * 100);
+        addCentrifugeToMaterial(
+            CombType.PULSATINGIRON,
+            new Materials[] { Materials.PulsatingIron },
+            new int[] { 80 * 100 },
+            new int[] {},
+            Voltage.HV,
+            ItemList.FR_RefractoryWax.get(1),
+            50 * 100);
+        addCentrifugeToMaterial(
+            CombType.STAINLESSSTEEL,
+            new Materials[] { Materials.StainlessSteel },
+            new int[] { 50 * 100 },
+            new int[] {},
+            Voltage.HV,
+            ItemList.FR_RefractoryWax.get(1),
+            50 * 100);
+        addCentrifugeToMaterial(
+            CombType.BEDROCKIUM,
+            new Materials[] { Materials.Bedrockium },
+            new int[] { 50 * 100 },
+            new int[] {},
+            Voltage.EV,
+            ItemList.FR_RefractoryWax.get(1),
+            50 * 100);
+
         // Thaumic
         addProcessGT(CombType.THAUMIUMDUST, new Materials[] { Materials.Thaumium }, Voltage.MV);
         addCentrifugeToItemStack(
@@ -493,7 +380,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
         addCentrifugeToMaterial(
             CombType.ASTRALSILVER,
             new Materials[] { Materials.AstralSilver, Materials.Silver },
-            new int[] { 20 * 100, (GT_Mod.gregtechproxy.mNerfedCombs ? 10 : 75) * 100 },
+            new int[] { 20 * 100, 10 * 100 },
             new int[] {},
             Voltage.HV,
             GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
@@ -509,7 +396,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
         addCentrifugeToMaterial(
             CombType.SHADOWMETAL,
             new Materials[] { Materials.Shadow, Materials.ShadowSteel },
-            new int[] { (GT_Mod.gregtechproxy.mNerfedCombs ? 20 : 75) * 100, 10 * 100 },
+            new int[] { 20 * 100, 10 * 100 },
             new int[] {},
             Voltage.HV,
             GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
@@ -521,8 +408,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
                 GT_ModHandler.getModItem(ExtraUtilities.ID, "unstableingot", 1, 1),
                 GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1),
                 GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Diamond, 1) },
-            new int[] { 50 * 100, 20 * 100, (GT_Mod.gregtechproxy.mNerfedCombs ? 10 : 75) * 100,
-                (GT_Mod.gregtechproxy.mNerfedCombs ? 5 : 55) * 100 },
+            new int[] { 50 * 100, 20 * 100, 10 * 100, 5 * 100 },
             Voltage.HV);
         addProcessGT(CombType.SPARKELING, new Materials[] { Materials.NetherStar }, Voltage.EV);
         addCentrifugeToItemStack(
@@ -530,56 +416,23 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
             new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
                 GT_ModHandler.getModItem(MagicBees.ID, "miscResources", 2, 5),
                 GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NetherStar, 1) },
-            new int[] { 50 * 100, 10 * 100, (GT_Mod.gregtechproxy.mNerfedCombs ? 10 : 50) * 100 },
+            new int[] { 50 * 100, 10 * 100, 10 * 100 },
             Voltage.EV);
-        if (GT_Mod.gregtechproxy.mNerfedCombs) {
-            addCentrifugeToMaterial(
-                CombType.THAUMIUMDUST,
-                new Materials[] { Materials.Thaumium },
-                new int[] { 100 * 100 },
-                new int[] {},
-                Voltage.MV,
-                GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
-                50 * 100);
-            addCentrifugeToItemStack(
-                CombType.QUICKSILVER,
-                new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
-                    GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1, 5) },
-                new int[] { 50 * 100, 100 * 100 },
-                Voltage.ULV);
-        } else {
-            addCentrifugeToMaterial(
-                CombType.THAUMIUMDUST,
-                new Materials[] { Materials.Thaumium, Materials.Iron },
-                new int[] { 100 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.MV,
-                GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.AMBER,
-                new Materials[] { Materials.Amber },
-                new int[] { 100 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
-                50 * 100);
-            addCentrifugeToItemStack(
-                CombType.QUICKSILVER,
-                new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
-                    GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1, 5),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Cinnabar, 1) },
-                new int[] { 50 * 100, 100 * 100, 85 * 100 },
-                Voltage.ULV);
-            addCentrifugeToMaterial(
-                CombType.MITHRIL,
-                new Materials[] { Materials.Mithril, Materials.Platinum },
-                new int[] { 75 * 100, 55 * 100 },
-                new int[] {},
-                Voltage.HV,
-                GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
-                50 * 100);
-        }
+
+        addCentrifugeToMaterial(
+            CombType.THAUMIUMDUST,
+            new Materials[] { Materials.Thaumium },
+            new int[] { 100 * 100 },
+            new int[] {},
+            Voltage.MV,
+            GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
+            50 * 100);
+        addCentrifugeToItemStack(
+            CombType.QUICKSILVER,
+            new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
+                GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1, 5) },
+            new int[] { 50 * 100, 100 * 100 },
+            Voltage.ULV);
 
         // Gem Line
         addProcessGT(CombType.STONE, new Materials[] { Materials.Soapstone }, Voltage.LV);
@@ -605,147 +458,24 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
         addProcessGT(CombType.FIRESTONE, new Materials[] { Materials.Firestone }, Voltage.LV);
         addProcessGT(CombType.PYROPE, new Materials[] { Materials.Pyrope }, Voltage.LV);
         addProcessGT(CombType.GROSSULAR, new Materials[] { Materials.Grossular }, Voltage.LV);
-        if (GT_Mod.gregtechproxy.mNerfedCombs) {
-            addCentrifugeToMaterial(
-                CombType.STONE,
-                new Materials[] { Materials.Stone, Materials.GraniteBlack, Materials.GraniteRed, Materials.Basalt,
-                    Materials.Marble, Materials.Redrock },
-                new int[] { 70 * 100, 50 * 100, 50 * 100, 50 * 100, 50 * 100, 50 * 100 },
-                new int[] { 9, 9, 9, 9, 9, 9 },
-                Voltage.ULV,
-                NI,
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.FLUIX,
-                new Materials[] { Materials.Fluix },
-                new int[] { 25 * 100 },
-                new int[] { 9 },
-                Voltage.ULV,
-                NI,
-                30 * 100);
-        } else {
-            addCentrifugeToMaterial(
-                CombType.STONE,
-                new Materials[] { Materials.Soapstone, Materials.Talc, Materials.Apatite, Materials.Phosphate,
-                    Materials.TricalciumPhosphate },
-                new int[] { 95 * 100, 90 * 100, 80 * 100, 75 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.CERTUS,
-                new Materials[] { Materials.CertusQuartz, Materials.Quartzite, Materials.Barite },
-                new int[] { 100 * 100, 80 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                50 * 100);
-            addCentrifugeToMaterial(
-                CombType.FLUIX,
-                new Materials[] { Materials.Fluix, Materials.Redstone, Materials.CertusQuartz, Materials.NetherQuartz },
-                new int[] { 25 * 100, 90 * 100, 90 * 100, 90 * 100 },
-                new int[] { 9, 1, 1, 1 },
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.REDSTONE,
-                new Materials[] { Materials.Redstone, Materials.Cinnabar },
-                new int[] { 100 * 100, 80 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.LAPIS,
-                new Materials[] { Materials.Lapis, Materials.Sodalite, Materials.Lazurite, Materials.Calcite },
-                new int[] { 100 * 100, 90 * 100, 90 * 100, 85 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.RUBY,
-                new Materials[] { Materials.Ruby, Materials.Redstone },
-                new int[] { 100 * 100, 90 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.REDGARNET,
-                new Materials[] { Materials.GarnetRed, Materials.GarnetYellow },
-                new int[] { 100 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.YELLOWGARNET,
-                new Materials[] { Materials.GarnetYellow, Materials.GarnetRed },
-                new int[] { 100 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.SAPPHIRE,
-                new Materials[] { Materials.Sapphire, Materials.GreenSapphire, Materials.Almandine, Materials.Pyrope },
-                new int[] { 100 * 100, 90 * 100, 90 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.DIAMOND,
-                new Materials[] { Materials.Diamond, Materials.Graphite },
-                new int[] { 100 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.OLIVINE,
-                new Materials[] { Materials.Olivine, Materials.Bentonite, Materials.Magnesite, Materials.Glauconite },
-                new int[] { 100 * 100, 90 * 100, 80 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.EMERALD,
-                new Materials[] { Materials.Emerald, Materials.Beryllium, Materials.Thorium },
-                new int[] { 100 * 100, 85 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.FIRESTONE,
-                new Materials[] { Materials.Firestone },
-                new int[] { 100 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                ItemList.FR_RefractoryWax.get(1),
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.PYROPE,
-                new Materials[] { Materials.Pyrope, Materials.Aluminium, Materials.Magnesium, Materials.Silicon },
-                new int[] { 100 * 100, 75 * 100, 80 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.GROSSULAR,
-                new Materials[] { Materials.Grossular, Materials.Aluminium, Materials.Silicon },
-                new int[] { 100 * 100, 75 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-        }
+
+        addCentrifugeToMaterial(
+            CombType.STONE,
+            new Materials[] { Materials.Stone, Materials.GraniteBlack, Materials.GraniteRed, Materials.Basalt,
+                Materials.Marble, Materials.Redrock },
+            new int[] { 70 * 100, 50 * 100, 50 * 100, 50 * 100, 50 * 100, 50 * 100 },
+            new int[] { 9, 9, 9, 9, 9, 9 },
+            Voltage.ULV,
+            NI,
+            50 * 100);
+        addCentrifugeToMaterial(
+            CombType.FLUIX,
+            new Materials[] { Materials.Fluix },
+            new int[] { 25 * 100 },
+            new int[] { 9 },
+            Voltage.ULV,
+            NI,
+            30 * 100);
 
         // Metals Line
         addProcessGT(CombType.SLAG, new Materials[] { Materials.Limestone }, Voltage.LV);
@@ -763,200 +493,79 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
         addProcessGT(CombType.ARSENIC, new Materials[] { Materials.Arsenic }, Voltage.LV);
         addProcessGT(CombType.IRON, new Materials[] { Materials.Iron }, Voltage.LV);
         addProcessGT(CombType.STEEL, new Materials[] { Materials.Steel }, Voltage.LV);
-        if (GT_Mod.gregtechproxy.mNerfedCombs) {
-            addCentrifugeToMaterial(
-                CombType.SLAG,
-                new Materials[] { Materials.Stone, Materials.GraniteBlack, Materials.GraniteRed },
-                new int[] { 50 * 100, 20 * 100, 20 * 100 },
-                new int[] { 9, 9, 9 },
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.COPPER,
-                new Materials[] { Materials.Copper },
-                new int[] { 70 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.TIN,
-                new Materials[] { Materials.Tin },
-                new int[] { 60 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.LEAD,
-                new Materials[] { Materials.Lead },
-                new int[] { 45 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.IRON,
-                new Materials[] { Materials.Iron },
-                new int[] { 30 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.STEEL,
-                new Materials[] { Materials.Steel },
-                new int[] { 40 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.SILVER,
-                new Materials[] { Materials.Silver },
-                new int[] { 80 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.CRYOLITE,
-                new Materials[] { Materials.Cryolite },
-                new int[] { 80 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.SULFUR,
-                new Materials[] { Materials.Sulfur },
-                new int[] { 100 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-        } else {
-            addCentrifugeToMaterial(
-                CombType.SLAG,
-                new Materials[] { Materials.Salt, Materials.RockSalt, Materials.Lepidolite, Materials.Spodumene,
-                    Materials.Monazite },
-                new int[] { 100 * 100, 100 * 100, 100 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.COPPER,
-                new Materials[] { Materials.Copper, Materials.Tetrahedrite, Materials.Chalcopyrite, Materials.Malachite,
-                    Materials.Pyrite, Materials.Stibnite },
-                new int[] { 100 * 100, 85 * 100, 95 * 100, 80 * 100, 75 * 100, 65 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.TIN,
-                new Materials[] { Materials.Tin, Materials.Cassiterite, Materials.CassiteriteSand },
-                new int[] { 100 * 100, 85 * 100, 65 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.LEAD,
-                new Materials[] { Materials.Lead, Materials.Galena },
-                new int[] { 100 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-
-            addCentrifugeToMaterial(
-                CombType.IRON,
-                new Materials[] { Materials.Iron, Materials.Magnetite, Materials.BrownLimonite,
-                    Materials.YellowLimonite, Materials.VanadiumMagnetite, Materials.MeteoricIron },
-                new int[] { 100 * 100, 90 * 100, 85 * 100, 85 * 100, 80 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.LEAD,
-                new Materials[] { Materials.Steel, Materials.Magnetite, Materials.VanadiumMagnetite,
-                    Materials.Molybdenite, Materials.Molybdenum, Materials.MeteoricIron },
-                new int[] { 100 * 100, 90 * 100, 80 * 100, 65 * 100, 65 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-
-            addCentrifugeToMaterial(
-                CombType.NICKEL,
-                new Materials[] { Materials.Nickel, Materials.Garnierite, Materials.Pentlandite, Materials.Cobaltite,
-                    Materials.Wulfenite, Materials.Powellite },
-                new int[] { 100 * 100, 85 * 100, 85 * 100, 80 * 100, 75 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.ZINC,
-                new Materials[] { Materials.Zinc, Materials.Sphalerite, Materials.Sulfur },
-                new int[] { 100 * 100, 80 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.SILVER,
-                new Materials[] { Materials.Silver, Materials.Galena },
-                new int[] { 100 * 100, 80 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.CRYOLITE,
-                new Materials[] { Materials.Cryolite, Materials.Silver },
-                new int[] { 100 * 100, 80 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.GOLD,
-                new Materials[] { Materials.Gold },
-                new int[] { 100 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.SULFUR,
-                new Materials[] { Materials.Sulfur, Materials.Pyrite, Materials.Sphalerite },
-                new int[] { 100 * 100, 90 * 100, 80 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.GALLIUM,
-                new Materials[] { Materials.Gallium, Materials.Niobium },
-                new int[] { 80 * 100, 75 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-            addCentrifugeToMaterial(
-                CombType.ARSENIC,
-                new Materials[] { Materials.Arsenic, Materials.Bismuth, Materials.Antimony },
-                new int[] { 80 * 100, 70 * 100, 70 * 100 },
-                new int[] {},
-                Voltage.ULV,
-                NI,
-                30 * 100);
-        }
+
+        addCentrifugeToMaterial(
+            CombType.SLAG,
+            new Materials[] { Materials.Stone, Materials.GraniteBlack, Materials.GraniteRed },
+            new int[] { 50 * 100, 20 * 100, 20 * 100 },
+            new int[] { 9, 9, 9 },
+            Voltage.ULV,
+            NI,
+            30 * 100);
+        addCentrifugeToMaterial(
+            CombType.COPPER,
+            new Materials[] { Materials.Copper },
+            new int[] { 70 * 100 },
+            new int[] {},
+            Voltage.ULV,
+            NI,
+            30 * 100);
+        addCentrifugeToMaterial(
+            CombType.TIN,
+            new Materials[] { Materials.Tin },
+            new int[] { 60 * 100 },
+            new int[] {},
+            Voltage.ULV,
+            NI,
+            30 * 100);
+        addCentrifugeToMaterial(
+            CombType.LEAD,
+            new Materials[] { Materials.Lead },
+            new int[] { 45 * 100 },
+            new int[] {},
+            Voltage.ULV,
+            NI,
+            30 * 100);
+        addCentrifugeToMaterial(
+            CombType.IRON,
+            new Materials[] { Materials.Iron },
+            new int[] { 30 * 100 },
+            new int[] {},
+            Voltage.ULV,
+            NI,
+            30 * 100);
+        addCentrifugeToMaterial(
+            CombType.STEEL,
+            new Materials[] { Materials.Steel },
+            new int[] { 40 * 100 },
+            new int[] {},
+            Voltage.ULV,
+            NI,
+            30 * 100);
+        addCentrifugeToMaterial(
+            CombType.SILVER,
+            new Materials[] { Materials.Silver },
+            new int[] { 80 * 100 },
+            new int[] {},
+            Voltage.ULV,
+            NI,
+            30 * 100);