diff --git a/src/main/java/com/github/gtexpert/gtwp/core/CoreModule.java b/src/main/java/com/github/gtexpert/gtwp/core/CoreModule.java index 2adddc9..1533fb5 100644 --- 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 event) { @@ -102,5 +100,6 @@ public void registerRecipesNormal(RegistryEvent.Register event) { public void registerRecipesLowest(RegistryEvent.Register 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 index 2ee4648..5fb4c7a 100644 --- 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 event) { + public void registerRecipesNormal(RegistryEvent.Register event) { AdvancedRocketryWoodRecipe.init(); } } diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/advrocketry/recipes/AdvancedRocketryWoodRecipe.java b/src/main/java/com/github/gtexpert/gtwp/integration/advrocketry/recipes/AdvancedRocketryWoodRecipe.java index 7ca8589..24e18f6 100644 --- a/src/main/java/com/github/gtexpert/gtwp/integration/advrocketry/recipes/AdvancedRocketryWoodRecipe.java +++ b/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 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); } } } 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 index 7d4d647..816be88 100644 --- 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 event) { ExtraTreesWoodRecipe.init(); } } diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/binnies/extratrees/loaders/recipes/ExtraTreesWoodRecipe.java b/src/main/java/com/github/gtexpert/gtwp/integration/binnies/extratrees/loaders/recipes/ExtraTreesWoodRecipe.java index 2e55001..86c610c 100644 --- a/src/main/java/com/github/gtexpert/gtwp/integration/binnies/extratrees/loaders/recipes/ExtraTreesWoodRecipe.java +++ b/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")); } 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 index 8bfdccf..db13a04 100644 --- 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 event) { + public void registerRecipesNormal(RegistryEvent.Register event) { BoPWoodRecipe.init(); } } diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/bop/recipes/BoPWoodRecipe.java b/src/main/java/com/github/gtexpert/gtwp/integration/bop/recipes/BoPWoodRecipe.java index f70da9e..3c26a4e 100644 --- a/src/main/java/com/github/gtexpert/gtwp/integration/bop/recipes/BoPWoodRecipe.java +++ b/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 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 index 1e8cde7..fbb9f76 100644 --- 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 event) { + public void registerRecipesNormal(RegistryEvent.Register event) { BotaniaWoodRecipe.init(); } } diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/botania/recipes/BotaniaWoodRecipe.java b/src/main/java/com/github/gtexpert/gtwp/integration/botania/recipes/BotaniaWoodRecipe.java index c16b08d..d3263be 100644 --- a/src/main/java/com/github/gtexpert/gtwp/integration/botania/recipes/BotaniaWoodRecipe.java +++ b/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")); 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 index 5d2731f..b3c731e 100644 --- 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 event) { + public void registerRecipesNormal(RegistryEvent.Register event) { ExUWoodRecipe.init(); } } diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/exu/recipes/ExUWoodRecipe.java b/src/main/java/com/github/gtexpert/gtwp/integration/exu/recipes/ExUWoodRecipe.java index d8fe391..f708540 100644 --- a/src/main/java/com/github/gtexpert/gtwp/integration/exu/recipes/ExUWoodRecipe.java +++ b/src/main/java/com/github/gtexpert/gtwp/integration/exu/recipes/ExUWoodRecipe.java @@ -1,5 +1,7 @@ package com.github.gtexpert.gtwp.integration.exu.recipes; +import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodUnificationInfo; + import java.util.Arrays; import java.util.List; @@ -19,11 +21,13 @@ private static List getDefaultEntries() { new WoodTypeEntry.Builder(mcModId, "ironwood_1") .log(Mods.ExtraUtilities.getItem("ironwood_log", 1, 0)).removeCharcoalRecipe() .planks(Mods.ExtraUtilities.getItem("ironwood_planks", 1, 0), "ironwood_log_to_planks_raw") + .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "ironwood_2") .log(Mods.ExtraUtilities.getItem("ironwood_log", 1, 1)).removeCharcoalRecipe() .planks(Mods.ExtraUtilities.getItem("ironwood_planks", 1, 1), "ironwood_log_to_planks_burnt") + .registerAllUnificationInfo() .build()); } return DEFAULT_ENTRIES; @@ -36,6 +40,7 @@ public static void init() { GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry); GTWPWoodRecipeLoader.addCuttingRecipe(entry); GTWPWoodRecipeLoader.addSawmillRecipe(entry); + registerWoodUnificationInfo(entry); } } } 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 index 024533c..9891340 100644 --- 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 event) { ForestryWoodRecipe.init(); } } diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/forestry/loaders/recipes/ForestryWoodRecipe.java b/src/main/java/com/github/gtexpert/gtwp/integration/forestry/loaders/recipes/ForestryWoodRecipe.java index 6a29733..0afea8b 100644 --- a/src/main/java/com/github/gtexpert/gtwp/integration/forestry/loaders/recipes/ForestryWoodRecipe.java +++ b/src/main/java/com/github/gtexpert/gtwp/integration/forestry/loaders/recipes/ForestryWoodRecipe.java @@ -1,5 +1,7 @@ package com.github.gtexpert.gtwp.integration.forestry.loaders.recipes; +import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodUnificationInfo; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -90,6 +92,7 @@ public static void init() { GTWPWoodRecipeLoader.registerWoodTypeRecipe(true, entry); GTWPWoodRecipeLoader.addCuttingRecipe(entry); GTWPWoodRecipeLoader.addSawmillRecipe(entry); + registerWoodUnificationInfo(entry); } for (WoodTypeEntry entry : FIREPROOF_ENTRIES) { @@ -100,6 +103,7 @@ public static void init() { GTWPWoodRecipeLoader.registerWoodTypeRecipe(true, entry); GTWPWoodRecipeLoader.addCuttingRecipe(entry); GTWPWoodRecipeLoader.addSawmillRecipe(entry); + registerWoodUnificationInfo(entry); } // Fireproof for vanilla wood 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 index fb37bc8..b4f90b6 100644 --- 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 event) { + public void registerRecipesNormal(RegistryEvent.Register event) { IaFWoodRecipe.init(); } } diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/iaf/recipes/IaFWoodRecipe.java b/src/main/java/com/github/gtexpert/gtwp/integration/iaf/recipes/IaFWoodRecipe.java index 66ee183..34e969c 100644 --- a/src/main/java/com/github/gtexpert/gtwp/integration/iaf/recipes/IaFWoodRecipe.java +++ b/src/main/java/com/github/gtexpert/gtwp/integration/iaf/recipes/IaFWoodRecipe.java @@ -1,5 +1,7 @@ package com.github.gtexpert.gtwp.integration.iaf.recipes; +import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodUnificationInfo; + import java.util.Arrays; import java.util.List; @@ -19,6 +21,7 @@ private static List getDefaultEntries() { new WoodTypeEntry.Builder(mcModId, "dreadwood") .log(Mods.IceAndFire.getItem("dreadwood_log", 1)).removeCharcoalRecipe() .planks(Mods.IceAndFire.getItem("dreadwood_planks", 1), "dread_wood_planks") + .registerAllUnificationInfo() .build()); } return DEFAULT_ENTRIES; @@ -31,6 +34,7 @@ public static void init() { GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry); GTWPWoodRecipeLoader.addCuttingRecipe(entry); GTWPWoodRecipeLoader.addSawmillRecipe(entry); + registerWoodUnificationInfo(entry); } } } 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 index a8b385d..cab7da9 100644 --- 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 event) { + public void registerRecipesNormal(RegistryEvent.Register event) { IDsWoodRecipe.init(); } } diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/ids/recipes/IDsWoodRecipe.java b/src/main/java/com/github/gtexpert/gtwp/integration/ids/recipes/IDsWoodRecipe.java index a873352..8f7b29b 100644 --- a/src/main/java/com/github/gtexpert/gtwp/integration/ids/recipes/IDsWoodRecipe.java +++ b/src/main/java/com/github/gtexpert/gtwp/integration/ids/recipes/IDsWoodRecipe.java @@ -1,5 +1,7 @@ package com.github.gtexpert.gtwp.integration.ids.recipes; +import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodUnificationInfo; + import java.util.Arrays; import java.util.List; @@ -21,6 +23,7 @@ private static List getDefaultEntries() { .planks(Mods.IntegratedDynamics.getItem("menril_planks", 1), null) .stairs(Mods.IntegratedDynamics.getItem("menril_planks_stairs", 1), null) .door(Mods.IntegratedDynamics.getItem("menril_door", 1), "menril_door") + .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); } } } 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 index b1001ce..faead6f 100644 --- 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 event) { + public void registerRecipesNormal(RegistryEvent.Register event) { MWorldWoodRecipe.init(); } } diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/mworld/recipes/MWorldWoodRecipe.java b/src/main/java/com/github/gtexpert/gtwp/integration/mworld/recipes/MWorldWoodRecipe.java index 8d0c3e6..c313fdf 100644 --- a/src/main/java/com/github/gtexpert/gtwp/integration/mworld/recipes/MWorldWoodRecipe.java +++ b/src/main/java/com/github/gtexpert/gtwp/integration/mworld/recipes/MWorldWoodRecipe.java @@ -1,5 +1,7 @@ package com.github.gtexpert.gtwp.integration.mworld.recipes; +import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodUnificationInfo; + import java.util.Arrays; import java.util.List; @@ -23,6 +25,7 @@ private static List getDefaultEntries() { .fence(Mods.MysticalWorld.getItem("charred_fence", 1), "charred_fence") .fenceGate(Mods.MysticalWorld.getItem("charred_fence_gate", 1), "charred_fence_gate") .stairs(Mods.MysticalWorld.getItem("charred_stairs", 1), "charred_stairs") + .registerAllUnificationInfo() .build()); } return DEFAULT_ENTRIES; @@ -35,6 +38,7 @@ public static void init() { GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry); GTWPWoodRecipeLoader.addCuttingRecipe(entry); GTWPWoodRecipeLoader.addSawmillRecipe(entry); + registerWoodUnificationInfo(entry); } } } 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 index dc2f521..efa6c9c 100644 --- 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 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 index 8587d5f..417c29c 100644 --- 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 @@ -2,6 +2,7 @@ import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; +import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodUnificationInfo; import java.util.Arrays; import java.util.HashMap; @@ -13,6 +14,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import org.jetbrains.annotations.NotNull; + import gregtech.api.GTValues; import gregtech.api.recipes.GTRecipeHandler; import gregtech.api.recipes.ModHandler; @@ -20,6 +23,8 @@ import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; +import gregtech.api.unification.stack.ItemMaterialInfo; +import gregtech.api.unification.stack.MaterialStack; import gregtech.api.unification.stack.UnificationEntry; import gregtech.api.util.GTUtility; import gregtech.common.ConfigHolder; @@ -196,6 +201,7 @@ public static void init() { GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry); GTWPWoodRecipeLoader.addCuttingRecipe(entry); GTWPWoodRecipeLoader.addSawmillRecipe(entry); + registerWoodUnificationInfo(entry); } // Redwood Bark ItemStack log = Mods.Natura.getItem("redwood_logs", 1, 0); @@ -219,6 +225,9 @@ public static void init() { .fluidInputs(Materials.Iron.getFluid(GTValues.L / 9)) .outputs(door.copy()) .duration(400).EUt(4).buildAndRegister(); + OreDictUnifier.registerOre(door, new ItemMaterialInfo( + new MaterialStack(Materials.Wood, M * 2), + new MaterialStack(Materials.Iron, M / 9))); } else { RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .inputs(GTUtility.copy(6, log)) @@ -226,6 +235,8 @@ public static void init() { .circuitMeta(6) .duration(600).EUt(4) .buildAndRegister(); + OreDictUnifier.registerOre(door, new ItemMaterialInfo( + new MaterialStack(Materials.Wood, M * 2))); } // Redwood Root GTWPWoodRecipeLoader.removeCharcoalRecipe(Mods.Natura.getItem("redwood_logs", 1, 2)); @@ -282,20 +293,7 @@ public static void miscRecipe() { .duration(100).EUt(4) .buildAndRegister(); - Map 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 woodMetaMap = getMetaMap(); for (WoodTypeEntry entry : getDefaultEntries()) { if (woodMetaMap.containsKey(entry.woodName)) { @@ -319,6 +317,8 @@ public static void miscRecipe() { ModHandler.addMirroredShapedRecipe(entry.woodName + "_stick_saw", GTUtility.copy(stick_saw, Stick), "Ps", " P", 'P', entry.planks); + OreDictUnifier.registerOre(Stick, new ItemMaterialInfo( + new MaterialStack(Materials.Wood, M / 2))); // Button and Pressure Plate if (ConfigHolder.recipes.hardRedstoneRecipes) { @@ -343,7 +343,13 @@ public static void miscRecipe() { .inputs(GTUtility.copy(2, entry.planks)) .outputs(GTUtility.copy(2, PressurePlate)) .duration(100).EUt(VA[ULV]).buildAndRegister(); + OreDictUnifier.registerOre(PressurePlate, new ItemMaterialInfo( + new MaterialStack(Materials.Wood, M), new MaterialStack(Materials.Iron, M / 2))); + } else { + OreDictUnifier.registerOre(PressurePlate, + new ItemMaterialInfo(new MaterialStack(Materials.Wood, M * 2))); } + OreDictUnifier.registerOre(Button, new ItemMaterialInfo(new MaterialStack(Materials.Wood, M / 9))); // Trap Door if (ConfigHolder.recipes.hardWoodRecipes) { @@ -367,6 +373,8 @@ public static void miscRecipe() { .inputs(new ItemStack(Items.FLINT)) .outputs(Workbench).buildAndRegister(); } + OreDictUnifier.registerOre(Workbench, + new ItemMaterialInfo(new MaterialStack(Materials.Wood, M * 2))); // Bookshelf if (ConfigHolder.recipes.removeVanillaBlockRecipes) { @@ -380,6 +388,8 @@ public static void miscRecipe() { .outputs(Bookshelf) .duration(100).EUt(4) .buildAndRegister(); + OreDictUnifier.registerOre(Bookshelf, new ItemMaterialInfo( + new MaterialStack(Materials.Paper, M * 9), new MaterialStack(Materials.Wood, M * 6))); } else { // Nether Wood int stickMeta = entry.woodName.equals("ghostwood") ? 9 : @@ -392,6 +402,7 @@ public static void miscRecipe() { ItemStack TrapDoor = Mods.Natura.getItem(entry.woodName + "_trap_door"); ItemStack Workbench = Mods.Natura.getItem("nether_workbenches", 1, meta); ItemStack Bookshelf = Mods.Natura.getItem("nether_bookshelves", 1, meta); + ItemStack Bowl = Mods.Natura.getItem("empty_bowls", 1, meta); // Stick ModHandler.removeRecipeByName( @@ -402,6 +413,7 @@ public static void miscRecipe() { ModHandler.addMirroredShapedRecipe(entry.woodName + "_stick_saw", GTUtility.copy(stick_saw, Stick), "Ps", " P", 'P', entry.planks); + OreDictUnifier.registerOre(Stick, new ItemMaterialInfo(new MaterialStack(Materials.Wood, M / 2))); // Button and Pressure Plate if (ConfigHolder.recipes.hardRedstoneRecipes) { @@ -426,7 +438,13 @@ public static void miscRecipe() { .inputs(GTUtility.copy(2, entry.planks)) .outputs(GTUtility.copy(2, PressurePlate)) .duration(100).EUt(VA[ULV]).buildAndRegister(); + OreDictUnifier.registerOre(PressurePlate, new ItemMaterialInfo( + new MaterialStack(Materials.Wood, M), new MaterialStack(Materials.Iron, M / 2))); + } else { + OreDictUnifier.registerOre(PressurePlate, + new ItemMaterialInfo(new MaterialStack(Materials.Wood, M * 2))); } + OreDictUnifier.registerOre(Button, new ItemMaterialInfo(new MaterialStack(Materials.Wood, M / 9))); // Trap Door if (ConfigHolder.recipes.hardWoodRecipes) { @@ -450,6 +468,8 @@ public static void miscRecipe() { .inputs(new ItemStack(Items.FLINT)) .outputs(Workbench).buildAndRegister(); } + OreDictUnifier.registerOre(Workbench, + new ItemMaterialInfo(new MaterialStack(Materials.Wood, M * 2))); // Bookshelf if (ConfigHolder.recipes.removeVanillaBlockRecipes) { @@ -463,8 +483,40 @@ public static void miscRecipe() { .outputs(Bookshelf) .duration(100).EUt(4) .buildAndRegister(); + OreDictUnifier.registerOre(Bookshelf, new ItemMaterialInfo( + new MaterialStack(Materials.Paper, M * 9), new MaterialStack(Materials.Wood, M * 6))); + // bowl + if (ConfigHolder.recipes.hardWoodRecipes) { + ModHandler.removeRecipeByName(new ResourceLocation(mcModId, + "nether/bowls/" + entry.woodName + "_bowl")); + ModHandler.addShapedRecipe(mcModId + "/nether/bowls/" + entry.woodName + "_bowl", + GTUtility.copy(3, Bowl), " k ", "PPP", + 'P', entry.planks); + } + OreDictUnifier.registerOre(Bowl, + new ItemMaterialInfo(new MaterialStack(Materials.Wood, M / 4))); } } } } + + private static @NotNull Map getMetaMap() { + Map 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 index 581f753..42e978d 100644 --- 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 event) { + public void registerRecipesNormal(RegistryEvent.Register event) { NUBWoodRecipe.init(); } } diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/nub/recipes/NUBWoodRecipe.java b/src/main/java/com/github/gtexpert/gtwp/integration/nub/recipes/NUBWoodRecipe.java index 78d3393..a9699f3 100644 --- a/src/main/java/com/github/gtexpert/gtwp/integration/nub/recipes/NUBWoodRecipe.java +++ b/src/main/java/com/github/gtexpert/gtwp/integration/nub/recipes/NUBWoodRecipe.java @@ -1,5 +1,7 @@ package com.github.gtexpert.gtwp.integration.nub.recipes; +import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodUnificationInfo; + import java.util.Arrays; import java.util.List; @@ -19,10 +21,12 @@ private static List getDefaultEntries() { new WoodTypeEntry.Builder(mcModId, "crimson") .log(Mods.NetherUpdateBackport.getItem("crimsonstem", 1)).removeCharcoalRecipe() .planks(Mods.NetherUpdateBackport.getItem("crimsonplanks", 1), "crimsonplanksrecipe") + .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "warped") .log(Mods.NetherUpdateBackport.getItem("warpedstem", 1)).removeCharcoalRecipe() .planks(Mods.NetherUpdateBackport.getItem("warpedplanks", 1), "warpedplanksrecipe") + .registerAllUnificationInfo() .build()); } return DEFAULT_ENTRIES; @@ -35,6 +39,7 @@ public static void init() { GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry); GTWPWoodRecipeLoader.addCuttingRecipe(entry); GTWPWoodRecipeLoader.addSawmillRecipe(entry); + registerWoodUnificationInfo(entry); } } } 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 index 4e6c8c6..d048c77 100644 --- 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 event) { + public void registerRecipesNormal(RegistryEvent.Register event) { PlantsWoodRecipe.init(); } } diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/plants/recipes/PlantsWoodRecipe.java b/src/main/java/com/github/gtexpert/gtwp/integration/plants/recipes/PlantsWoodRecipe.java index d0047d4..a745338 100644 --- a/src/main/java/com/github/gtexpert/gtwp/integration/plants/recipes/PlantsWoodRecipe.java +++ b/src/main/java/com/github/gtexpert/gtwp/integration/plants/recipes/PlantsWoodRecipe.java @@ -1,5 +1,7 @@ package com.github.gtexpert.gtwp.integration.plants.recipes; +import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodUnificationInfo; + import java.util.Arrays; import java.util.List; @@ -21,48 +23,56 @@ private static List getDefaultEntries() { .planks(Mods.Plants.getItem("crystal_planks", 1, 0), "recipe150") .slab(Mods.Plants.getItem("crystal_slab", 1), "recipe154") .stairs(Mods.Plants.getItem("crystal_stairs", 1), "recipe152") + .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "dark_crystal") .log(Mods.Plants.getItem("crystal_log", 1, 1)).removeCharcoalRecipe() .planks(Mods.Plants.getItem("crystal_planks", 1, 1), "recipe151") .slab(Mods.Plants.getItem("dark_crystal_slab", 1), "recipe156") .stairs(Mods.Plants.getItem("dark_crystal_stairs", 1), "recipe153") + .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "ash") .log(Mods.Plants.getItem("nether_log", 1, 0)).removeCharcoalRecipe() .planks(Mods.Plants.getItem("planks", 1, 0), "recipe158") .slab(Mods.Plants.getItem("ash_slab", 1), "recipe170") .stairs(Mods.Plants.getItem("ash_stairs", 1), "recipe164") + .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "blaze") .log(Mods.Plants.getItem("nether_log", 1, 1)).removeCharcoalRecipe() .planks(Mods.Plants.getItem("planks", 1, 1), "recipe159") .slab(Mods.Plants.getItem("blaze_slab", 1), "recipe172") .stairs(Mods.Plants.getItem("blaze_stairs", 1), "recipe165") + .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "black_kauri") .log(Mods.Plants.getItem("log_0", 1, 0)).removeCharcoalRecipe() .planks(Mods.Plants.getItem("planks", 1, 2), "recipe160") .slab(Mods.Plants.getItem("black_kauri_slab", 1), "recipe174") .stairs(Mods.Plants.getItem("black_kauri_stairs", 1), "recipe166") + .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "brazillian_pine") .log(Mods.Plants.getItem("log_0", 1, 1)).removeCharcoalRecipe() .planks(Mods.Plants.getItem("planks", 1, 3), "recipe161") .slab(Mods.Plants.getItem("brazillian_pine_slab", 1), "recipe176") .stairs(Mods.Plants.getItem("brazillian_pine_stairs", 1), "recipe167") + .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "incense_cedar") .log(Mods.Plants.getItem("log_0", 1, 2)).removeCharcoalRecipe() .planks(Mods.Plants.getItem("planks", 1, 4), "recipe162") .slab(Mods.Plants.getItem("incense_cedar_slab", 1), "recipe178") .stairs(Mods.Plants.getItem("incense_cedar_stairs", 1), "recipe168") + .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "murray_pine") .log(Mods.Plants.getItem("log_0", 1, 3)).removeCharcoalRecipe() .planks(Mods.Plants.getItem("planks", 1, 5), "recipe163") .slab(Mods.Plants.getItem("murray_pine_slab", 1), "recipe180") .stairs(Mods.Plants.getItem("murray_pine_stairs", 1), "recipe169") + .registerAllUnificationInfo() .build()); } return DEFAULT_ENTRIES; @@ -75,6 +85,7 @@ public static void init() { GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry); GTWPWoodRecipeLoader.addCuttingRecipe(entry); GTWPWoodRecipeLoader.addSawmillRecipe(entry); + registerWoodUnificationInfo(entry); } } } 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 index 702be55..d7264cd 100644 --- 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 event) { + public void registerRecipesNormal(RegistryEvent.Register event) { PVJWoodRecipe.init(); } } diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/pvj/recipes/PVJWoodRecipe.java b/src/main/java/com/github/gtexpert/gtwp/integration/pvj/recipes/PVJWoodRecipe.java index ad29799..92966e6 100644 --- a/src/main/java/com/github/gtexpert/gtwp/integration/pvj/recipes/PVJWoodRecipe.java +++ b/src/main/java/com/github/gtexpert/gtwp/integration/pvj/recipes/PVJWoodRecipe.java @@ -1,5 +1,7 @@ package com.github.gtexpert.gtwp.integration.pvj.recipes; +import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodUnificationInfo; + import java.util.Arrays; import java.util.List; @@ -180,6 +182,7 @@ public static void init() { GTWPWoodRecipeLoader.registerWoodTypeRecipe(true, entry); GTWPWoodRecipeLoader.addCuttingRecipe(entry); GTWPWoodRecipeLoader.addSawmillRecipe(entry); + registerWoodUnificationInfo(entry); } } } 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 index 6427dbc..b483f10 100644 --- 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 event) { + public void registerRecipesNormal(RegistryEvent.Register event) { RootsWoodRecipe.init(); } } diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/roots/recipes/RootsWoodRecipe.java b/src/main/java/com/github/gtexpert/gtwp/integration/roots/recipes/RootsWoodRecipe.java index 640253d..529d68a 100644 --- a/src/main/java/com/github/gtexpert/gtwp/integration/roots/recipes/RootsWoodRecipe.java +++ b/src/main/java/com/github/gtexpert/gtwp/integration/roots/recipes/RootsWoodRecipe.java @@ -1,5 +1,7 @@ package com.github.gtexpert.gtwp.integration.roots.recipes; +import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodUnificationInfo; + import java.util.Arrays; import java.util.List; @@ -25,6 +27,7 @@ private static List getDefaultEntries() { .fenceGate(Mods.Roots.getItem("wildwood_fence_gate", 1), "wildwood_fence_gate") .stairs(Mods.Roots.getItem("wildwood_stairs", 1), "wildwood_stairs") .registerAllOres() + .registerAllUnificationInfo() .build()); } return DEFAULT_ENTRIES; @@ -37,6 +40,7 @@ public static void init() { GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry); GTWPWoodRecipeLoader.addCuttingRecipe(entry); GTWPWoodRecipeLoader.addSawmillRecipe(entry); + registerWoodUnificationInfo(entry); } } } 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 index be53b89..e89d9fa 100644 --- 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 event) { + public void registerRecipesNormal(RegistryEvent.Register event) { RThingsWoodRecipe.init(); } } diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/rthings/recipes/RThingsWoodRecipe.java b/src/main/java/com/github/gtexpert/gtwp/integration/rthings/recipes/RThingsWoodRecipe.java index f545028..f3ad628 100644 --- a/src/main/java/com/github/gtexpert/gtwp/integration/rthings/recipes/RThingsWoodRecipe.java +++ b/src/main/java/com/github/gtexpert/gtwp/integration/rthings/recipes/RThingsWoodRecipe.java @@ -1,5 +1,7 @@ package com.github.gtexpert.gtwp.integration.rthings.recipes; +import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodUnificationInfo; + import java.util.Arrays; import java.util.List; @@ -19,6 +21,7 @@ private static List getDefaultEntries() { new WoodTypeEntry.Builder(mcModId, "spectre") .log(Mods.RandomThings.getItem("spectrelog", 1)).removeCharcoalRecipe() .planks(Mods.RandomThings.getItem("spectreplank", 1), "spectreplank") + .registerAllUnificationInfo() .build()); } return DEFAULT_ENTRIES; @@ -31,6 +34,7 @@ public static void init() { GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry); GTWPWoodRecipeLoader.addCuttingRecipe(entry); GTWPWoodRecipeLoader.addSawmillRecipe(entry); + registerWoodUnificationInfo(entry); } } } 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 index d8048c9..27a887e 100644 --- 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 event) { + public void registerRecipesNormal(RegistryEvent.Register event) { RusticWoodRecipe.init(); } } diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/rustic/recipes/RusticWoodRecipe.java b/src/main/java/com/github/gtexpert/gtwp/integration/rustic/recipes/RusticWoodRecipe.java index 59744a0..78bedc9 100644 --- a/src/main/java/com/github/gtexpert/gtwp/integration/rustic/recipes/RusticWoodRecipe.java +++ b/src/main/java/com/github/gtexpert/gtwp/integration/rustic/recipes/RusticWoodRecipe.java @@ -1,5 +1,7 @@ package com.github.gtexpert.gtwp.integration.rustic.recipes; +import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodUnificationInfo; + import java.util.Arrays; import java.util.List; @@ -24,7 +26,7 @@ private static List getDefaultEntries() { .fenceGate(Mods.Rustic.getItem("fence_gate_olive", 1), "olive_fence_gate") .stairs(Mods.Rustic.getItem("stairs_olive", 1), "olive_stairs") .door(Mods.Rustic.getItem("olive_door", 1), "olive_door") - .registerAllOres() + .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "ironwood") .log(Mods.Rustic.getItem("log", 1, 1)).removeCharcoalRecipe() @@ -34,7 +36,7 @@ private static List getDefaultEntries() { .fenceGate(Mods.Rustic.getItem("fence_gate_ironwood", 1), "ironwood_fence_gate") .stairs(Mods.Rustic.getItem("stairs_ironwood", 1), "ironwood_stairs") .door(Mods.Rustic.getItem("ironwood_door", 1), "ironwood_door") - .registerAllOres() + .registerAllUnificationInfo() .build()); } return DEFAULT_ENTRIES; @@ -47,6 +49,7 @@ public static void init() { GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry); GTWPWoodRecipeLoader.addCuttingRecipe(entry); GTWPWoodRecipeLoader.addSawmillRecipe(entry); + registerWoodUnificationInfo(entry); } } } 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 index 6e4147c..4b8c0d1 100644 --- 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 event) { + public void registerRecipesNormal(RegistryEvent.Register event) { TCWoodRecipe.init(); } } diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/tc/recipes/TCWoodRecipe.java b/src/main/java/com/github/gtexpert/gtwp/integration/tc/recipes/TCWoodRecipe.java index 2c3c4b4..c80cbac 100644 --- a/src/main/java/com/github/gtexpert/gtwp/integration/tc/recipes/TCWoodRecipe.java +++ b/src/main/java/com/github/gtexpert/gtwp/integration/tc/recipes/TCWoodRecipe.java @@ -1,5 +1,7 @@ package com.github.gtexpert.gtwp.integration.tc.recipes; +import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodUnificationInfo; + import java.util.Arrays; import java.util.List; @@ -21,12 +23,14 @@ private static List getDefaultEntries() { .planks(Mods.Thaumcraft.getItem("plank_silverwood", 1), "planksilverwood") .slab(Mods.Thaumcraft.getItem("slab_silverwood", 1), "slabsilverwood") .stairs(Mods.Thaumcraft.getItem("stairs_silverwood", 1), "stairssilverwood") + .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "greatwood") .log(Mods.Thaumcraft.getItem("log_greatwood", 1)).removeCharcoalRecipe() .planks(Mods.Thaumcraft.getItem("plank_greatwood", 1), "plankgreatwood") .slab(Mods.Thaumcraft.getItem("slab_greatwood", 1), "slabgreatwood") .stairs(Mods.Thaumcraft.getItem("stairs_greatwood", 1), "stairsgreatwood") + .registerAllUnificationInfo() .build()); } return DEFAULT_ENTRIES; @@ -39,6 +43,7 @@ public static void init() { GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry); GTWPWoodRecipeLoader.addCuttingRecipe(entry); GTWPWoodRecipeLoader.addSawmillRecipe(entry); + registerWoodUnificationInfo(entry); } } } 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 index 748ff3c..e77845d 100644 --- 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 event) { + public void registerRecipesNormal(RegistryEvent.Register event) { TraverseWoodRecipe.init(); } } diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/traverse/recipes/TraverseWoodRecipe.java b/src/main/java/com/github/gtexpert/gtwp/integration/traverse/recipes/TraverseWoodRecipe.java index 1ab9ac9..a7738fa 100644 --- a/src/main/java/com/github/gtexpert/gtwp/integration/traverse/recipes/TraverseWoodRecipe.java +++ b/src/main/java/com/github/gtexpert/gtwp/integration/traverse/recipes/TraverseWoodRecipe.java @@ -1,5 +1,7 @@ package com.github.gtexpert.gtwp.integration.traverse.recipes; +import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodUnificationInfo; + import java.util.Arrays; import java.util.List; @@ -21,6 +23,7 @@ private static List getDefaultEntries() { .planks(Mods.Traverse.getItem("fir_planks", 1), "fir_planks") .slab(Mods.Traverse.getItem("fir_slab", 1), "fir_slab") .stairs(Mods.Traverse.getItem("fir_stairs", 1), "fir_stairs") + .registerAllUnificationInfo() .build()); } return DEFAULT_ENTRIES; @@ -33,6 +36,7 @@ public static void init() { GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry); GTWPWoodRecipeLoader.addCuttingRecipe(entry); GTWPWoodRecipeLoader.addSawmillRecipe(entry); + registerWoodUnificationInfo(entry); } } } 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 index 90a9860..b55650d 100644 --- 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 event) { + public void registerRecipesNormal(RegistryEvent.Register event) { TwilightWoodRecipe.init(); } } diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/twilight/recipes/TwilightWoodRecipe.java b/src/main/java/com/github/gtexpert/gtwp/integration/twilight/recipes/TwilightWoodRecipe.java index 5d17c18..af071b8 100644 --- a/src/main/java/com/github/gtexpert/gtwp/integration/twilight/recipes/TwilightWoodRecipe.java +++ b/src/main/java/com/github/gtexpert/gtwp/integration/twilight/recipes/TwilightWoodRecipe.java @@ -1,5 +1,7 @@ package com.github.gtexpert.gtwp.integration.twilight.recipes; +import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodUnificationInfo; + import java.util.Arrays; import java.util.List; @@ -29,6 +31,7 @@ private static List getDefaultEntries() { .fence(Mods.TwilightForest.getItem("twilight_oak_fence", 1), "wood/twilight_oak_fence") .fenceGate(Mods.TwilightForest.getItem("twilight_oak_gate", 1), "wood/twilight_oak_gate") .stairs(Mods.TwilightForest.getItem("twilight_oak_stairs", 1), "wood/twilight_oak_stairs") + .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "canopy") .log(Mods.TwilightForest.getItem("twilight_log", 1, 1)).removeCharcoalRecipe() @@ -37,6 +40,7 @@ private static List getDefaultEntries() { .fence(Mods.TwilightForest.getItem("canopy_fence", 1), "wood/canopy_fence") .fenceGate(Mods.TwilightForest.getItem("canopy_gate", 1), "wood/canopy_gate") .stairs(Mods.TwilightForest.getItem("canopy_stairs", 1), "wood/canopy_stairs") + .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "mangrove") .log(Mods.TwilightForest.getItem("twilight_log", 1, 2)).removeCharcoalRecipe() @@ -45,6 +49,7 @@ private static List getDefaultEntries() { .fence(Mods.TwilightForest.getItem("mangrove_fence", 1), "wood/mangrove_fence") .fenceGate(Mods.TwilightForest.getItem("mangrove_gate", 1), "wood/mangrove_gate") .stairs(Mods.TwilightForest.getItem("mangrove_stairs", 1), "wood/mangrove_stairs") + .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "dark") .log(Mods.TwilightForest.getItem("twilight_log", 1, 3)).removeCharcoalRecipe() @@ -53,6 +58,7 @@ private static List getDefaultEntries() { .fence(Mods.TwilightForest.getItem("dark_fence", 1), "wood/darkwood_fence") .fenceGate(Mods.TwilightForest.getItem("dark_gate", 1), "wood/darkwood_gate") .stairs(Mods.TwilightForest.getItem("dark_stairs", 1), "wood/darkwood_stairs") + .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "time") .log(Mods.TwilightForest.getItem("magic_log", 1, 0)).removeCharcoalRecipe() @@ -61,6 +67,7 @@ private static List getDefaultEntries() { .fence(Mods.TwilightForest.getItem("time_fence", 1), "wood/time_fence") .fenceGate(Mods.TwilightForest.getItem("time_gate", 1), "wood/time_gate") .stairs(Mods.TwilightForest.getItem("time_stairs", 1), "wood/time_stairs") + .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "trans") .log(Mods.TwilightForest.getItem("magic_log", 1, 1)).removeCharcoalRecipe() @@ -69,6 +76,7 @@ private static List getDefaultEntries() { .fence(Mods.TwilightForest.getItem("trans_fence", 1), "wood/trans_fence") .fenceGate(Mods.TwilightForest.getItem("trans_gate", 1), "wood/trans_gate") .stairs(Mods.TwilightForest.getItem("trans_stairs", 1), "wood/trans_stairs") + .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "mine") .log(Mods.TwilightForest.getItem("magic_log", 1, 2)).removeCharcoalRecipe() @@ -77,6 +85,7 @@ private static List getDefaultEntries() { .fence(Mods.TwilightForest.getItem("mine_fence", 1), "wood/mine_fence") .fenceGate(Mods.TwilightForest.getItem("mine_gate", 1), "wood/mine_gate") .stairs(Mods.TwilightForest.getItem("mine_stairs", 1), "wood/mine_stairs") + .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "sort") .log(Mods.TwilightForest.getItem("magic_log", 1, 3)).removeCharcoalRecipe() @@ -85,6 +94,7 @@ private static List getDefaultEntries() { .fence(Mods.TwilightForest.getItem("sort_fence", 1), "wood/sort_fence") .fenceGate(Mods.TwilightForest.getItem("sort_gate", 1), "wood/sort_gate") .stairs(Mods.TwilightForest.getItem("sort_stairs", 1), "wood/sort_stairs") + .registerAllUnificationInfo() .build()); } @@ -98,6 +108,7 @@ public static void init() { GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry); GTWPWoodRecipeLoader.addCuttingRecipe(entry); GTWPWoodRecipeLoader.addSawmillRecipe(entry); + registerWoodUnificationInfo(entry); } // Giant Log 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 index 24151b8..f5bb95e 100644 --- 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 event) { + public void registerRecipesNormal(RegistryEvent.Register event) { WizardryWoodRecipe.init(); } } diff --git a/src/main/java/com/github/gtexpert/gtwp/integration/wizardry/recipes/WizardryWoodRecipe.java b/src/main/java/com/github/gtexpert/gtwp/integration/wizardry/recipes/WizardryWoodRecipe.java index 7a0a08f..9d1e7e9 100644 --- a/src/main/java/com/github/gtexpert/gtwp/integration/wizardry/recipes/WizardryWoodRecipe.java +++ b/src/main/java/com/github/gtexpert/gtwp/integration/wizardry/recipes/WizardryWoodRecipe.java @@ -1,5 +1,7 @@ package com.github.gtexpert.gtwp.integration.wizardry.recipes; +import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodUnificationInfo; + import java.util.Arrays; import java.util.List; @@ -37,6 +39,7 @@ public static void init() { GTWPWoodRecipeLoader.registerWoodTypeRecipe(false, entry); GTWPWoodRecipeLoader.addCuttingRecipe(entry); GTWPWoodRecipeLoader.addSawmillRecipe(entry); + registerWoodUnificationInfo(entry); } } }