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, 14 insertions, 91 deletions

diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
index e876252137..2ed494d0c0 100644
--- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
+++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
@@ -7,17 +7,7 @@ import gregtech.api.enums.OrePrefixes;
 
 public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHandler {
 
-    public static boolean aTGregSupport = TinkersGregworks.isModLoaded() || NewHorizonsCoreMod.isModLoaded();
-    public static boolean aEnableUBCMats = UndergroundBiomes.isModLoaded() || aTGregSupport;
-    public static boolean aEnableThaumcraftMats = Thaumcraft.isModLoaded() || aTGregSupport;
-    public static boolean aEnableRotaryCraftMats = RotaryCraft.isModLoaded() || aTGregSupport;
-    public static boolean aEnableThermalFoundationMats = ThermalFondation.isModLoaded() || aTGregSupport;
-    public static boolean aEnableEnderIOMats = EnderIO.isModLoaded() || aTGregSupport;
-    public static boolean aEnableRailcraftMats = Railcraft.isModLoaded() || aTGregSupport;
-    public static boolean aEnableGCMarsMats = GalacticraftMars.isModLoaded() || aTGregSupport;
-    public static boolean aEnableTwilightMats = TwilightForest.isModLoaded() || aTGregSupport;
-    public static boolean aEnableMetallurgyMats = Metallurgy.isModLoaded() || aTGregSupport;
-    public static boolean aEnableProjectRedMats = ProjectRedCore.isModLoaded() || aTGregSupport;
+    public static boolean aEnableThaumcraftMats = true;
 
     public ProcessingModSupport() {
         Materials.add(this);
@@ -26,35 +16,7 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa
     @Override
     public void onMaterialsInit() {
         // Disable Materials if Parent Mod is not loaded
-        if (!aTGregSupport) {
-            Materials.Dysprosium.mHasParentMod = false;
-            Materials.Erbium.mHasParentMod = false;
-            Materials.Gadolinium.mHasParentMod = false;
-            Materials.Holmium.mHasParentMod = false;
-            Materials.Indium.mHasParentMod = false;
-            Materials.Lanthanum.mHasParentMod = false;
-            Materials.Praseodymium.mHasParentMod = false;
-            Materials.Promethium.mHasParentMod = false;
-            Materials.Rubidium.mHasParentMod = false;
-            Materials.Samarium.mHasParentMod = false;
-            Materials.SamariumMagnetic.mHasParentMod = false;
-            Materials.Scandium.mHasParentMod = false;
-            Materials.Strontium.mHasParentMod = false;
-            Materials.Tellurium.mHasParentMod = false;
-            Materials.Terbium.mHasParentMod = false;
-            Materials.Thulium.mHasParentMod = false;
-            Materials.Ytterbium.mHasParentMod = false;
-            Materials.HeeEndium.mHasParentMod = false;
-            Materials.DarkIron.mHasParentMod = false;
-            Materials.ElectrumFlux.mHasParentMod = false;
-            Materials.Force.mHasParentMod = false;
-            // Materials.Nikolite.mHasParentMod = false;
-            Materials.Sunnarium.mHasParentMod = false;
-            Materials.BlueAlloy.mHasParentMod = false;
-            Materials.Vinteum.mHasParentMod = false;
-            Materials.ChromiumDioxide.mHasParentMod = false;
-        }
-        if (!aEnableMetallurgyMats) {
+        if (!Metallurgy.isModLoaded()) {
             Materials.Angmallen.mHasParentMod = false;
             Materials.Atlarus.mHasParentMod = false;
             Materials.Carmot.mHasParentMod = false;
@@ -83,20 +45,8 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa
             Materials.AstralSilver.mHasParentMod = false;
             Materials.Trinium.mHasParentMod = false;
         }
-        if (!aEnableThaumcraftMats) {
-            Materials.Amber.mHasParentMod = false;
-            Materials.Thaumium.mHasParentMod = false;
-            Materials.InfusedGold.mHasParentMod = false;
-            Materials.InfusedAir.mHasParentMod = false;
-            Materials.InfusedFire.mHasParentMod = false;
-            Materials.InfusedEarth.mHasParentMod = false;
-            Materials.InfusedWater.mHasParentMod = false;
-            Materials.InfusedEntropy.mHasParentMod = false;
-            Materials.InfusedOrder.mHasParentMod = false;
-            Materials.InfusedVis.mHasParentMod = false;
-            Materials.InfusedDull.mHasParentMod = false;
-        }
-        if (!aEnableUBCMats) {
+
+        if (!UndergroundBiomes.isModLoaded()) {
             Materials.Blueschist.mHasParentMod = false;
             Materials.Chert.mHasParentMod = false;
             Materials.Dacite.mHasParentMod = false;
@@ -108,50 +58,23 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa
             Materials.Komatiite.mHasParentMod = false;
             Materials.Rhyolite.mHasParentMod = false;
         }
-        if (!aEnableTwilightMats) {
-            Materials.FierySteel.mHasParentMod = false;
-            Materials.LiveRoot.mHasParentMod = false;
-            Materials.IronWood.mHasParentMod = false;
-            Materials.Steeleaf.mHasParentMod = false;
-            Materials.Knightmetal.mHasParentMod = false;
-        }
-        if (!aEnableGCMarsMats) {
-            Materials.Desh.mHasParentMod = false;
-            Materials.MeteoricIron.mHasParentMod = false;
-            Materials.MeteoricSteel.mHasParentMod = false;
-        }
-        if (!aEnableThermalFoundationMats) {
-            Materials.Blizz.mHasParentMod = false;
-            Materials.Enderium.mHasParentMod = false;
-        }
-        if (!aEnableRotaryCraftMats) {
+        if (!RotaryCraft.isModLoaded()) {
             Materials.HSLA.mHasParentMod = false;
         }
-        if (!aEnableEnderIOMats) {
-            Materials.DarkSteel.mHasParentMod = false;
-        }
-        if (!aEnableRailcraftMats) {
-            Materials.Firestone.mHasParentMod = false;
-        }
-        if (!aEnableProjectRedMats) {
-            Materials.Electrotine.mHasParentMod = false;
-        }
 
-        // Enable Materials if correct mod is Loaded
-        Materials.ChromiumDioxide.mHasParentMod = Computronics.isModLoaded();
     }
 
     @Override
     public void onComponentInit() {
-        if (Computronics.isModLoaded()) {
-            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);
-        }
+
+        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