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

9 files changed, 184 insertions, 178 deletions

diff --git a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
index 66a6437e98..e970084691 100644
--- a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
+++ b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
@@ -1,7 +1,7 @@
 package gregtech.common.items;
 
 import static gregtech.GT_Mod.GT_FML_LOGGER;
-import static gregtech.api.enums.GT_Values.RES_PATH_ITEM;
+import static gregtech.api.enums.Mods.GregTech;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -225,7 +225,7 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo
         super.registerIcons(aIconRegister);
         for (int i = 0; i < mIconDamage.length; i++) {
             mIconDamage[i] = aIconRegister.registerIcon(
-                    RES_PATH_ITEM + (GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i));
+                    GregTech.getResourcePath(GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i));
         }
         if (GregTech_API.sPostloadFinished) {
             GT_Log.out.println("GT_Mod: Starting Item Icon Load Phase");
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
index 7165702f98..7b42dc60f2 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
@@ -1,6 +1,6 @@
 package gregtech.common.items;
 
-import static gregtech.api.enums.ModIDs.GalacticraftMars;
+import static gregtech.api.enums.Mods.GalacticraftMars;
 import static gregtech.api.enums.Textures.BlockIcons.*;
 import static gregtech.client.GT_TooltipHandler.Tier.*;
 import static gregtech.client.GT_TooltipHandler.registerTieredTooltip;
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
index 7300e59b14..164a5c4ca4 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
@@ -1,5 +1,6 @@
 package gregtech.common.items;
 
+import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.enums.Textures.BlockIcons.*;
 
 import net.minecraft.dispenser.IBlockSource;
@@ -46,7 +47,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
 
     public static GT_MetaGenerated_Item_02 INSTANCE;
     private static final String aTextCover = "Usable as Cover";
-    private static final String aTextForestry = "Forestry";
 
     public GT_MetaGenerated_Item_02() {
         super(
@@ -1868,99 +1868,99 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Larch.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 0) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 0) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Teak.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 1) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 1) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Acacia_Green.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 2) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 2) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Lime.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 3) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 3) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Chestnut.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 4) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 4) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Wenge.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 5) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 5) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Baobab.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 6) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 6) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Sequoia.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 7) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 7) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Kapok.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 0) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 0) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Ebony.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 1) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 1) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Mahagony.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 2) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 2) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Balsa.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 3) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 3) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Willow.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 4) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 4) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Walnut.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 5) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 5) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Greenheart.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 6) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 6) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Cherry.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 7) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 7) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Mahoe.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 0) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 0) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Poplar.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 1) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 1) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Palm.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 2) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 2) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Papaya.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 3) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 3) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Pine.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 4) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 4) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Plum.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 5) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 5) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Maple.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 6) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 6) });
         GT_ModHandler.addCraftingRecipe(
                 ItemList.Plank_Citrus.get(2L),
                 GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 7) });
+                new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 7) });
 
         GregTech_API.registerCover(ItemList.Plank_Oak.get(1L), TextureFactory.of(Blocks.planks, 0), null);
         GregTech_API.registerCover(ItemList.Plank_Spruce.get(1L), TextureFactory.of(Blocks.planks, 1), null);
