move entry point

MrKono · MrKono · commit 26e2a79ab55a · 2025-03-15T22:45:02.000+09:00
diff --git a/src/main/java/com/github/gtexpert/gtwp/core/CoreModule.java b/src/main/java/com/github/gtexpert/gtwp/core/CoreModule.java
@@ -71,9 +71,7 @@ public void preInit(FMLPreInitializationEvent event) {
     public void init(FMLInitializationEvent event) {}
 
     @Override
-    public void postInit(FMLPostInitializationEvent event) {
-        RecyclingRecipes.init();
-    }
+    public void postInit(FMLPostInitializationEvent event) {}
 
     @Override
     public void registerBlocks(RegistryEvent.Register<Block> event) {
@@ -102,5 +100,6 @@ public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
     public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
         GTWPRecipe.init();
         GTWPWoodRecipe.init();
+        RecyclingRecipes.init();
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/advrocketry/AdvancedRocketryModule.java b/src/main/java/com/github/gtexpert/gtwp/integration/advrocketry/AdvancedRocketryModule.java
@@ -19,7 +19,7 @@
 public class AdvancedRocketryModule extends GTWPIntegrationSubmodule {
 
     @Override
-    public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+    public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         AdvancedRocketryWoodRecipe.init();
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/binnies/extratrees/ExtraTreesModule.java b/src/main/java/com/github/gtexpert/gtwp/integration/binnies/extratrees/ExtraTreesModule.java
@@ -1,6 +1,7 @@
 package com.github.gtexpert.gtwp.integration.binnies.extratrees;
 
-import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraftforge.event.RegistryEvent;
 
 import com.github.gtexpert.gtwp.api.ModValues;
 import com.github.gtexpert.gtwp.api.modules.TModule;
@@ -18,7 +19,7 @@
 public class ExtraTreesModule extends GTWPIntegrationSubmodule {
 
     @Override
-    public void postInit(FMLPostInitializationEvent event) {
+    public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         ExtraTreesWoodRecipe.init();
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/bop/BoPModule.java b/src/main/java/com/github/gtexpert/gtwp/integration/bop/BoPModule.java
@@ -19,7 +19,7 @@
 public class BoPModule extends GTWPIntegrationSubmodule {
 
     @Override
-    public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+    public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         BoPWoodRecipe.init();
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/botania/BotaniaModule.java b/src/main/java/com/github/gtexpert/gtwp/integration/botania/BotaniaModule.java
@@ -19,7 +19,7 @@
 public class BotaniaModule extends GTWPIntegrationSubmodule {
 
     @Override
-    public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+    public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         BotaniaWoodRecipe.init();
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/exu/ExUModule.java b/src/main/java/com/github/gtexpert/gtwp/integration/exu/ExUModule.java
@@ -19,7 +19,7 @@
 public class ExUModule extends GTWPIntegrationSubmodule {
 
     @Override
-    public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+    public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         ExUWoodRecipe.init();
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/forestry/ForestryModule.java b/src/main/java/com/github/gtexpert/gtwp/integration/forestry/ForestryModule.java
@@ -1,6 +1,7 @@
 package com.github.gtexpert.gtwp.integration.forestry;
 
-import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraftforge.event.RegistryEvent;
 
 import com.github.gtexpert.gtwp.api.ModValues;
 import com.github.gtexpert.gtwp.api.modules.TModule;
@@ -18,7 +19,7 @@
 public class ForestryModule extends GTWPIntegrationSubmodule {
 
     @Override
-    public void postInit(FMLPostInitializationEvent event) {
+    public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         ForestryWoodRecipe.init();
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/iaf/IaFModule.java b/src/main/java/com/github/gtexpert/gtwp/integration/iaf/IaFModule.java
@@ -19,7 +19,7 @@
 public class IaFModule extends GTWPIntegrationSubmodule {
 
     @Override
-    public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+    public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         IaFWoodRecipe.init();
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/ids/IDsModule.java b/src/main/java/com/github/gtexpert/gtwp/integration/ids/IDsModule.java
@@ -19,7 +19,7 @@
 public class IDsModule extends GTWPIntegrationSubmodule {
 
     @Override
-    public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+    public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         IDsWoodRecipe.init();
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/mworld/MWorldModule.java b/src/main/java/com/github/gtexpert/gtwp/integration/mworld/MWorldModule.java
@@ -19,7 +19,7 @@
 public class MWorldModule extends GTWPIntegrationSubmodule {
 
     @Override
-    public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+    public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         MWorldWoodRecipe.init();
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/natura/NaturaModule.java b/src/main/java/com/github/gtexpert/gtwp/integration/natura/NaturaModule.java
@@ -1,6 +1,7 @@
 package com.github.gtexpert.gtwp.integration.natura;
 
-import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraftforge.event.RegistryEvent;
 
 import com.github.gtexpert.gtwp.api.ModValues;
 import com.github.gtexpert.gtwp.api.modules.TModule;
@@ -18,7 +19,7 @@
 public class NaturaModule extends GTWPIntegrationSubmodule {
 
     @Override
-    public void postInit(FMLPostInitializationEvent event) {
+    public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         NaturaWoodRecipe.init();
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/natura/recipes/NaturaWoodRecipe.java b/src/main/java/com/github/gtexpert/gtwp/integration/natura/recipes/NaturaWoodRecipe.java
@@ -29,6 +29,7 @@
 import com.github.gtexpert.gtwp.api.util.Mods;
 import com.github.gtexpert.gtwp.common.GTWPConfigHolder;
 import com.github.gtexpert.gtwp.loaders.GTWPWoodRecipeLoader;
+import org.jetbrains.annotations.NotNull;
 
 public class NaturaWoodRecipe {
 
@@ -284,20 +285,7 @@ public static void miscRecipe() {
                 .duration(100).EUt(4)
                 .buildAndRegister();
 
-        Map<String, Integer> woodMetaMap = new HashMap<>();
-        woodMetaMap.put("maple", 0);
-        woodMetaMap.put("silverbell", 1);
-        woodMetaMap.put("amaranth", 2);
-        woodMetaMap.put("tiger", 3);
-        woodMetaMap.put("willow", 4);
-        woodMetaMap.put("eucalyptus", 5);
-        woodMetaMap.put("hopseed", 6);
-        woodMetaMap.put("sakura", 7);
-        woodMetaMap.put("redwood", 8);
-        woodMetaMap.put("ghostwood", 0);
-        woodMetaMap.put("bloodwood", 1);
-        woodMetaMap.put("darkwood", 2);
-        woodMetaMap.put("fusewood", 3);
+        Map<String, Integer> woodMetaMap = getMetaMap();
 
         for (WoodTypeEntry entry : getDefaultEntries()) {
             if (woodMetaMap.containsKey(entry.woodName)) {
@@ -469,4 +457,24 @@ public static void miscRecipe() {
             }
         }
     }
+
+    private static @NotNull Map<String, Integer> getMetaMap() {
+        Map<String, Integer> woodMetaMap = new HashMap<>();
+        // Overworld
+        woodMetaMap.put("maple", 0);
+        woodMetaMap.put("silverbell", 1);
+        woodMetaMap.put("amaranth", 2);
+        woodMetaMap.put("tiger", 3);
+        woodMetaMap.put("willow", 4);
+        woodMetaMap.put("eucalyptus", 5);
+        woodMetaMap.put("hopseed", 6);
+        woodMetaMap.put("sakura", 7);
+        woodMetaMap.put("redwood", 8);
+        // Nether
+        woodMetaMap.put("ghostwood", 0);
+        woodMetaMap.put("bloodwood", 1);
+        woodMetaMap.put("darkwood", 2);
+        woodMetaMap.put("fusewood", 3);
+        return woodMetaMap;
+    }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/nub/NUBModule.java b/src/main/java/com/github/gtexpert/gtwp/integration/nub/NUBModule.java
@@ -19,7 +19,7 @@
 public class NUBModule extends GTWPIntegrationSubmodule {
 
     @Override
-    public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+    public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         NUBWoodRecipe.init();
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/plants/PlantsModule.java b/src/main/java/com/github/gtexpert/gtwp/integration/plants/PlantsModule.java
@@ -19,7 +19,7 @@
 public class PlantsModule extends GTWPIntegrationSubmodule {
 
     @Override
-    public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+    public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         PlantsWoodRecipe.init();
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/pvj/PVJModule.java b/src/main/java/com/github/gtexpert/gtwp/integration/pvj/PVJModule.java
@@ -19,7 +19,7 @@
 public class PVJModule extends GTWPIntegrationSubmodule {
 
     @Override
-    public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+    public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         PVJWoodRecipe.init();
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/roots/RootsModule.java b/src/main/java/com/github/gtexpert/gtwp/integration/roots/RootsModule.java
@@ -19,7 +19,7 @@
 public class RootsModule extends GTWPIntegrationSubmodule {
 
     @Override
-    public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+    public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         RootsWoodRecipe.init();
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/rthings/RThingsModule.java b/src/main/java/com/github/gtexpert/gtwp/integration/rthings/RThingsModule.java
@@ -19,7 +19,7 @@
 public class RThingsModule extends GTWPIntegrationSubmodule {
 
     @Override
-    public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+    public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         RThingsWoodRecipe.init();
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/rustic/RusticModule.java b/src/main/java/com/github/gtexpert/gtwp/integration/rustic/RusticModule.java
@@ -19,7 +19,7 @@
 public class RusticModule extends GTWPIntegrationSubmodule {
 
     @Override
-    public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+    public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         RusticWoodRecipe.init();
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/tc/TCModule.java b/src/main/java/com/github/gtexpert/gtwp/integration/tc/TCModule.java
@@ -19,7 +19,7 @@
 public class TCModule extends GTWPIntegrationSubmodule {
 
     @Override
-    public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+    public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         TCWoodRecipe.init();
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/traverse/TraverseModule.java b/src/main/java/com/github/gtexpert/gtwp/integration/traverse/TraverseModule.java
@@ -19,7 +19,7 @@
 public class TraverseModule extends GTWPIntegrationSubmodule {
 
     @Override
-    public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+    public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         TraverseWoodRecipe.init();
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/twilight/TwilightModule.java b/src/main/java/com/github/gtexpert/gtwp/integration/twilight/TwilightModule.java
@@ -19,7 +19,7 @@
 public class TwilightModule extends GTWPIntegrationSubmodule {
 
     @Override
-    public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+    public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         TwilightWoodRecipe.init();
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/wizardry/WizardryModule.java b/src/main/java/com/github/gtexpert/gtwp/integration/wizardry/WizardryModule.java
@@ -19,7 +19,7 @@
 public class WizardryModule extends GTWPIntegrationSubmodule {
 
     @Override
-    public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+    public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
         WizardryWoodRecipe.init();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`public class AdvancedRocketryModule extends GTWPIntegrationSubmodule {`
`20`	`20`
`21`	`21`	`@Override`
`22`		`- public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {`
	`22`	`+ public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {`
`23`	`23`	`AdvancedRocketryWoodRecipe.init();`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package com.github.gtexpert.gtwp.integration.binnies.extratrees;`
`2`	`2`
`3`		`-import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;`
	`3`	`+import net.minecraft.item.crafting.IRecipe;`
	`4`	`+import net.minecraftforge.event.RegistryEvent;`
`4`	`5`
`5`	`6`	`import com.github.gtexpert.gtwp.api.ModValues;`
`6`	`7`	`import com.github.gtexpert.gtwp.api.modules.TModule;`
`@@ -18,7 +19,7 @@`
`18`	`19`	`public class ExtraTreesModule extends GTWPIntegrationSubmodule {`
`19`	`20`
`20`	`21`	`@Override`
`21`		`- public void postInit(FMLPostInitializationEvent event) {`
	`22`	`+ public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {`
`22`	`23`	`ExtraTreesWoodRecipe.init();`
`23`	`24`	`}`
`24`	`25`	`}`