Fix wood recycling recipe (#21)

Author: MrKono

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();
     }
 }

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();
     }
 }

src/main/java/com/github/gtexpert/gtwp/integration/advrocketry/recipes/AdvancedRocketryWoodRecipe.java

@@ -1,5 +1,7 @@
 package com.github.gtexpert.gtwp.integration.advrocketry.recipes;
 
+import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodUnificationInfo;
+
 import java.util.Arrays;
 import java.util.List;
 
@@ -20,6 +22,7 @@ private static List<WoodTypeEntry> getDefaultEntries() {
                     new WoodTypeEntry.Builder(mcModId, "alien")
                             .log(Mods.AdvancedRocketry.getItem("alienwood", 1)).removeCharcoalRecipe()
                             .planks(Mods.AdvancedRocketry.getItem("planks", 1), "advancedrocketry_alien_plank")
+                            .registerAllUnificationInfo()
                             .build());
         }
         return DEFAULT_ENTRIES;
@@ -34,6 +37,7 @@ public static void init() {
             GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry);
             GTWPWoodRecipeLoader.addCuttingRecipe(entry);
             GTWPWoodRecipeLoader.addSawmillRecipe(entry);
+            registerWoodUnificationInfo(entry);
         }
     }
 }

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();
     }
 }

src/main/java/com/github/gtexpert/gtwp/integration/binnies/extratrees/loaders/recipes/ExtraTreesWoodRecipe.java

@@ -1,5 +1,7 @@
 package com.github.gtexpert.gtwp.integration.binnies.extratrees.loaders.recipes;
 
+import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodUnificationInfo;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -95,6 +97,7 @@ public static void init() {
             GTWPWoodRecipeLoader.registerWoodTypeRecipe(true, entry);
             GTWPWoodRecipeLoader.addCuttingRecipe(entry);
             GTWPWoodRecipeLoader.addSawmillRecipe(entry);
+            registerWoodUnificationInfo(entry);
         }
 
         for (WoodTypeEntry entry : getFireproofEntries()) {
@@ -105,6 +108,7 @@ public static void init() {
             GTWPWoodRecipeLoader.registerWoodTypeRecipe(true, entry);
             GTWPWoodRecipeLoader.addCuttingRecipe(entry);
             GTWPWoodRecipeLoader.addSawmillRecipe(entry);
+            registerWoodUnificationInfo(entry);
 
             ModHandler.removeRecipeByName(new ResourceLocation(ModValues.MODID, entry.woodName + "_saw"));
         }

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();
     }
 }

src/main/java/com/github/gtexpert/gtwp/integration/bop/recipes/BoPWoodRecipe.java

@@ -1,5 +1,7 @@
 package com.github.gtexpert.gtwp.integration.bop.recipes;
 
+import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodUnificationInfo;
+
 import java.util.Arrays;
 import java.util.List;
 
@@ -203,6 +205,7 @@ public static void init() {
             GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry);
             GTWPWoodRecipeLoader.addCuttingRecipe(entry);
             GTWPWoodRecipeLoader.addSawmillRecipe(entry);
+            registerWoodUnificationInfo(entry);
         }
 
         // Remove Dead Wood Smelting

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();
     }
 }

src/main/java/com/github/gtexpert/gtwp/integration/botania/recipes/BotaniaWoodRecipe.java

@@ -1,8 +1,8 @@
 package com.github.gtexpert.gtwp.integration.botania.recipes;
 
 import static gregtech.api.GTValues.*;
-import static gregtech.api.GTValues.LV;
 import static gregtech.api.unification.ore.OrePrefix.dust;
+import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodUnificationInfo;
 
 import java.util.Arrays;
 import java.util.List;
@@ -12,7 +12,10 @@
 
 import gregtech.api.recipes.ModHandler;
 import gregtech.api.recipes.RecipeMaps;
+import gregtech.api.unification.OreDictUnifier;
 import gregtech.api.unification.material.Materials;
+import gregtech.api.unification.stack.ItemMaterialInfo;
+import gregtech.api.unification.stack.MaterialStack;
 import gregtech.api.util.GTUtility;
 import gregtech.common.ConfigHolder;
 import gregtech.loaders.WoodTypeEntry;
@@ -54,6 +57,7 @@ public static void init() {
             GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry);
             GTWPWoodRecipeLoader.addCuttingRecipe(entry);
             GTWPWoodRecipeLoader.addSawmillRecipe(entry);
+            registerWoodUnificationInfo(entry);
         }
 
         // log-associated recipes
@@ -64,10 +68,11 @@ public static void init() {
             ItemStack slab = Mods.Botania.getItem(name + "0slab");
             // stairs
             ModHandler.removeRecipeByName(new ResourceLocation(mcModId, name + "0stairs"));
-
             ModHandler.addShapedRecipe(mcModId + name + "_stairs", GTUtility.copy(4, stair),
                     "P  ", "PP ", "PPP",
                     'P', wood);
+            OreDictUnifier.registerOre(stair, new ItemMaterialInfo(
+                    new MaterialStack(Materials.Wood, (3 * M) / 2)));
 
             // plank -> stairs assembling
             RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
@@ -80,6 +85,8 @@ public static void init() {
             // plank -> slab crafting
             ModHandler.addShapedRecipe(mcModId + name + "_slab_saw", GTUtility.copy(2, slab),
                     "sS", 'S', wood);
+            OreDictUnifier.registerOre(slab, new ItemMaterialInfo(
+                    new MaterialStack(Materials.Wood, M / 2)));
 
             if (ConfigHolder.recipes.hardWoodRecipes) {
                 ModHandler.removeRecipeByName(new ResourceLocation(mcModId, name + "0slab_0"));

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();
     }
 }