@@ -1973,7 +1973,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         0,
@@ -1985,7 +1985,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         1,
@@ -1997,7 +1997,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         2,
@@ -2009,7 +2009,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         3,
@@ -2021,7 +2021,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         4,
@@ -2033,7 +2033,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         5,
@@ -2045,7 +2045,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         6,
@@ -2057,7 +2057,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         7,
@@ -2069,7 +2069,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         8,
@@ -2081,7 +2081,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         9,
@@ -2093,7 +2093,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         10,
@@ -2105,7 +2105,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         11,
@@ -2117,7 +2117,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         12,
@@ -2129,7 +2129,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         13,
@@ -2141,7 +2141,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         14,
@@ -2153,7 +2153,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         15,
@@ -2165,7 +2165,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         16,
@@ -2177,7 +2177,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         17,
@@ -2189,7 +2189,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         18,
@@ -2201,7 +2201,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         19,
@@ -2213,7 +2213,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         20,
@@ -2225,7 +2225,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         21,
@@ -2237,7 +2237,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         22,
@@ -2249,7 +2249,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 TextureFactory.of(
                         GT_Utility.getBlockFromStack(
                                 GT_ModHandler.getModItem(
-                                        aTextForestry,
+                                        Forestry.ID,
                                         "planks",
                                         1L,
                                         23,
diff --git a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java
index 63fa279916..069d7acd5b 100644
--- a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java
+++ b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java
@@ -1,6 +1,6 @@
 package gregtech.common.items;
 
-import static gregtech.api.enums.GT_Values.RES_PATH_ITEM;
+import static gregtech.api.enums.Mods.GregTech;
 import static gregtech.api.util.GT_Utility.formatNumbers;
 import static ic2.core.util.LiquidUtil.drainContainerStack;
 import static ic2.core.util.LiquidUtil.fillContainerStack;
@@ -142,7 +142,7 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain
     @SideOnly(Side.CLIENT)
     public void registerIcons(IIconRegister aIconRegister) {
         super.registerIcons(aIconRegister);
-        iconWindow = aIconRegister.registerIcon(RES_PATH_ITEM + "gt." + unlocalFlaskName + ".window");
+        iconWindow = aIconRegister.registerIcon(GregTech.getResourcePath("gt." + unlocalFlaskName + ".window"));
     }
 
     public void setCapacity(ItemStack stack, int capacity) {
diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index 5d4d624513..c3000b9fc7 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -1,7 +1,7 @@
 package gregtech.common.items;
 
 import static gregtech.api.enums.GT_Values.*;
-import static gregtech.api.enums.ModIDs.*;
+import static gregtech.api.enums.Mods.*;
 
 import java.util.Arrays;
 import java.util.List;
@@ -44,7 +44,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
         this.setCreativeTab(Tabs.tabApiculture);
         this.setHasSubtypes(true);
         this.setUnlocalizedName("gt.comb");
-        GameRegistry.registerItem(this, "gt.comb", MOD_ID);
+        GameRegistry.registerItem(this, "gt.comb", GregTech.ID);
     }
 
     public ItemStack getStackForType(CombType type) {
@@ -228,8 +228,8 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
         addCentrifugeToItemStack(
                 CombType.LAPOTRON,
                 new ItemStack[] { GT_Bees.drop.getStackForType(DropType.LAPIS),
-                        GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.LapotronDust", 1, 0),
-                        GT_ModHandler.getModItem("MagicBees", "wax", 1, 2) },
+                        GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.LapotronDust", 1, 0),
+                        GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 2) },
                 new int[] { 20 * 100, 15 * 100, 40 * 100 },
                 Voltage.HV,
                 196);
@@ -438,31 +438,31 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
         addProcessGT(CombType.THAUMIUMDUST, new Materials[] { Materials.Thaumium }, Voltage.MV);
         addCentrifugeToItemStack(
                 CombType.THAUMIUMSHARD,
-                new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "propolis", 1, 1),
-                        GT_ModHandler.getModItem("MagicBees", "propolis", 1, 2),
-                        GT_ModHandler.getModItem("MagicBees", "propolis", 1, 3),
-                        GT_ModHandler.getModItem("MagicBees", "propolis", 1, 4),
-                        GT_ModHandler.getModItem("MagicBees", "propolis", 1, 5),
-                        GT_ModHandler.getModItem("MagicBees", "propolis", 1, 6),
-                        GT_ModHandler.getModItem("MagicBees", "wax", 1, 0) },
+                new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 1),
+                        GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 2),
+                        GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 3),
+                        GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 4),
+                        GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 5),
+                        GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 6),
+                        GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0) },
                 new int[] { 20 * 100, 20 * 100, 20 * 100, 20 * 100, 20 * 100, 20 * 100, 50 * 100 },
                 Voltage.ULV);
         addProcessGT(CombType.AMBER, new Materials[] { Materials.Amber }, Voltage.LV);
         addProcessGT(CombType.QUICKSILVER, new Materials[] { Materials.Cinnabar }, Voltage.LV);
         addCentrifugeToItemStack(
                 CombType.SALISMUNDUS,
-                new ItemStack[] { GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1, 14),
-                        GT_ModHandler.getModItem("MagicBees", "wax", 1, 0) },
+                new ItemStack[] { GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1, 14),
+                        GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0) },
                 new int[] { 100 * 100, 50 * 100 },
                 Voltage.MV);
         addCentrifugeToItemStack(
                 CombType.TAINTED,
-                new ItemStack[] { GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1, 11),
-                        GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1, 12),
-                        GT_ModHandler.getModItem("Thaumcraft", "blockTaintFibres", 1, 0),
-                        GT_ModHandler.getModItem("Thaumcraft", "blockTaintFibres", 1, 1),
-                        GT_ModHandler.getModItem("Thaumcraft", "blockTaintFibres", 1, 2),
-                        GT_ModHandler.getModItem("MagicBees", "wax", 1, 0) },
+                new ItemStack[] { GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1, 11),
+                        GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1, 12),
+                        GT_ModHandler.getModItem(Thaumcraft.ID, "blockTaintFibres", 1, 0),
+                        GT_ModHandler.getModItem(Thaumcraft.ID, "blockTaintFibres", 1, 1),
+                        GT_ModHandler.getModItem(Thaumcraft.ID, "blockTaintFibres", 1, 2),
+                        GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0) },
                 new int[] { 15 * 100, 15 * 100, 15 * 100, 15 * 100, 15 * 100, 50 * 100 },
                 Voltage.ULV);
         addProcessGT(CombType.MITHRIL, new Materials[] { Materials.Mithril }, Voltage.HV);
