diff --git a/Xplat/src/generated/resources/.cache/8482c265eb392e1fe5c3863ee4f62f310932c269 b/Xplat/src/generated/resources/.cache/8482c265eb392e1fe5c3863ee4f62f310932c269 index 461a470919..746b27cf75 100644 --- a/Xplat/src/generated/resources/.cache/8482c265eb392e1fe5c3863ee4f62f310932c269 +++ b/Xplat/src/generated/resources/.cache/8482c265eb392e1fe5c3863ee4f62f310932c269 @@ -92,8 +92,10 @@ f0c00fab923ed8b7a0b5a778477eab2452021035 data/botania/recipes/mana_infusion/neth da814a1d5bcf51cd286b27dfa211140c529cdfa6 data/botania/recipes/mana_infusion/oak_leaves_dupe.json 7d89d77199ad94898f541a33e130a6e250c8510d data/botania/recipes/mana_infusion/oak_log_to_spruce_log.json aa4c8cebe56c1237f65215f868bdc0ac5cd5a0a1 data/botania/recipes/mana_infusion/oak_sapling_to_spruce_sapling.json +2a7ae8763f814c44e7cebafa1414e0106016481f data/botania/recipes/mana_infusion/ochre_froglight_to_verdant_froglight.json 116ebd46edb4585cf739eed370ac218b223f9b43 data/botania/recipes/mana_infusion/orange_tulip_to_white_tulip.json 16297f422ff25b5504078f8ae52b8203a1e39202 data/botania/recipes/mana_infusion/oxeye_daisy_to_cornflower.json +52392d22dd5890726014261452ead4adc360e2f5 data/botania/recipes/mana_infusion/pearlescent_froglight_to_ochre_froglight.json 6d7d6db7c7e324dff8d4dac943881be50721444f data/botania/recipes/mana_infusion/peony_to_dandelion.json 11f00af6bc0ea0f64e958758ce064e0d2860cdfe data/botania/recipes/mana_infusion/pink_tulip_to_oxeye_daisy.json fc5d75df6dc499e7611cf9385061d8565b99cc4c data/botania/recipes/mana_infusion/piston_relay.json @@ -129,6 +131,7 @@ fda3466b2a7941b03b193d6106832d6ffb469599 data/botania/recipes/mana_infusion/terr 2661531397ea311d2289850711b4fdc789ab16e7 data/botania/recipes/mana_infusion/tiny_potato.json 90078d249f8d55ff0a37a86fd057ade3ebdbf590 data/botania/recipes/mana_infusion/tropical_fish_to_pufferfish.json f370fe13e73b1f2bb882a30e0d9c167e34ee0591 data/botania/recipes/mana_infusion/tuff_to_calcite.json +2a0987fb7338f6dbd953065f790f8527e26a35a5 data/botania/recipes/mana_infusion/verdant_froglight_to_pearlescent_froglight.json 17cd6461c3e169aa6fa1007412afb0327ae22c2d data/botania/recipes/mana_infusion/vine_to_lily_pad.json 5665c2927e3e5511e350171afe8a52627b69a53b data/botania/recipes/mana_infusion/wheat_seeds_to_potato.json 87fe743b4bc94dfde9086803dd243930009fae59 data/botania/recipes/mana_infusion/white_tulip_to_pink_tulip.json diff --git a/Xplat/src/generated/resources/data/botania/recipes/mana_infusion/ochre_froglight_to_verdant_froglight.json b/Xplat/src/generated/resources/data/botania/recipes/mana_infusion/ochre_froglight_to_verdant_froglight.json new file mode 100644 index 0000000000..f59cb7c87a --- /dev/null +++ b/Xplat/src/generated/resources/data/botania/recipes/mana_infusion/ochre_froglight_to_verdant_froglight.json @@ -0,0 +1,15 @@ +{ + "type": "botania:mana_infusion", + "catalyst": { + "type": "block", + "block": "botania:alchemy_catalyst" + }, + "group": "botania:froglight_cycle", + "input": { + "item": "minecraft:ochre_froglight" + }, + "mana": 40, + "output": { + "item": "minecraft:verdant_froglight" + } +} \ No newline at end of file diff --git a/Xplat/src/generated/resources/data/botania/recipes/mana_infusion/pearlescent_froglight_to_ochre_froglight.json b/Xplat/src/generated/resources/data/botania/recipes/mana_infusion/pearlescent_froglight_to_ochre_froglight.json new file mode 100644 index 0000000000..887b71ffae --- /dev/null +++ b/Xplat/src/generated/resources/data/botania/recipes/mana_infusion/pearlescent_froglight_to_ochre_froglight.json @@ -0,0 +1,15 @@ +{ + "type": "botania:mana_infusion", + "catalyst": { + "type": "block", + "block": "botania:alchemy_catalyst" + }, + "group": "botania:froglight_cycle", + "input": { + "item": "minecraft:pearlescent_froglight" + }, + "mana": 40, + "output": { + "item": "minecraft:ochre_froglight" + } +} \ No newline at end of file diff --git a/Xplat/src/generated/resources/data/botania/recipes/mana_infusion/verdant_froglight_to_pearlescent_froglight.json b/Xplat/src/generated/resources/data/botania/recipes/mana_infusion/verdant_froglight_to_pearlescent_froglight.json new file mode 100644 index 0000000000..de0c1d0ca5 --- /dev/null +++ b/Xplat/src/generated/resources/data/botania/recipes/mana_infusion/verdant_froglight_to_pearlescent_froglight.json @@ -0,0 +1,15 @@ +{ + "type": "botania:mana_infusion", + "catalyst": { + "type": "block", + "block": "botania:alchemy_catalyst" + }, + "group": "botania:froglight_cycle", + "input": { + "item": "minecraft:verdant_froglight" + }, + "mana": 40, + "output": { + "item": "minecraft:pearlescent_froglight" + } +} \ No newline at end of file diff --git a/Xplat/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java b/Xplat/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java index c4ffd4ee98..efb5fd5d4b 100644 --- a/Xplat/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java +++ b/Xplat/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java @@ -82,6 +82,7 @@ public void buildRecipes(Consumer con consumer.accept(FinishedRecipe.alchemy(id("rotten_flesh_to_leather"), new ItemStack(Items.LEATHER), ingr(Items.ROTTEN_FLESH), 600)); cycle(consumer, 40, "botania:log_cycle", Blocks.OAK_LOG, Blocks.SPRUCE_LOG, Blocks.BIRCH_LOG, Blocks.JUNGLE_LOG, Blocks.ACACIA_LOG, Blocks.DARK_OAK_LOG, Blocks.MANGROVE_LOG, Blocks.CHERRY_LOG); + cycle(consumer, 40, "botania:froglight_cycle", Blocks.OCHRE_FROGLIGHT, Blocks.VERDANT_FROGLIGHT, Blocks.PEARLESCENT_FROGLIGHT); cycle(consumer, 120, "botania:sapling_cycle", Blocks.OAK_SAPLING, Blocks.SPRUCE_SAPLING, Blocks.BIRCH_SAPLING, Blocks.JUNGLE_SAPLING, Blocks.ACACIA_SAPLING, Blocks.DARK_OAK_SAPLING, Blocks.MANGROVE_PROPAGULE, Blocks.CHERRY_SAPLING); consumer.accept(deconstruct("glowstone_deconstruct", Items.GLOWSTONE_DUST, Blocks.GLOWSTONE)); diff --git a/Xplat/src/main/resources/assets/botania/lang/en_us.json b/Xplat/src/main/resources/assets/botania/lang/en_us.json index ad47c29270..dc16c1af68 100644 --- a/Xplat/src/main/resources/assets/botania/lang/en_us.json +++ b/Xplat/src/main/resources/assets/botania/lang/en_us.json @@ -2408,6 +2408,8 @@ "botania.page.manaAlchemy3": "Transmuting $(item)Woods$(0)", "botania.page.manaAlchemy30": "Sapling", "botania.page.manaAlchemy4": "Transmuting $(item)Saplings$(0)", + "botania.page.manaAlchemyFroglightCycle.title": "Froglight", + "botania.page.manaAlchemyFroglightCycle": "Transmuting $(item)Froglights$(0)", "botania.page.manaAlchemy5": "Breaking down $(item)Glowstone Blocks$(0)", "botania.page.manaAlchemy31": "Quartz", "botania.page.manaAlchemy6": "Breaking down $(item)Quartz Blocks$(0)", diff --git a/Xplat/src/main/resources/assets/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json b/Xplat/src/main/resources/assets/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json index fb122d29fe..a3db640e77 100644 --- a/Xplat/src/main/resources/assets/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json +++ b/Xplat/src/main/resources/assets/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json @@ -30,6 +30,12 @@ "text": "botania.page.manaAlchemy4", "group": "botania:sapling_cycle" }, + { + "type": "botania:mana_infusion", + "heading": "botania.page.manaAlchemyFroglightCycle.title", + "text": "botania.page.manaAlchemyFroglightCycle", + "group": "botania:froglight_cycle" + }, { "type": "botania:mana_infusion", "text": "botania.page.manaAlchemy5",