From a9dace47065f95d09e32269dc30b599504df605e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 5 Apr 2020 12:03:00 -0500 Subject: [PATCH] Warn on all missing recipes in patchouli components --- .../client/patchouli/processor/BrewRecipeProcessor.java | 3 +++ .../client/patchouli/processor/ElvenTradeProcessor.java | 3 +++ .../client/patchouli/processor/MultiCraftingProcessor.java | 3 +++ .../client/patchouli/processor/PetalApothecaryProcessor.java | 4 ++++ .../client/patchouli/processor/RunicAltarProcessor.java | 4 ++++ 5 files changed, 17 insertions(+) diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/BrewRecipeProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/BrewRecipeProcessor.java index a716715b1..4aaeb2384 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/BrewRecipeProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/BrewRecipeProcessor.java @@ -16,6 +16,7 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeBrew; +import vazkii.botania.common.Botania; import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.botania.common.item.ModItems; import vazkii.patchouli.api.IComponentProcessor; @@ -31,6 +32,8 @@ public class BrewRecipeProcessor implements IComponentProcessor { IRecipe recipe = Minecraft.getInstance().world.getRecipeManager().getRecipes(ModRecipeTypes.BREW_TYPE).get(id); if (recipe instanceof RecipeBrew) { this.recipe = (RecipeBrew) recipe; + } else { + Botania.LOGGER.warn("Missing brew recipe " + id); } } diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/ElvenTradeProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/ElvenTradeProcessor.java index 3c65ab4d3..33305111d 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/ElvenTradeProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/ElvenTradeProcessor.java @@ -17,6 +17,7 @@ import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; import vazkii.botania.client.patchouli.PatchouliUtils; +import vazkii.botania.common.Botania; import vazkii.botania.common.crafting.AbstractElvenTradeRecipe; import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.patchouli.api.IComponentProcessor; @@ -37,6 +38,8 @@ public class ElvenTradeProcessor implements IComponentProcessor { IRecipe recipe = Minecraft.getInstance().world.getRecipeManager().getRecipes(ModRecipeTypes.ELVEN_TRADE_TYPE).get(new ResourceLocation(s)); if (recipe instanceof AbstractElvenTradeRecipe) { builder.add((AbstractElvenTradeRecipe) recipe); + } else { + Botania.LOGGER.warn("Missing elven trade recipe " + s); } } recipes = builder.build(); diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java index 66cc7814b..e742241ae 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java @@ -19,6 +19,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.crafting.IShapedRecipe; import vazkii.botania.client.patchouli.PatchouliUtils; +import vazkii.botania.common.Botania; import vazkii.patchouli.api.IComponentProcessor; import vazkii.patchouli.api.IVariableProvider; import vazkii.patchouli.api.PatchouliAPI; @@ -52,6 +53,8 @@ public class MultiCraftingProcessor implements IComponentProcessor { longestIngredientSize = size; } } + } else { + Botania.LOGGER.warn("Missing crafting recipe " + name); } } this.hasCustomHeading = variables.has("heading"); diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/PetalApothecaryProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/PetalApothecaryProcessor.java index 4f61ff4c5..71a9b0959 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/PetalApothecaryProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/PetalApothecaryProcessor.java @@ -12,6 +12,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; +import vazkii.botania.common.Botania; import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.patchouli.api.IComponentProcessor; import vazkii.patchouli.api.IVariableProvider; @@ -24,6 +25,9 @@ public class PetalApothecaryProcessor implements IComponentProcessor { public void setup(IVariableProvider variables) { ResourceLocation id = new ResourceLocation(variables.get("recipe")); this.recipe = Minecraft.getInstance().world.getRecipeManager().getRecipes(ModRecipeTypes.PETAL_TYPE).get(id); + if (recipe == null) { + Botania.LOGGER.warn("Missing apothecary recipe " + id); + } } @Override diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/RunicAltarProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/RunicAltarProcessor.java index 4747c21a5..2059b1375 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/RunicAltarProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/RunicAltarProcessor.java @@ -13,6 +13,7 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeRuneAltar; +import vazkii.botania.common.Botania; import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.patchouli.api.IVariableProvider; @@ -21,6 +22,9 @@ public class RunicAltarProcessor extends PetalApothecaryProcessor { public void setup(IVariableProvider variables) { ResourceLocation id = new ResourceLocation(variables.get("recipe")); this.recipe = Minecraft.getInstance().world.getRecipeManager().getRecipes(ModRecipeTypes.RUNE_TYPE).get(id); + if (recipe == null) { + Botania.LOGGER.warn("Missing rune altar recipe " + id); + } } @Override