From a5a6530b637a584cf3fe5e49c189c53693bc36d8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 4 Jan 2020 12:30:22 -0600 Subject: [PATCH] Implement grouping for mana infusion recipes, use it for patchouli. Clean up alchemy recipes and update some cycles to include new 1.14 stuff --- .../api/recipe/RecipeManaInfusion.java | 20 +++++- .../processor/ManaInfusionProcessor.java | 23 ++++-- .../crafting/ModManaAlchemyRecipes.java | 72 ++++++------------- .../en_us/entries/basics/garden_of_glass.json | 2 +- .../en_us/entries/devices/mana_alchemy.json | 18 ++--- 5 files changed, 70 insertions(+), 65 deletions(-) diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java index 1d243bda8..470247bf8 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java @@ -34,6 +34,7 @@ public class RecipeManaInfusion { private final int mana; @Nullable private BlockState catalystState; + private final String group; public static RecipeManaInfusion conjuration(ResourceLocation id, ItemStack output, Ingredient input, int mana) { RecipeManaInfusion ret = new RecipeManaInfusion(id, output, input, mana); @@ -42,17 +43,26 @@ public class RecipeManaInfusion { } public static RecipeManaInfusion alchemy(ResourceLocation id, ItemStack output, Ingredient input, int mana) { - RecipeManaInfusion ret = new RecipeManaInfusion(id, output, input, mana); + return alchemy(id, output, input, mana, null); + } + + public static RecipeManaInfusion alchemy(ResourceLocation id, ItemStack output, Ingredient input, int mana, @Nullable String group) { + RecipeManaInfusion ret = new RecipeManaInfusion(id, output, input, mana, group); ret.setCatalyst(alchemy.getDefaultState()); return ret; } public RecipeManaInfusion(ResourceLocation id, ItemStack output, Ingredient input, int mana) { + this(id, output, input, mana, null); + } + + public RecipeManaInfusion(ResourceLocation id, ItemStack output, Ingredient input, int mana, @Nullable String group) { this.id = id; this.output = output; this.input = input; this.mana = mana; Preconditions.checkArgument(mana < 100000); + this.group = group == null ? "" : group; } public final ResourceLocation getId() { @@ -84,12 +94,17 @@ public class RecipeManaInfusion { return mana; } + public String getGroup() { + return group; + } + public void write(PacketBuffer buf) { buf.writeResourceLocation(id); input.write(buf); buf.writeItemStack(output, false); buf.writeVarInt(mana); buf.writeInt(catalystState == null ? -1 : Block.getStateId(catalystState)); + buf.writeString(group); } public static RecipeManaInfusion read(PacketBuffer buf) { @@ -98,7 +113,8 @@ public class RecipeManaInfusion { ItemStack output = buf.readItemStack(); int mana = buf.readVarInt(); int catalystId = buf.readInt(); - RecipeManaInfusion ret = new RecipeManaInfusion(id, output, input, mana); + String group = buf.readString(); + RecipeManaInfusion ret = new RecipeManaInfusion(id, output, input, mana, group); ret.setCatalyst(catalystId == -1 ? null : Block.getStateById(catalystId)); return ret; } diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java index 4604e6535..e8b0de3ec 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java @@ -19,6 +19,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.client.core.helper.RenderHelper; 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; @@ -32,13 +33,27 @@ public class ManaInfusionProcessor implements IComponentProcessor { @Override public void setup(IVariableProvider variables) { + if (variables.has("recipes") && variables.has("group")) { + Botania.LOGGER.warn("Mana infusion template has both 'recipes' and 'group', ignoring 'recipes'"); + } + ImmutableList.Builder builder = ImmutableList.builder(); - for(String s : variables.get("recipes").split(";")) { - RecipeManaInfusion recipe = BotaniaAPI.manaInfusionRecipes.get(new ResourceLocation(s)); - if(recipe != null) { - builder.add(recipe); + if (variables.has("group")) { + String group = variables.get("group"); + BotaniaAPI.manaInfusionRecipes.values().stream() + .filter(r -> r.getGroup().equals(group)) + .forEach(builder::add); + } else { + for(String s : variables.get("recipes").split(";")) { + RecipeManaInfusion recipe = BotaniaAPI.manaInfusionRecipes.get(new ResourceLocation(s)); + if(recipe != null) { + builder.add(recipe); + } else { + Botania.LOGGER.warn("Mana infusion template references nonexistent recipe {}", s); + } } } + this.recipes = builder.build(); this.hasCustomHeading = variables.has("heading"); } diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index 49ac22201..39ffb60f4 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -28,6 +28,9 @@ import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nullable; +import java.util.function.Consumer; + import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) @@ -37,19 +40,8 @@ public final class ModManaAlchemyRecipes { public static void register(RegisterRecipesEvent evt) { evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("rotten_flesh_to_leather"), new ItemStack(Items.LEATHER), Ingredient.fromItems(Items.ROTTEN_FLESH), 600)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("oak_to_spruce_log"), new ItemStack(Blocks.SPRUCE_LOG), Ingredient.fromItems(Blocks.OAK_LOG), 40)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("spruce_to_birch_log"), new ItemStack(Blocks.BIRCH_LOG), Ingredient.fromItems(Blocks.SPRUCE_LOG), 40)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("birch_to_jungle_log"), new ItemStack(Blocks.JUNGLE_LOG), Ingredient.fromItems(Blocks.BIRCH_LOG), 40)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("jungle_to_acacia_log"), new ItemStack(Blocks.ACACIA_LOG), Ingredient.fromItems(Blocks.JUNGLE_LOG), 40)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("acacia_to_dark_oak_log"), new ItemStack(Blocks.DARK_OAK_LOG), Ingredient.fromItems(Blocks.ACACIA_LOG), 40)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("dark_oak_to_oak_log"), new ItemStack(Blocks.OAK_LOG), Ingredient.fromItems(Blocks.DARK_OAK_LOG), 40)); - - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("oak_to_spruce_sapling"), new ItemStack(Blocks.SPRUCE_SAPLING), Ingredient.fromItems(Blocks.OAK_SAPLING), 120)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("spruce_to_birch_sapling"), new ItemStack(Blocks.BIRCH_SAPLING), Ingredient.fromItems(Blocks.SPRUCE_SAPLING), 120)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("birch_to_jungle_sapling"), new ItemStack(Blocks.JUNGLE_SAPLING), Ingredient.fromItems(Blocks.BIRCH_SAPLING), 120)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("jungle_to_acacia_sapling"), new ItemStack(Blocks.ACACIA_SAPLING), Ingredient.fromItems(Blocks.JUNGLE_SAPLING), 120)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("acacia_to_dark_oak_sapling"), new ItemStack(Blocks.DARK_OAK_SAPLING), Ingredient.fromItems(Blocks.ACACIA_SAPLING), 120)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("dark_oak_to_oak_sapling"), new ItemStack(Blocks.OAK_SAPLING), Ingredient.fromItems(Blocks.DARK_OAK_SAPLING), 120)); + cycle(evt.manaInfusion(), 40, "botania:log_cycle", Blocks.OAK_LOG, Blocks.SPRUCE_LOG, Blocks.BIRCH_LOG, Blocks.JUNGLE_LOG, Blocks.ACACIA_LOG, Blocks.DARK_OAK_LOG); + cycle(evt.manaInfusion(), 120, "botania:sapling_cycle", Blocks.OAK_SAPLING, Blocks.SPRUCE_SAPLING, Blocks.BIRCH_SAPLING, Blocks.JUNGLE_SAPLING, Blocks.ACACIA_SAPLING, Blocks.DARK_OAK_SAPLING); evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("glowstone_deconstruct"), new ItemStack(Items.GLOWSTONE_DUST, 4), Ingredient.fromItems(Blocks.GLOWSTONE), 25)); evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("quartz_deconstruct"), new ItemStack(Items.QUARTZ, 4), Ingredient.fromItems(Blocks.QUARTZ_BLOCK), 25)); @@ -66,27 +58,13 @@ public final class ModManaAlchemyRecipes { evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("vine_to_lily_pad"), new ItemStack(Blocks.LILY_PAD), Ingredient.fromItems(Blocks.VINE), 320)); evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("lily_pad_to_vine"), new ItemStack(Blocks.VINE), Ingredient.fromItems(Blocks.LILY_PAD), 320)); - Item[] fishes = { Items.COD, Items.SALMON, Items.TROPICAL_FISH, Items.PUFFERFISH }; - for(int i = 0; i < fishes.length; i++) { - Ingredient in = Ingredient.fromItems(fishes[i]); - ItemStack out = new ItemStack(i == fishes.length - 1 ? fishes[0] : fishes[i + 1]); - String id = String.format("%s_to_%s", fishes[i].getRegistryName().getPath(), out.getItem().getRegistryName().getPath()); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(new ResourceLocation(LibMisc.MOD_ID, id), out, in, 200)); - } - - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("cocoa_to_wheat"), new ItemStack(Items.WHEAT_SEEDS), Ingredient.fromItems(Items.COCOA_BEANS), 6000)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("wheat_to_potato"), new ItemStack(Items.POTATO), Ingredient.fromItems(Items.WHEAT), 6000)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("potato_to_carrot"), new ItemStack(Items.CARROT), Ingredient.fromItems(Items.POTATO), 6000)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("carrot_to_beetroot"), new ItemStack(Items.BEETROOT_SEEDS), Ingredient.fromItems(Items.CARROT), 6000)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("beetroot_to_melon"), new ItemStack(Items.MELON_SEEDS), Ingredient.fromItems(Items.BEETROOT_SEEDS), 6000)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("melon_to_pumpkin"), new ItemStack(Items.PUMPKIN_SEEDS), Ingredient.fromItems(Items.MELON_SEEDS), 6000)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("pumpkin_to_cocoa"), new ItemStack(Items.COCOA_BEANS), Ingredient.fromItems(Items.PUMPKIN_SEEDS), 6000)); + cycle(evt.manaInfusion(), 200, "botania:fish_cycle", Items.COD, Items.SALMON, Items.TROPICAL_FISH, Items.PUFFERFISH); + cycle(evt.manaInfusion(), 6000, "botania:crop_cycle", Items.COCOA_BEANS, Items.WHEAT_SEEDS, Items.POTATO, Items.CARROT, Items.BEETROOT_SEEDS, Items.MELON_SEEDS, Items.PUMPKIN_SEEDS); evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("potato_unpoison"), new ItemStack(Items.POTATO), Ingredient.fromItems(Items.POISONOUS_POTATO), 1200)); evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("blaze_rod_to_nether_wart"), new ItemStack(Items.NETHER_WART), Ingredient.fromItems(Items.BLAZE_ROD), 4000)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("gunpowder_to_flint"), new ItemStack(Items.FLINT), Ingredient.fromItems(Items.GUNPOWDER), 200)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("flint_to_gunpowder"), new ItemStack(Items.GUNPOWDER), Ingredient.fromItems(Items.FLINT), 200)); + cycle(evt.manaInfusion(), 200, null, Items.GUNPOWDER, Items.FLINT); evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("book_to_name_tag"), new ItemStack(Items.NAME_TAG), Ingredient.fromItems(Items.WRITABLE_BOOK), 16000)); @@ -97,8 +75,7 @@ public final class ModManaAlchemyRecipes { evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("ender_pearl_from_ghast_tear"), new ItemStack(Items.ENDER_PEARL), Ingredient.fromItems(Items.GHAST_TEAR), 28000)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("glowstone_to_redstone"), new ItemStack(Items.REDSTONE), Ingredient.fromItems(Items.GLOWSTONE_DUST), 300)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("redstone_to_glowstone"), new ItemStack(Items.GLOWSTONE_DUST), Ingredient.fromItems(Items.REDSTONE), 300)); + cycle(evt.manaInfusion(), 300, null, Items.GLOWSTONE_DUST, Items.REDSTONE); evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("cobble_to_sand"), new ItemStack(Blocks.SAND), Ingredient.fromItems(Blocks.COBBLESTONE), 50)); evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("terracotta_to_red_sand"), new ItemStack(Blocks.RED_SAND), Ingredient.fromItems(Blocks.TERRACOTTA), 50)); @@ -113,24 +90,12 @@ public final class ModManaAlchemyRecipes { evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("diorite_to_granite"), new ItemStack(Blocks.GRANITE), Ingredient.fromItems(Blocks.DIORITE), 200)); evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("granite_to_andesite"), new ItemStack(Blocks.ANDESITE), Ingredient.fromItems(Blocks.GRANITE), 200)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("fern_to_dead_bush"), new ItemStack(Blocks.DEAD_BUSH), Ingredient.fromItems(Blocks.FERN), 500)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("dead_bush_to_grass"), new ItemStack(Blocks.GRASS), Ingredient.fromItems(Blocks.DEAD_BUSH), 500)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("grass_to_fern"), new ItemStack(Blocks.FERN), Ingredient.fromItems(Blocks.GRASS), 500)); + cycle(evt.manaInfusion(), 500, "botania:shrub_cycle", Blocks.FERN, Blocks.DEAD_BUSH, Blocks.GRASS); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("dandelion_to_poppy"), new ItemStack(Blocks.POPPY), Ingredient.fromItems(Blocks.DANDELION), 400)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("poppy_to_blue_orchid"), new ItemStack(Blocks.BLUE_ORCHID), Ingredient.fromItems(Blocks.POPPY), 400)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("blue_orchid_to_allium"), new ItemStack(Blocks.ALLIUM), Ingredient.fromItems(Blocks.BLUE_ORCHID), 400)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("allium_to_azure_bluet"), new ItemStack(Blocks.AZURE_BLUET), Ingredient.fromItems(Blocks.ALLIUM), 400)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("azure_bluet_to_red_tulip"), new ItemStack(Blocks.RED_TULIP), Ingredient.fromItems(Blocks.AZURE_BLUET), 400)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("red_tulip_to_orange_tulip"), new ItemStack(Blocks.ORANGE_TULIP), Ingredient.fromItems(Blocks.RED_TULIP), 400)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("orange_tulip_to_white_tulip"), new ItemStack(Blocks.WHITE_TULIP), Ingredient.fromItems(Blocks.ORANGE_TULIP), 400)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("white_tulip_to_pink_tulip"), new ItemStack(Blocks.PINK_TULIP), Ingredient.fromItems(Blocks.WHITE_TULIP), 400)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("pink_tulip_to_oxeye_daisy"), new ItemStack(Blocks.OXEYE_DAISY), Ingredient.fromItems(Blocks.PINK_TULIP), 400)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("oxeye_daisy_to_sunflower"), new ItemStack(Blocks.SUNFLOWER), Ingredient.fromItems(Blocks.OXEYE_DAISY), 400)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("sunflower_to_lilac"), new ItemStack(Blocks.LILAC), Ingredient.fromItems(Blocks.SUNFLOWER), 400)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("lilac_to_rose_bush"), new ItemStack(Blocks.ROSE_BUSH), Ingredient.fromItems(Blocks.LILAC), 400)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("rose_bush_to_peony"), new ItemStack(Blocks.PEONY), Ingredient.fromItems(Blocks.ROSE_BUSH), 400)); - evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("peony_to_dandelion"), new ItemStack(Blocks.DANDELION), Ingredient.fromItems(Blocks.PEONY), 400)); + // NB: No wither rose is intentional + cycle(evt.manaInfusion(), 400, "botania:flower_cycle", Blocks.DANDELION, Blocks.POPPY, Blocks.BLUE_ORCHID, Blocks.ALLIUM, Blocks.AZURE_BLUET, Blocks.RED_TULIP, Blocks.ORANGE_TULIP, + Blocks.WHITE_TULIP, Blocks.PINK_TULIP, Blocks.OXEYE_DAISY, Blocks.CORNFLOWER, Blocks.LILY_OF_THE_VALLEY, + Blocks.SUNFLOWER, Blocks.LILAC, Blocks.ROSE_BUSH, Blocks.PEONY); evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("chorus_fruit_to_flower"), new ItemStack(Blocks.CHORUS_FLOWER), Ingredient.fromItems(Items.POPPED_CHORUS_FRUIT), 10000)); @@ -148,6 +113,15 @@ public final class ModManaAlchemyRecipes { evt.manaInfusion().accept(mini(ModSubtiles.rannuncarpusChibi, ModSubtiles.rannuncarpus)); evt.manaInfusion().accept(mini(ModSubtiles.solegnoliaChibi, ModSubtiles.solegnolia)); } + + private static void cycle(Consumer consumer, int cost, @Nullable String group, IItemProvider... items) { + for(int i = 0; i < items.length; i++) { + Ingredient in = Ingredient.fromItems(items[i]); + ItemStack out = new ItemStack(i == items.length - 1 ? items[0] : items[i + 1]); + String id = String.format("%s_to_%s", items[i].asItem().getRegistryName().getPath(), out.getItem().getRegistryName().getPath()); + consumer.accept(RecipeManaInfusion.alchemy(new ResourceLocation(LibMisc.MOD_ID, id), out, in, cost, group)); + } + } private static RecipeManaInfusion mini(IItemProvider mini, IItemProvider full) { return RecipeManaInfusion.alchemy(mini.asItem().getRegistryName(), new ItemStack(mini), Ingredient.fromItems(full), 2500); diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/garden_of_glass.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/garden_of_glass.json index 52c666792..2ffd3898a 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/garden_of_glass.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/garden_of_glass.json @@ -49,7 +49,7 @@ { "type": "mana_infusion", "text": "botania.page.gardenOfGlass13", - "recipes": "botania:prismarine_shard_gog;prismarine_crystals_gog" + "recipes": "botania:prismarine_shard_gog;botania:prismarine_crystals_gog" }, { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json index 4eef5071f..f12bc5ae5 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json @@ -21,17 +21,17 @@ { "type": "mana_infusion", "text": "botania.page.manaAlchemy3", - "recipes": "botania:dark_oak_to_oak_log;botania:oak_to_spruce_log;botania:spruce_to_birch_log;botania:birch_to_jungle_log;botania:jungle_to_acacia_log;botania:acacia_to_dark_oak_log" + "group": "botania:log_cycle" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy4", - "recipes": "botania:dark_oak_to_oak_sapling;botania:oak_to_spruce_sapling;botania:spruce_to_birch_sapling;botania:birch_to_jungle_sapling;botania:jungle_to_acacia_sapling;botania:acacia_to_dark_oak_sapling" + "group": "botania:sapling_cycle" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy5", - "recipes": "botania:redstone_to_glowstone;botania:glowstone_deconstruct" + "recipes": "botania:redstone_to_glowstone_dust;botania:glowstone_deconstruct" }, { "type": "mana_infusion", @@ -56,17 +56,17 @@ { "type": "mana_infusion", "text": "botania.page.manaAlchemy10", - "recipes": "botania:pufferfish_to_cod;botania:cod_to_salmon;botania:salmon_to_tropical_fish;botania:tropical_fish_to_pufferfish" + "group": "botania:fish_cycle" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy11", - "recipes": "botania:cocoa_to_wheat;botania:wheat_to_potato;botania:potato_unpoison;botania:potato_to_carrot;botania:carrot_to_beetroot;botania:beetroot_to_melon;botania:melon_to_pumpkin;botania:pumpkin_to_cocoa" + "group": "botania:crop_cycle" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy12", - "recipes": "botania:wheat_to_potato;botania:potato_unpoison" + "recipes": "botania:wheat_seeds_to_potato;botania:potato_unpoison" }, { "type": "mana_infusion", @@ -101,7 +101,7 @@ { "type": "mana_infusion", "text": "botania.page.manaAlchemy19", - "recipes": "botania:glowstone_to_redstone;botania:redstone_to_glowstone;botania:glowstone_deconstruct" + "recipes": "botania:glowstone_dust_to_redstone;botania:redstone_to_glowstone_dust;botania:glowstone_deconstruct" }, { "type": "mana_infusion", @@ -131,12 +131,12 @@ { "type": "mana_infusion", "text": "botania.page.manaAlchemy24", - "recipes": "botania:fern_to_dead_bush;botania:dead_bush_to_grass;botania:grass_to_fern" + "group": "botania:shrub_cycle" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy25", - "recipes": "botania:dandelion_to_poppy;botania:poppy_to_blue_orchid;botania:blue_orchid_to_allium;botania:allium_to_azure_bluet;botania:azure_bluet_to_red_tulip;botania:red_tulip_to_orange_tulip;botania:orange_tulip_to_white_tulip;botania:white_tulip_to_pink_tulip;botania:pink_tulip_to_oxeye_daisy;botania:oxeye_daisy_to_sunflower;botania:sunflower_to_lilac;botania:lilac_to_rose_bush;botania:rose_bush_to_peony;botania:peony_to_dandelion" + "group": "botania:flower_cycle" }, { "type": "mana_infusion",