Fix RA2 bugs (#1830)

* fix pulverizer chances mistakes

* fix block version of the PBF

* use properly RA2 for PBF recipes

* spotlessApply (#1831)

Co-authored-by: GitHub GTNH Actions <>

* enable lots of materials by default

* fixes, documentation, and minor api contract update

* spotless

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>

1 files changed, 20 insertions, 40 deletions

diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index 1cf5de780e..5d4d624513 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -32,7 +32,6 @@ import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.render.items.GT_GeneratedMaterial_Renderer;
-import gregtech.loaders.materialprocessing.ProcessingModSupport;
 import gregtech.loaders.misc.GT_Bees;
 
 public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
@@ -852,45 +851,26 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
                     Voltage.ULV,
                     NI,
                     30 * 100);
-            if (ProcessingModSupport.aEnableGCMarsMats) {
-                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);
-            } else {
-                addCentrifugeToMaterial(
-                        CombType.IRON,
-                        new Materials[] { Materials.Iron, Materials.Magnetite, Materials.BrownLimonite,
-                                Materials.YellowLimonite, Materials.VanadiumMagnetite, Materials.BandedIron },
-                        new int[] { 100 * 100, 90 * 100, 85 * 100, 85 * 100, 80 * 100, 85 * 100 },
-                        new int[] {},
-                        Voltage.ULV,
-                        NI,
-                        30 * 100);
-                addCentrifugeToMaterial(
-                        CombType.STEEL,
-                        new Materials[] { Materials.Steel, Materials.Magnetite, Materials.VanadiumMagnetite,
-                                Materials.BandedIron, Materials.Molybdenite, Materials.Molybdenum },
-                        new int[] { 100 * 100, 90 * 100, 80 * 100, 85 * 100, 65 * 100, 65 * 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,