@@ -473,13 +473,13 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
                 new int[] { 20 * 100, (GT_Mod.gregtechproxy.mNerfedCombs ? 10 : 75) * 100 },
                 new int[] {},
                 Voltage.HV,
-                GT_ModHandler.getModItem("MagicBees", "wax", 1, 0),
+                GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
                 50 * 100);
         addCentrifugeToItemStack(
                 CombType.THAUMINITE,
-                new ItemStack[] { GT_ModHandler.getModItem("thaumicbases", "resource", 1, 0),
+                new ItemStack[] { GT_ModHandler.getModItem(ThaumicBases.ID, "resource", 1, 0),
                         GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Thaumium, 1),
-                        GT_ModHandler.getModItem("MagicBees", "wax", 1, 0) },
+                        GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0) },
                 new int[] { 20 * 100, 10 * 100, 50 * 100 },
                 Voltage.HV);
         addProcessGT(CombType.SHADOWMETAL, new Materials[] { Materials.Shadow }, Voltage.HV);
@@ -489,13 +489,13 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
                 new int[] { (GT_Mod.gregtechproxy.mNerfedCombs ? 20 : 75) * 100, 10 * 100 },
                 new int[] {},
                 Voltage.HV,
-                GT_ModHandler.getModItem("MagicBees", "wax", 1, 0),
+                GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
                 50 * 100);
         addProcessGT(CombType.DIVIDED, new Materials[] { Materials.Diamond }, Voltage.HV);
         addCentrifugeToItemStack(
                 CombType.DIVIDED,
-                new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1, 0),
-                        GT_ModHandler.getModItem("ExtraUtilities", "unstableingot", 1, 1),
+                new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
+                        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,
@@ -504,8 +504,8 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
         addProcessGT(CombType.SPARKELING, new Materials[] { Materials.NetherStar }, Voltage.EV);
         addCentrifugeToItemStack(
                 CombType.SPARKELING,
-                new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1, 0),
-                        GT_ModHandler.getModItem("MagicBees", "miscResources", 2, 5),
+                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 },
                 Voltage.EV);
@@ -516,12 +516,12 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
                     new int[] { 100 * 100 },
                     new int[] {},
                     Voltage.MV,
-                    GT_ModHandler.getModItem("MagicBees", "wax", 1, 0),
+                    GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
                     50 * 100);
             addCentrifugeToItemStack(
                     CombType.QUICKSILVER,
-                    new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1, 0),
-                            GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1, 5) },
+                    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 {
@@ -531,7 +531,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
                     new int[] { 100 * 100, 75 * 100 },
                     new int[] {},
                     Voltage.MV,
-                    GT_ModHandler.getModItem("MagicBees", "wax", 1, 0),
+                    GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
                     50 * 100);
             addCentrifugeToMaterial(
                     CombType.AMBER,
@@ -539,12 +539,12 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
                     new int[] { 100 * 100 },
                     new int[] {},
                     Voltage.ULV,
-                    GT_ModHandler.getModItem("MagicBees", "wax", 1, 0),
+                    GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
                     50 * 100);
             addCentrifugeToItemStack(
                     CombType.QUICKSILVER,
-                    new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1, 0),
-                            GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1, 5),
+                    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);
@@ -554,7 +554,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
                     new int[] { 75 * 100, 55 * 100 },
                     new int[] {},
                     Voltage.HV,
-                    GT_ModHandler.getModItem("MagicBees", "wax", 1, 0),
+                    GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
                     50 * 100);
         }
 
@@ -1161,39 +1161,39 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
         // Twilight
         addCentrifugeToItemStack(
                 CombType.NAGA,
-                new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 4),
-                        GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.NagaScaleChip", 1L, 0),
-                        GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.NagaScaleFragment", 1L, 0),
+                new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 4),
+                        GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NagaScaleChip", 1L, 0),
+                        GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NagaScaleFragment", 1L, 0),
                         ItemList.FR_Wax.get(1) },
                 new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 },
                 Voltage.MV);
         addCentrifugeToItemStack(
                 CombType.LICH,
-                new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 5),
-                        GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.LichBoneChip", 1L, 0),
-                        GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.LichBoneFragment", 1L, 0),
+                new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 5),
+                        GT_ModHandler.get