Modid work (#1833)

* add all mods founds in NHCore

* depracte old strings

* add ars magica 2

* more enum work

* use a switch

* spotless

* more mod id rework

* more mod id rework

* more mod id rework

* should be last

* spotless

* rename to make more sense

* add path attribute

* add getResourcePath to enum

* spotless

6 files changed, 28 insertions, 19 deletions

diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java
index ec380c5c32..43a0656ae4 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java
@@ -1,5 +1,7 @@
 package gregtech.loaders.oreprocessing;
 
+import static gregtech.api.enums.Mods.GregTech;
+
 import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.ItemList;
@@ -17,10 +19,10 @@ public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegi
     @Override
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
             ItemStack aStack) {
-        if (gregtech.api.util.GT_OreDictUnificator.isBlacklisted(aStack) && aModName.equals("gregtech")) return;
+        if (gregtech.api.util.GT_OreDictUnificator.isBlacklisted(aStack) && aModName.equals(GregTech.ID)) return;
         switch (aMaterial.mName) {
             case "Good", "Data", "Elite", "Master", "Ultimate", "Superconductor", "Infinite", "Bio" -> {
-                if (!GT_OreDictUnificator.isBlacklisted(aStack) && !aModName.equals("gregtech"))
+                if (!GT_OreDictUnificator.isBlacklisted(aStack) && !aModName.equals(GregTech.ID))
                     GT_ModHandler.removeRecipeByOutputDelayed(aStack);
             }
             case "Primitive", "Advanced" -> GT_ModHandler.removeRecipeByOutputDelayed(aStack);
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java
index e56888c64f..2e9cb9a1d1 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java
@@ -1,6 +1,8 @@
 package gregtech.loaders.oreprocessing;
 
-import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod;
+import static gregtech.api.enums.Mods.AppliedEnergistics2;
+import static gregtech.api.enums.Mods.BuildCraftSilicon;
+import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
@@ -40,13 +42,13 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg
                 GT_Values.RA.addLaserEngraverRecipe(
                         GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L),
                         GT_Utility.copyAmount(0L, aStack),
-                        GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 13),
+                        GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13),
                         2000,
                         1920);
                 GT_Values.RA.addLaserEngraverRecipe(
                         GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L),
                         GT_Utility.copyAmount(0L, aStack),
-                        GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 13),
+                        GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13),
                         2000,
                         1920);
                 GT_Values.RA.addLaserEngraverRecipe(
@@ -89,13 +91,13 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg
                 GT_Values.RA.addLaserEngraverRecipe(
                         GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L),
                         GT_Utility.copyAmount(0L, aStack),
-                        GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 14),
+                        GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14),
                         2000,
                         1920);
                 GT_Values.RA.addLaserEngraverRecipe(
                         GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L),
                         GT_Utility.copyAmount(0L, aStack),
-                        GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 14),
+                        GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14),
                         2000,
                         1920);
                 GT_Values.RA.addLaserEngraverRecipe(
@@ -168,13 +170,13 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg
                 GT_Values.RA.addLaserEngraverRecipe(
                         GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L),
                         GT_Utility.copyAmount(0L, aStack),
-                        GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 15),
+                        GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15),
                         2000,
                         1920);
                 GT_Values.RA.addLaserEngraverRecipe(
                         GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L),
                         GT_Utility.copyAmount(0L, aStack),
-                        GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 15),
+                        GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15),
                         2000,
                         1920);
                 GT_Values.RA.addLaserEngraverRecipe(
@@ -217,13 +219,13 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg
                 GT_Values.RA.addLaserEngraverRecipe(
                         GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Redstone, 1L),
                         GT_Utility.copyAmount(0L, aStack),
-                        GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0),
+                        GT_ModHandler.getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0),
                         50,
                         120);
                 GT_Values.RA.addLaserEngraverRecipe(
                         GT_OreDictUnificator.get(OrePrefixes.foil, Materials.RedAlloy, 1L),
                         GT_Utility.copyAmount(0L, aStack),
-                        GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EtchedLowVoltageWiring", 1L, 0),
+                        GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EtchedLowVoltageWiring", 1L, 0),
                         200,
                         16);
                 GT_Values.RA.addLaserEngraverRecipe(
@@ -317,13 +319,13 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg
                 GT_Values.RA.addLaserEngraverRecipe(
                         GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L),
                         GT_Utility.copyAmount(0L, aStack),
-                        GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 19),
+                        GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19),
                         2000,
                         1920);
                 GT_Values.RA.addLaserEngraverRecipe(
                         GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L),
                         GT_Utility.copyAmount(0L, aStack),
-                        GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 19),
+                        GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19),
                         2000,
                         1920);
                 GT_Values.RA.addLaserEngraverRecipe(
@@ -345,9 +347,9 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg
                         50,
                         16);
                 GT_Values.RA.addLaserEngraverRecipe(
-                        GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockQuartz", 1L),
+                        GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1L),
                         GT_Utility.copyAmount(0L, aStack),
-                        GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockQuartzChiseled", 1L),
+                        GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzChiseled", 1L),
                         50,
                         16);
                 GT_Values.RA.addLaserEngraverRecipe(
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
index 04ef7c4731..7a6a3ec004 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
@@ -1,5 +1,6 @@
 package gregtech.loaders.oreprocessing;
 
+import static gregtech.api.enums.Mods.AppliedEnergistics2;
 import static gregtech.api.util.GT_Utility.calculateRecipeEU;
 
 import net.minecraft.item.ItemStack;
@@ -149,7 +150,7 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
                         GT_Values.RA.addElectrolyzerRecipe(
                                 aStack,
                                 0,
-                                GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 1),
+                                GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1),
                                 null,
                                 null,
                                 null,
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java
index 4bb3dd2072..c3b57a61b7 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java
@@ -1,5 +1,7 @@
 package gregtech.loaders.oreprocessing;
 
+import static gregtech.api.enums.Mods.Railcraft;
+
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
@@ -98,7 +100,7 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra
         GT_Values.RA.addChemicalBathRecipe(
                 GT_Utility.copyAmount(1L, aStack),
                 Materials.Creosote.getFluid(1000L),
-                GT_ModHandler.getModItem("Railcraft", "tile.railcraft.cube", 1L, 8),
+                GT_ModHandler.getModItem(Railcraft.ID, "tile.railcraft.cube", 1L, 8),
                 null,
                 null,
                 null,
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java
index de46e9d2f1..9d2bad9783 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java
@@ -1,6 +1,6 @@
 package gregtech.loaders.oreprocessing;
 
-import static gregtech.api.enums.ModIDs.Railcraft;
+import static gregtech.api.enums.Mods.Railcraft;
 
 import net.minecraft.item.ItemStack;
 
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java
index 72239056cd..7588139cfc 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java
@@ -1,5 +1,7 @@
 package gregtech.loaders.oreprocessing;
 
+import static gregtech.api.enums.Mods.Railcraft;
+
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -77,7 +79,7 @@ public class ProcessingStone implements IOreRecipeRegistrator {
                 GT_ModHandler.addPulverisationRecipe(
                         GT_Utility.copyAmount(1L, aStack),
                         GT_ModHandler.getModItem(
-                                "Railcraft",
+                                Railcraft.ID,
                                 "cube.crushed.obsidian",
                                 1L,
                                 GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)),