From f88b101b6bdb025350cad5c20e63b95abc784c51 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 25 Mar 2020 15:52:23 -0500 Subject: [PATCH] Move GoG mana infusion recipes to the gog datapack --- garden_of_glass/src/main/resources/META-INF/mods.toml | 2 +- .../recipes/mana_infusion/heart_of_the_sea.json | 11 +++++++++++ .../recipes/mana_infusion/prismarine_crystals.json | 11 +++++++++++ .../recipes/mana_infusion/prismarine_shard.json | 11 +++++++++++ .../recipes/mana_infusion/sugar_cane.json | 10 ++++++++++ .../vazkii/botania/data/ManaInfusionProvider.java | 11 ----------- .../lexicon/en_us/entries/basics/garden_of_glass.json | 6 +++--- 7 files changed, 47 insertions(+), 15 deletions(-) create mode 100644 garden_of_glass/src/main/resources/data/gardenofglass/recipes/mana_infusion/heart_of_the_sea.json create mode 100644 garden_of_glass/src/main/resources/data/gardenofglass/recipes/mana_infusion/prismarine_crystals.json create mode 100644 garden_of_glass/src/main/resources/data/gardenofglass/recipes/mana_infusion/prismarine_shard.json create mode 100644 garden_of_glass/src/main/resources/data/gardenofglass/recipes/mana_infusion/sugar_cane.json diff --git a/garden_of_glass/src/main/resources/META-INF/mods.toml b/garden_of_glass/src/main/resources/META-INF/mods.toml index 2bc69e343..ee7b967a6 100644 --- a/garden_of_glass/src/main/resources/META-INF/mods.toml +++ b/garden_of_glass/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" #mandatory -loaderVersion="[28,)" +loaderVersion="[31,)" issueTrackerURL="https://github.com/Vazkii/Botania/issues" #optional displayURL="https://botaniamod.net" #optional logoFile="logo_gog.png" #optional diff --git a/garden_of_glass/src/main/resources/data/gardenofglass/recipes/mana_infusion/heart_of_the_sea.json b/garden_of_glass/src/main/resources/data/gardenofglass/recipes/mana_infusion/heart_of_the_sea.json new file mode 100644 index 000000000..2abd40934 --- /dev/null +++ b/garden_of_glass/src/main/resources/data/gardenofglass/recipes/mana_infusion/heart_of_the_sea.json @@ -0,0 +1,11 @@ +{ + "type": "botania:mana_infusion", + "input": { + "item": "minecraft:nautilus_shell" + }, + "output": { + "item": "minecraft:heart_of_the_sea" + }, + "mana": 20000, + "catalyst": "botania:alchemy_catalyst" +} diff --git a/garden_of_glass/src/main/resources/data/gardenofglass/recipes/mana_infusion/prismarine_crystals.json b/garden_of_glass/src/main/resources/data/gardenofglass/recipes/mana_infusion/prismarine_crystals.json new file mode 100644 index 000000000..5da8edafd --- /dev/null +++ b/garden_of_glass/src/main/resources/data/gardenofglass/recipes/mana_infusion/prismarine_crystals.json @@ -0,0 +1,11 @@ +{ + "type": "botania:mana_infusion", + "input": { + "item": "minecraft:prismarine_shard" + }, + "output": { + "item": "minecraft:prismarine_crystals" + }, + "mana": 500, + "catalyst": "botania:alchemy_catalyst" +} diff --git a/garden_of_glass/src/main/resources/data/gardenofglass/recipes/mana_infusion/prismarine_shard.json b/garden_of_glass/src/main/resources/data/gardenofglass/recipes/mana_infusion/prismarine_shard.json new file mode 100644 index 000000000..a6fc75eca --- /dev/null +++ b/garden_of_glass/src/main/resources/data/gardenofglass/recipes/mana_infusion/prismarine_shard.json @@ -0,0 +1,11 @@ +{ + "type": "botania:mana_infusion", + "input": { + "item": "minecraft:quartz" + }, + "output": { + "item": "minecraft:prismarine_shard" + }, + "mana": 1000, + "catalyst": "botania:alchemy_catalyst" +} diff --git a/garden_of_glass/src/main/resources/data/gardenofglass/recipes/mana_infusion/sugar_cane.json b/garden_of_glass/src/main/resources/data/gardenofglass/recipes/mana_infusion/sugar_cane.json new file mode 100644 index 000000000..686a62aaa --- /dev/null +++ b/garden_of_glass/src/main/resources/data/gardenofglass/recipes/mana_infusion/sugar_cane.json @@ -0,0 +1,10 @@ +{ + "type": "botania:mana_infusion", + "input": { + "item": "minecraft:hay_block" + }, + "output": { + "item": "minecraft:sugar_cane" + }, + "mana": 2000 +} diff --git a/src/main/java/vazkii/botania/data/ManaInfusionProvider.java b/src/main/java/vazkii/botania/data/ManaInfusionProvider.java index 2040c50e1..accdf466d 100644 --- a/src/main/java/vazkii/botania/data/ManaInfusionProvider.java +++ b/src/main/java/vazkii/botania/data/ManaInfusionProvider.java @@ -88,11 +88,6 @@ public class ManaInfusionProvider extends RecipeProvider { consumer.accept(new FinishedRecipe(id("mana_glass"), new ItemStack(ModBlocks.manaGlass), ingr(Blocks.GLASS), 150)); consumer.accept(new FinishedRecipe(id("mana_string"), new ItemStack(ModItems.manaString), ingr(Items.STRING), 5000)); - // todo 1.15 move to gog - if (Botania.gardenOfGlassLoaded) { - consumer.accept(new FinishedRecipe(id("sugar_cane"), new ItemStack(Blocks.SUGAR_CANE), ingr(Blocks.HAY_BLOCK), 2000)); - } - consumer.accept(new FinishedRecipe(id("mana_bottle"), new ItemStack(ModItems.manaBottle), ingr(Items.GLASS_BOTTLE), 5000)); consumer.accept(FinishedRecipe.alchemy(id("rotten_flesh_to_leather"), new ItemStack(Items.LEATHER), ingr(Items.ROTTEN_FLESH), 600)); @@ -158,12 +153,6 @@ public class ManaInfusionProvider extends RecipeProvider { cycle(consumer, 240, "botania:berry_cycle", Items.APPLE, Items.SWEET_BERRIES); - if (Botania.gardenOfGlassLoaded) { - consumer.accept(FinishedRecipe.alchemy(id("prismarine_shard_gog"), new ItemStack(Items.PRISMARINE_SHARD), ingr(Items.QUARTZ), 1000)); - consumer.accept(FinishedRecipe.alchemy(id("prismarine_crystals_gog"), new ItemStack(Items.PRISMARINE_CRYSTALS), ingr(Items.PRISMARINE_SHARD), 500)); - consumer.accept(FinishedRecipe.alchemy(id("heart_of_the_sea"), new ItemStack(Items.HEART_OF_THE_SEA), ingr(Items.NAUTILUS_SHELL), 20000)); - } - consumer.accept(mini(ModSubtiles.agricarnationChibi, ModSubtiles.agricarnation)); consumer.accept(mini(ModSubtiles.clayconiaChibi, ModSubtiles.clayconia)); consumer.accept(mini(ModSubtiles.bellethornChibi, ModSubtiles.bellethorn)); 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 aa39f1d5b..18bfbd552 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 @@ -39,7 +39,7 @@ { "type": "mana_infusion", "text": "botania.page.gardenOfGlass7", - "recipes": "botania:mana_infusion/sugar_cane" + "recipes": "gardenofglass:mana_infusion/sugar_cane" }, { "type": "crafting", @@ -49,7 +49,7 @@ { "type": "mana_infusion", "text": "botania.page.gardenOfGlass13", - "recipes": "botania:mana_infusion/prismarine_shard_gog;botania:mana_infusion/prismarine_crystals_gog" + "recipes": "gardenofglass:mana_infusion/prismarine_shard;gardenofglass:mana_infusion/prismarine_crystals" }, { "type": "text", @@ -67,7 +67,7 @@ { "type": "mana_infusion", "text": "botania.page.gardenOfGlass14", - "recipes": "botania:heart_of_the_sea" + "recipes": "gardenofglass:mana_infusion/heart_of_the_sea" } ], "extra_recipe_mappings": {