diff --git a/src/generated/resources/data/botania/recipes/petal_apothecary/vazkii_head.json b/src/generated/resources/data/botania/recipes/petal_apothecary/vazkii_head.json index 57da1737d..f1706b0db 100644 --- a/src/generated/resources/data/botania/recipes/petal_apothecary/vazkii_head.json +++ b/src/generated/resources/data/botania/recipes/petal_apothecary/vazkii_head.json @@ -1,10 +1,10 @@ { "type": "botania:petal_apothecary", "output": { - "item": "minecraft:player_head", - "tag": { + "nbt": { "SkullOwner": "Vazkii" - } + }, + "item": "minecraft:player_head" }, "ingredients": [ { diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java index 056940043..d8dc09666 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java @@ -148,7 +148,7 @@ public class RecipePetals implements IRecipe { for (Ingredient input : recipe.getIngredients()) { input.write(buf); } - buf.writeItemStack(recipe.getRecipeOutput()); + buf.writeItemStack(recipe.getRecipeOutput(), false); } } diff --git a/src/main/java/vazkii/botania/api/recipe/StateIngredient.java b/src/main/java/vazkii/botania/api/recipe/StateIngredient.java index e18eb52cf..325c09f0f 100644 --- a/src/main/java/vazkii/botania/api/recipe/StateIngredient.java +++ b/src/main/java/vazkii/botania/api/recipe/StateIngredient.java @@ -25,6 +25,7 @@ import net.minecraft.tags.Tag; import net.minecraft.util.JSONUtils; import net.minecraft.util.ResourceLocation; import net.minecraftforge.registries.ForgeRegistries; +import vazkii.botania.common.core.helper.ItemNBTHelper; import java.util.Collections; import java.util.List; @@ -80,8 +81,8 @@ public abstract class StateIngredient implements Predicate { */ public static JsonObject serializeBlockState(BlockState state) { CompoundNBT nbt = NBTUtil.writeBlockState(state); - renameTag(nbt, "Name", "name"); - renameTag(nbt, "Properties", "properties"); + ItemNBTHelper.renameTag(nbt, "Name", "name"); + ItemNBTHelper.renameTag(nbt, "Properties", "properties"); Dynamic dyn = new Dynamic<>(NBTDynamicOps.INSTANCE, nbt); return dyn.convert(JsonOps.INSTANCE).getValue().getAsJsonObject(); } @@ -91,8 +92,8 @@ public abstract class StateIngredient implements Predicate { */ public static BlockState readBlockState(JsonObject object) { CompoundNBT nbt = (CompoundNBT) new Dynamic<>(JsonOps.INSTANCE, object).convert(NBTDynamicOps.INSTANCE).getValue(); - renameTag(nbt, "name", "Name"); - renameTag(nbt, "properties", "Properties"); + ItemNBTHelper.renameTag(nbt, "name", "Name"); + ItemNBTHelper.renameTag(nbt, "properties", "Properties"); String name = nbt.getString("Name"); ResourceLocation id = ResourceLocation.tryCreate(name); if (id == null || !ForgeRegistries.BLOCKS.containsKey(id)) { @@ -101,14 +102,6 @@ public abstract class StateIngredient implements Predicate { return NBTUtil.readBlockState(nbt); } - private static void renameTag(CompoundNBT nbt, String oldName, String newName) { - INBT tag = nbt.get(oldName); - if (tag != null) { - nbt.remove(oldName); - nbt.put(newName, tag); - } - } - public abstract JsonObject serialize(); public abstract void write(PacketBuffer buffer); 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 fd84cfc46..4747c21a5 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/RunicAltarProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/RunicAltarProcessor.java @@ -8,16 +8,19 @@ */ package vazkii.botania.client.patchouli.processor; +import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeRuneAltar; +import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.patchouli.api.IVariableProvider; public class RunicAltarProcessor extends PetalApothecaryProcessor { @Override public void setup(IVariableProvider variables) { - this.recipe = null; //BotaniaAPI.runeAltarRecipes.get(new ResourceLocation(variables.get("recipe"))); + ResourceLocation id = new ResourceLocation(variables.get("recipe")); + this.recipe = Minecraft.getInstance().world.getRecipeManager().getRecipes(ModRecipeTypes.RUNE_TYPE).get(id); } @Override diff --git a/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java b/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java index cecbe853f..fdfc3c5f1 100644 --- a/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java @@ -162,8 +162,8 @@ public final class ItemNBTHelper { nbt.putByte("count", c); } nbt.remove("Count"); - nbt.put("item", nbt.get("id")); - nbt.remove("id"); + renameTag(nbt, "id", "item"); + renameTag(nbt, "tag", "nbt"); Dynamic dyn = new Dynamic<>(NBTDynamicOps.INSTANCE, nbt); return dyn.convert(JsonOps.INSTANCE).getValue().getAsJsonObject(); } @@ -212,4 +212,11 @@ public final class ItemNBTHelper { return true; } + public static void renameTag(CompoundNBT nbt, String oldName, String newName) { + INBT tag = nbt.get(oldName); + if (tag != null) { + nbt.remove(oldName); + nbt.put(newName, tag); + } + } } diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/pure_daisy.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/pure_daisy.json index ca5e6ac8a..c34232cd9 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/pure_daisy.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/pure_daisy.json @@ -29,7 +29,7 @@ { "type": "petal_apothecary", "text": "botania.page.pureDaisy3", - "recipe": "botania:pure_daisy" + "recipe": "botania:petal_apothecary/pure_daisy" } ], "extra_recipe_mappings": { @@ -40,4 +40,4 @@ "minecraft:blue_ice": 1, "minecraft:obsidian": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/rune_altar.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/rune_altar.json index f59fde22a..9b3a02858 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/rune_altar.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/rune_altar.json @@ -38,82 +38,82 @@ { "type": "runic_altar", "text": "botania.page.runeAltar4", - "recipe": "botania:water" + "recipe": "botania:runic_altar/water" }, { "type": "runic_altar", "text": "botania.page.runeAltar5", - "recipe": "botania:earth" + "recipe": "botania:runic_altar/earth" }, { "type": "runic_altar", "text": "botania.page.runeAltar6", - "recipe": "botania:air" + "recipe": "botania:runic_altar/air" }, { "type": "runic_altar", "text": "botania.page.runeAltar7", - "recipe": "botania:fire" + "recipe": "botania:runic_altar/fire" }, { "type": "runic_altar", "text": "botania.page.runeAltar8", - "recipe": "botania:spring" + "recipe": "botania:runic_altar/spring" }, { "type": "runic_altar", "text": "botania.page.runeAltar9", - "recipe": "botania:summer" + "recipe": "botania:runic_altar/summer" }, { "type": "runic_altar", "text": "botania.page.runeAltar10", - "recipe": "botania:autumn" + "recipe": "botania:runic_altar/autumn" }, { "type": "runic_altar", "text": "botania.page.runeAltar11", - "recipe": "botania:winter" + "recipe": "botania:runic_altar/winter" }, { "type": "runic_altar", "text": "botania.page.runeAltar12", - "recipe": "botania:mana" + "recipe": "botania:runic_altar/mana" }, { "type": "runic_altar", "text": "botania.page.runeAltar13", - "recipe": "botania:lust" + "recipe": "botania:runic_altar/lust" }, { "type": "runic_altar", "text": "botania.page.runeAltar14", - "recipe": "botania:gluttony" + "recipe": "botania:runic_altar/gluttony" }, { "type": "runic_altar", "text": "botania.page.runeAltar15", - "recipe": "botania:greed" + "recipe": "botania:runic_altar/greed" }, { "type": "runic_altar", "text": "botania.page.runeAltar16", - "recipe": "botania:sloth" + "recipe": "botania:runic_altar/sloth" }, { "type": "runic_altar", "text": "botania.page.runeAltar17", - "recipe": "botania:wrath" + "recipe": "botania:runic_altar/wrath" }, { "type": "runic_altar", "text": "botania.page.runeAltar18", - "recipe": "botania:envy" + "recipe": "botania:runic_altar/envy" }, { "type": "runic_altar", "text": "botania.page.runeAltar19", - "recipe": "botania:pride" + "recipe": "botania:runic_altar/pride" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/agricarnation.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/agricarnation.json index 5265802e1..00b49d5a9 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/agricarnation.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/agricarnation.json @@ -11,7 +11,7 @@ { "type": "petal_apothecary", "text": "botania.page.agricarnation1", - "recipe": "botania:agricarnation" + "recipe": "botania:petal_apothecary/agricarnation" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bellethorne.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bellethorne.json index 1b7326149..3c3977615 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bellethorne.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bellethorne.json @@ -11,7 +11,7 @@ { "type": "petal_apothecary", "text": "botania.page.bellethorne1", - "recipe": "botania:bellethorn" + "recipe": "botania:petal_apothecary/bellethorn" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bergamute.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bergamute.json index f6dc77384..8c3f92212 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bergamute.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bergamute.json @@ -11,7 +11,7 @@ { "type": "petal_apothecary", "text": "botania.page.bergamute1", - "recipe": "botania:bergamute" + "recipe": "botania:petal_apothecary/bergamute" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bubbell.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bubbell.json index b7da1654d..120b43404 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bubbell.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bubbell.json @@ -12,7 +12,7 @@ { "type": "petal_apothecary", "text": "botania.page.bubbell1", - "recipe": "botania:bubbell" + "recipe": "botania:petal_apothecary/bubbell" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/clayconia.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/clayconia.json index 68c516196..ab4d0cd55 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/clayconia.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/clayconia.json @@ -11,7 +11,7 @@ { "type": "petal_apothecary", "text": "botania.page.clayconia1", - "recipe": "botania:clayconia" + "recipe": "botania:petal_apothecary/clayconia" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/daffomill.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/daffomill.json index 49dbceba6..10ee37542 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/daffomill.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/daffomill.json @@ -11,7 +11,7 @@ { "type": "petal_apothecary", "text": "botania.page.daffomill1", - "recipe": "botania:daffomill" + "recipe": "botania:petal_apothecary/daffomill" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/dreadthorne.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/dreadthorne.json index 284d96f48..66d88ebb5 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/dreadthorne.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/dreadthorne.json @@ -11,7 +11,7 @@ { "type": "petal_apothecary", "text": "botania.page.dreadthorne1", - "recipe": "botania:dreadthorn" + "recipe": "botania:petal_apothecary/dreadthorn" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/exoflame.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/exoflame.json index 23b23d4e9..6731fe781 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/exoflame.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/exoflame.json @@ -11,7 +11,7 @@ { "type": "petal_apothecary", "text": "botania.page.exoflame1", - "recipe": "botania:exoflame" + "recipe": "botania:petal_apothecary/exoflame" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/fallen_kanade.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/fallen_kanade.json index b87da14a3..da917d914 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/fallen_kanade.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/fallen_kanade.json @@ -11,7 +11,7 @@ { "type": "petal_apothecary", "text": "botania.page.fallenKanade1", - "recipe": "botania:fallen_kanade" + "recipe": "botania:petal_apothecary/fallen_kanade" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/heisei_dream.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/heisei_dream.json index 656ed6a1f..88d506fce 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/heisei_dream.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/heisei_dream.json @@ -12,7 +12,7 @@ { "type": "petal_apothecary", "text": "botania.page.heiseiDream1", - "recipe": "botania:heisei_dream" + "recipe": "botania:petal_apothecary/heisei_dream" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/hopperhock.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/hopperhock.json index c60797d73..3578efdde 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/hopperhock.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/hopperhock.json @@ -15,7 +15,7 @@ { "type": "petal_apothecary", "text": "botania.page.hopperhock2", - "recipe": "botania:hopperhock" + "recipe": "botania:petal_apothecary/hopperhock" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/hyacidus.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/hyacidus.json index 06f0a726a..157fd251a 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/hyacidus.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/hyacidus.json @@ -11,7 +11,7 @@ { "type": "petal_apothecary", "text": "botania.page.hyacidus1", - "recipe": "botania:hyacidus" + "recipe": "botania:petal_apothecary/hyacidus" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/jaded_amaranthus.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/jaded_amaranthus.json index b5d0c9a52..f5b99cdb7 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/jaded_amaranthus.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/jaded_amaranthus.json @@ -11,11 +11,11 @@ { "type": "petal_apothecary", "text": "botania.page.jadedAmaranthus1", - "recipe": "botania:jaded_amaranthus" + "recipe": "botania:petal_apothecary/jaded_amaranthus" }, { "type": "text", "text": "botania.page.jadedAmaranthus2" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/jiyuulia.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/jiyuulia.json index 0191d4230..4986f6aae 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/jiyuulia.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/jiyuulia.json @@ -11,7 +11,7 @@ { "type": "petal_apothecary", "text": "botania.page.jiyuulia1", - "recipe": "botania:jiyuulia" + "recipe": "botania:petal_apothecary/jiyuulia" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/loonium.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/loonium.json index 8180c37dd..c1cf868ed 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/loonium.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/loonium.json @@ -12,7 +12,7 @@ { "type": "petal_apothecary", "text": "botania.page.loonium1", - "recipe": "botania:loonium" + "recipe": "botania:petal_apothecary/loonium" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/marimorphosis.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/marimorphosis.json index 848d68464..7641a423a 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/marimorphosis.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/marimorphosis.json @@ -19,7 +19,7 @@ { "type": "petal_apothecary", "text": "botania.page.marimorphosis2", - "recipe": "botania:marimorphosis" + "recipe": "botania:petal_apothecary/marimorphosis" }, { "type": "crafting_multi", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/medumone.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/medumone.json index 11a803cfd..a4e0bf73f 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/medumone.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/medumone.json @@ -11,7 +11,7 @@ { "type": "petal_apothecary", "text": "botania.page.medumone1", - "recipe": "botania:medumone" + "recipe": "botania:petal_apothecary/medumone" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/orechid.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/orechid.json index 1ec0c6f44..fc623841e 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/orechid.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/orechid.json @@ -13,7 +13,7 @@ { "type": "petal_apothecary", "text": "botania.page.orechid1", - "recipe": "botania:orechid" + "recipe": "botania:petal_apothecary/orechid" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/orechid_gog.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/orechid_gog.json index 388ae0e19..b6e6b3cd6 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/orechid_gog.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/orechid_gog.json @@ -13,7 +13,7 @@ { "type": "petal_apothecary", "text": "botania.page.orechid1", - "recipe": "botania:orechid" + "recipe": "botania:petal_apothecary/orechid" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/orechid_ignem.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/orechid_ignem.json index d919fb652..438639aab 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/orechid_ignem.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/orechid_ignem.json @@ -12,7 +12,7 @@ { "type": "petal_apothecary", "text": "botania.page.orechidIgnem1", - "recipe": "botania:orechid_ignem" + "recipe": "botania:petal_apothecary/orechid_ignem" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/pollidisiac.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/pollidisiac.json index 6bd68ddca..6b6064df4 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/pollidisiac.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/pollidisiac.json @@ -11,7 +11,7 @@ { "type": "petal_apothecary", "text": "botania.page.pollidisiac1", - "recipe": "botania:pollidisiac" + "recipe": "botania:petal_apothecary/pollidisiac" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/rannuncarpus.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/rannuncarpus.json index 73809942b..bf8cb3f34 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/rannuncarpus.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/rannuncarpus.json @@ -15,7 +15,7 @@ { "type": "petal_apothecary", "text": "botania.page.rannuncarpus2", - "recipe": "botania:rannuncarpus" + "recipe": "botania:petal_apothecary/rannuncarpus" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/solegnolia.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/solegnolia.json index c222f4f52..0c025c269 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/solegnolia.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/solegnolia.json @@ -11,7 +11,7 @@ { "type": "petal_apothecary", "text": "botania.page.solegnolia1", - "recipe": "botania:solegnolia" + "recipe": "botania:petal_apothecary/solegnolia" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/spectranthemum.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/spectranthemum.json index 975dbf876..ff6b872d7 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/spectranthemum.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/spectranthemum.json @@ -20,7 +20,7 @@ { "type": "petal_apothecary", "text": "botania.page.spectranthemum3", - "recipe": "botania:spectranthemum" + "recipe": "botania:petal_apothecary/spectranthemum" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/tangleberrie.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/tangleberrie.json index d6fe17618..fa565a54c 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/tangleberrie.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/tangleberrie.json @@ -11,7 +11,7 @@ { "type": "petal_apothecary", "text": "botania.page.tangleberrie1", - "recipe": "botania:tangleberrie" + "recipe": "botania:petal_apothecary/tangleberrie" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/tigerseye.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/tigerseye.json index 6cbff299c..a132320f1 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/tigerseye.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/tigerseye.json @@ -11,7 +11,7 @@ { "type": "petal_apothecary", "text": "botania.page.tigerseye1", - "recipe": "botania:tigerseye" + "recipe": "botania:petal_apothecary/tigerseye" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/vinculotus.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/vinculotus.json index e3122b245..b21248551 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/vinculotus.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/vinculotus.json @@ -11,7 +11,7 @@ { "type": "petal_apothecary", "text": "botania.page.vinculotus1", - "recipe": "botania:vinculotus" + "recipe": "botania:petal_apothecary/vinculotus" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/arcanerose.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/arcanerose.json index c370211c8..4e8d0e96f 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/arcanerose.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/arcanerose.json @@ -11,7 +11,7 @@ { "type": "petal_apothecary", "text": "botania.page.arcanerose1", - "recipe": "botania:rosa_arcana" + "recipe": "botania:petal_apothecary/rosa_arcana" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/dandelifeon.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/dandelifeon.json index 48a1b9848..40ff48ad1 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/dandelifeon.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/dandelifeon.json @@ -44,7 +44,7 @@ { "type": "petal_apothecary", "text": "botania.page.dandelifeon8", - "recipe": "botania:dandelifeon" + "recipe": "botania:petal_apothecary/dandelifeon" }, { "type": "crafting", @@ -52,4 +52,4 @@ "recipe": "botania:cell_block" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/endoflame.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/endoflame.json index 219e6b891..e28d72826 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/endoflame.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/endoflame.json @@ -20,7 +20,7 @@ { "type": "petal_apothecary", "text": "botania.page.endoflame2", - "recipe": "botania:endoflame" + "recipe": "botania:petal_apothecary/endoflame" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/entropinnyum.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/entropinnyum.json index b30a82ee9..b749c25d2 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/entropinnyum.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/entropinnyum.json @@ -11,7 +11,7 @@ { "type": "petal_apothecary", "text": "botania.page.entropinnyum1", - "recipe": "botania:entropinnyum" + "recipe": "botania:petal_apothecary/entropinnyum" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/gourmaryllis.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/gourmaryllis.json index ceea416f7..b74c19004 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/gourmaryllis.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/gourmaryllis.json @@ -19,7 +19,7 @@ { "type": "petal_apothecary", "text": "botania.page.gourmaryllis3", - "recipe": "botania:gourmaryllis" + "recipe": "botania:petal_apothecary/gourmaryllis" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/hydroangeas.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/hydroangeas.json index b70a45067..1bb5212c5 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/hydroangeas.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/hydroangeas.json @@ -12,7 +12,7 @@ { "type": "petal_apothecary", "text": "botania.page.hydroangeas1", - "recipe": "botania:hydroangeas" + "recipe": "botania:petal_apothecary/hydroangeas" } ] } diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/kekimurus.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/kekimurus.json index 9960317d0..07f223908 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/kekimurus.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/kekimurus.json @@ -12,7 +12,7 @@ { "type": "petal_apothecary", "text": "botania.page.kekimurus1", - "recipe": "botania:kekimurus" + "recipe": "botania:petal_apothecary/kekimurus" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/munchdew.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/munchdew.json index a3238b6ed..bdd6d5bef 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/munchdew.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/munchdew.json @@ -15,7 +15,7 @@ { "type": "petal_apothecary", "text": "botania.page.munchdew2", - "recipe": "botania:munchdew" + "recipe": "botania:petal_apothecary/munchdew" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/narslimmus.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/narslimmus.json index 8aaf961ce..d537aaa53 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/narslimmus.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/narslimmus.json @@ -11,7 +11,7 @@ { "type": "petal_apothecary", "text": "botania.page.narslimmus1", - "recipe": "botania:narslimmus" + "recipe": "botania:petal_apothecary/narslimmus" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/rafflowsia.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/rafflowsia.json index 512c10cb4..781bfdc32 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/rafflowsia.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/rafflowsia.json @@ -12,7 +12,7 @@ { "type": "petal_apothecary", "text": "botania.page.rafflowsia1", - "recipe": "botania:rafflowsia" + "recipe": "botania:petal_apothecary/rafflowsia" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/shulk_me_not.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/shulk_me_not.json index 909e03993..7f6acc4bd 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/shulk_me_not.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/shulk_me_not.json @@ -16,7 +16,7 @@ { "type": "petal_apothecary", "text": "botania.page.shulk_me_not2", - "recipe": "botania:shulk_me_not" + "recipe": "botania:petal_apothecary/shulk_me_not" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/spectrolus.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/spectrolus.json index 7a3328d96..5636da43a 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/spectrolus.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/spectrolus.json @@ -20,7 +20,7 @@ { "type": "petal_apothecary", "text": "botania.page.spectrolus2", - "recipe": "botania:spectrolus" + "recipe": "botania:petal_apothecary/spectrolus" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/thermalily.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/thermalily.json index 68d50666b..a581bf855 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/thermalily.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/thermalily.json @@ -19,7 +19,7 @@ { "type": "petal_apothecary", "text": "botania.page.thermalily1", - "recipe": "botania:thermalily" + "recipe": "botania:petal_apothecary/thermalily" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/manastar.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/manastar.json index f238e5574..92dce0359 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/manastar.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/manastar.json @@ -12,7 +12,7 @@ { "type": "petal_apothecary", "text": "botania.page.manastar1", - "recipe": "botania:manastar" + "recipe": "botania:petal_apothecary/manastar" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/head_creating.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/head_creating.json index b36061ba7..7289b23d1 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/head_creating.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/head_creating.json @@ -16,7 +16,7 @@ { "type": "runic_altar", "text": "botania.page.headCreating1", - "recipe": "botania:head" + "recipe": "botania:runic_altar/head" } ] -} \ No newline at end of file +}