From 072b83f4403df1885f258158f6a533eb92f3d59d Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 17 Jan 2021 16:42:42 -0500 Subject: [PATCH] Updated Sigil reagent recipes Also updated the book sections and pages involving the reagents. --- src/generated/resources/.cache/cache | 21 ++++++++---- .../recipes/bloodmagictab/blood_altar.json | 6 ++-- .../recipes/bloodmagictab/soul_forge.json | 6 ++-- .../recipes/bloodmagictab/soul_snare.json | 32 ------------------- .../recipes/alchemytable/reagent_air.json | 20 ++++++++++++ .../recipes/alchemytable/reagent_binding.json | 23 +++++++++++++ .../alchemytable/reagent_blood_light.json | 23 +++++++++++++ .../alchemytable/reagent_fastminer.json | 23 +++++++++++++ .../recipes/alchemytable/reagent_growth.json | 23 +++++++++++++ .../recipes/alchemytable/reagent_lava.json | 23 +++++++++++++ .../alchemytable/reagent_magnetism.json | 23 +++++++++++++ .../recipes/alchemytable/reagent_sight.json | 23 +++++++++++++ .../recipes/alchemytable/reagent_void.json | 23 +++++++++++++ .../recipes/alchemytable/reagent_water.json | 20 ++++++++++++ .../data/bloodmagic/recipes/blood_altar.json | 2 +- .../data/bloodmagic/recipes/soul_forge.json | 6 ++-- .../data/bloodmagic/recipes/soul_snare.json | 23 ------------- .../recipes/soulforge/arcaneashes.json | 21 ------------ .../recipe/AlchemyTableRecipeProvider.java | 18 +++++++++++ .../recipe/TartaricForgeRecipeProvider.java | 23 +++++++------ .../guide/en_us/entries/sigil/air.json | 4 +-- .../en_us/entries/sigil/blood_light.json | 4 +-- .../guide/en_us/entries/sigil/grove.json | 4 +-- .../guide/en_us/entries/sigil/lava.json | 4 +-- .../guide/en_us/entries/sigil/magnetism.json | 4 +-- .../guide/en_us/entries/sigil/mining.json | 4 +-- .../guide/en_us/entries/sigil/seer.json | 4 +-- .../guide/en_us/entries/sigil/void.json | 4 +-- .../guide/en_us/entries/sigil/water.json | 4 +-- .../templates/crafting_2-step_sigil.json | 4 +-- 30 files changed, 297 insertions(+), 125 deletions(-) delete mode 100644 src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/soul_snare.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_air.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_binding.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_blood_light.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_fastminer.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_growth.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_lava.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_magnetism.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_sight.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_void.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_water.json delete mode 100644 src/generated/resources/data/bloodmagic/recipes/soul_snare.json delete mode 100644 src/generated/resources/data/bloodmagic/recipes/soulforge/arcaneashes.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 3446dc9e..bdc8b249 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -419,7 +419,7 @@ c8ea88c439c91d0eeee3e6204a3c50f8cfd36758 assets/bloodmagic/models/item/wornstone 2d9dab8ebc036473d82eb044eb7a7bba0d0937a4 assets/bloodmagic/models/item/wornstonetilepath.json 273f8363ef906c87c67ae8aeb21a7d9d2834bbc6 data/bloodmagic/advancements/recipes/bloodmagictab/alchemy_table.json e6a3ac3998653b10ee09780be9099a9d0c5b3917 data/bloodmagic/advancements/recipes/bloodmagictab/arc.json -828c0f89e747d48d37c6a86030a8ec59ca5c29cb data/bloodmagic/advancements/recipes/bloodmagictab/blood_altar.json +08af21340e8457f43f7e5235790f58c2a67b9b3a data/bloodmagic/advancements/recipes/bloodmagictab/blood_altar.json 80cf1e0f026565be99279c46306b92be06bda65c data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_acceleration.json f77e3947a24a252c04a80d1eb26547a3fbf868e7 data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_aug_capacity.json f8b66411c96c6a7a409fb10f6888d078f1f8fa14 data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_blank.json @@ -452,8 +452,7 @@ c8e5cdac0e7328640ab1cb0eab0a46f0733b59b3 data/bloodmagic/advancements/recipes/bl 1578416eb302aecb3fd61e481634c5c021541f51 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_master.json 832301a424345b7ca70b43cb214faa104179f0fb data/bloodmagic/advancements/recipes/bloodmagictab/sacrificial_dagger.json b76943e5606d3cd4ec9933b533e0925499af5c65 data/bloodmagic/advancements/recipes/bloodmagictab/smelting/ingot_hellforged.json -2d29dd0c24c4c11d7438cdeeb26b9357d4359e2c data/bloodmagic/advancements/recipes/bloodmagictab/soul_forge.json -7a7f9f995d2414289d07c0a145647c8e735a6b78 data/bloodmagic/advancements/recipes/bloodmagictab/soul_snare.json +766cf6a61f198a8426debb6f0c9f43e36193fc76 data/bloodmagic/advancements/recipes/bloodmagictab/soul_forge.json 1c751b044e5ce4d05746857d6cf5e812e94a4026 data/bloodmagic/advancements/recipes/misc/smelting/ingot_gold.json af036dd1bd5193c2d36e7cb96c0a2b73a37b76ab data/bloodmagic/advancements/recipes/misc/smelting/ingot_iron.json ab358377c93ecbdd790722d5e796df59095e79e1 data/bloodmagic/advancements/recipes/misc/smelting/ingot_netherite_scrap.json @@ -550,6 +549,16 @@ f1fd76dab242882e327b4677b95328cb3a52deee data/bloodmagic/recipes/alchemytable/pl e9f5a06e4800cb03cc13480db9fdb7b9fa47f487 data/bloodmagic/recipes/alchemytable/plantoil_from_taters.json f41e9bf8376ffcad07752b5657e27e06e500be0a data/bloodmagic/recipes/alchemytable/plantoil_from_wheat.json 6230b36712a5b6d239ec35b85e7fda0917ca7bc2 data/bloodmagic/recipes/alchemytable/quick_draw_anointment.json +eb8f2ef0c592ba022190d727eec69d73b7437bac data/bloodmagic/recipes/alchemytable/reagent_air.json +755960529025fecd187cae962dc76988c1d52c8e data/bloodmagic/recipes/alchemytable/reagent_binding.json +47a4511054bd10454302a6b41eecfac942d27864 data/bloodmagic/recipes/alchemytable/reagent_blood_light.json +e50bf64f33ac29e704f553ef465c2631c1857777 data/bloodmagic/recipes/alchemytable/reagent_fastminer.json +00d41617bb2e67cdfcfcd87c3bb931726bd37e13 data/bloodmagic/recipes/alchemytable/reagent_growth.json +e06d24e618d3f2f17cb34a79ac630bd81c85dc45 data/bloodmagic/recipes/alchemytable/reagent_lava.json +41969af0a92baece82c53a779f2e71aec71fe0cb data/bloodmagic/recipes/alchemytable/reagent_magnetism.json +cb5b17173d9f6b7dad40a59aa920f47601e1304e data/bloodmagic/recipes/alchemytable/reagent_sight.json +1f19c4b4070c9e519c83fc624cb401503d8178cb data/bloodmagic/recipes/alchemytable/reagent_void.json +ef693cd04a08d89990ec8bb2620ff5e7efc353fc data/bloodmagic/recipes/alchemytable/reagent_water.json 842713a090b5abf3ce967dbee90d7582f7414949 data/bloodmagic/recipes/alchemytable/sand_coal.json 9292733697eca52de2c2ac7325ba45ab0354bfa3 data/bloodmagic/recipes/alchemytable/sand_gold.json 06f00cce47e0d5e5d25a2587796494340f8a3278 data/bloodmagic/recipes/alchemytable/sand_iron.json @@ -620,7 +629,7 @@ f191a3c9982b827b0b2ba93164a81fc4f8cb0959 data/bloodmagic/recipes/array/growthsig 085bf564ec74060e5c0224155cefc6ba0635c2c8 data/bloodmagic/recipes/array/updraft.json cabe693e7c714203ad708a1068f302b3ee3120b0 data/bloodmagic/recipes/array/voidsigil.json 5e68d933fff631142a8dd819aee235d343d43cff data/bloodmagic/recipes/array/watersigil.json -de8dbcf4d69bd3b47693c4631578a9b5c0e3f50c data/bloodmagic/recipes/blood_altar.json +ac895b8c95ca10d61ae6efedfe5815b980588433 data/bloodmagic/recipes/blood_altar.json f4de3cfc4616f762b4a87b08510153ae06733528 data/bloodmagic/recipes/blood_rune_acceleration.json 78e3f4666bc13897821abec9fa41e8b72accd007 data/bloodmagic/recipes/blood_rune_aug_capacity.json 2f31d0108cdb0cca056405023bd0ac64b6c02524 data/bloodmagic/recipes/blood_rune_blank.json @@ -656,9 +665,7 @@ aefbf1fd258f1cda8d04db7e0794b9612993e6bf data/bloodmagic/recipes/sacrificial_dag b644726cea2da0626f33b60fbc64701f26d48561 data/bloodmagic/recipes/smelting/ingot_hellforged.json 477f968ee84a5b9cd3e9c2a9864be32b5e7d3a32 data/bloodmagic/recipes/smelting/ingot_iron.json 06855bcd8951355604ab1e63b5db717382430967 data/bloodmagic/recipes/smelting/ingot_netherite_scrap.json -d699e777c72a5f61c4e6cdfea8705628e1c2b855 data/bloodmagic/recipes/soul_forge.json -2455bf8c205c7244fef2b7d7afeef060e30520b7 data/bloodmagic/recipes/soul_snare.json -f4763a58a8f471ec1aaa997cbd36eac8c7d51a12 data/bloodmagic/recipes/soulforge/arcaneashes.json +d4ee90b52934c7c530fb031dcf81d4f1ccb27a9b data/bloodmagic/recipes/soul_forge.json 8b64af8453c60b6b1ae55bd0dd1a68fe95e8ba19 data/bloodmagic/recipes/soulforge/commontartaricgem.json 659db62f8fb71c792b00d6409b1c9a2f1ca96048 data/bloodmagic/recipes/soulforge/corrosive_crystal_block.json 5ad148899ed46134ae0572b220736b9d38004980 data/bloodmagic/recipes/soulforge/deforester_charge.json diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_altar.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_altar.json index 616d7793..7eff31d1 100644 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_altar.json +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_altar.json @@ -6,12 +6,12 @@ ] }, "criteria": { - "has_will": { + "has_gold": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "bloodmagic:basemonstersoul" + "item": "minecraft:gold_ingot" } ] } @@ -25,7 +25,7 @@ }, "requirements": [ [ - "has_will", + "has_gold", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/soul_forge.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/soul_forge.json index b8553a53..262a22ec 100644 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/soul_forge.json +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/soul_forge.json @@ -6,12 +6,12 @@ ] }, "criteria": { - "has_gold": { + "has_blank_slate": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "minecraft:gold_ingot" + "item": "bloodmagic:blankslate" } ] } @@ -25,7 +25,7 @@ }, "requirements": [ [ - "has_gold", + "has_blank_slate", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/soul_snare.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/soul_snare.json deleted file mode 100644 index 0c03b3ab..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/soul_snare.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:soul_snare" - ] - }, - "criteria": { - "has_redstone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:redstone" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:soul_snare" - } - } - }, - "requirements": [ - [ - "has_redstone", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_air.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_air.json new file mode 100644 index 00000000..3ac1e251 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_air.json @@ -0,0 +1,20 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "item": "minecraft:ghast_tear" + }, + { + "tag": "forge:feathers" + }, + { + "tag": "forge:feathers" + } + ], + "output": { + "item": "bloodmagic:reagentair" + }, + "syphon": 2000, + "ticks": 200, + "upgradeLevel": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_binding.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_binding.json new file mode 100644 index 00000000..fb49418e --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_binding.json @@ -0,0 +1,23 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "tag": "forge:dusts/glowstone" + }, + { + "tag": "forge:dusts/redstone" + }, + { + "tag": "forge:gunpowder" + }, + { + "tag": "forge:nuggets/gold" + } + ], + "output": { + "item": "bloodmagic:reagentbinding" + }, + "syphon": 1000, + "ticks": 200, + "upgradeLevel": 3 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_blood_light.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_blood_light.json new file mode 100644 index 00000000..c9f119f9 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_blood_light.json @@ -0,0 +1,23 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "tag": "forge:dusts/glowstone" + }, + { + "item": "minecraft:torch" + }, + { + "tag": "forge:dusts/redstone" + }, + { + "tag": "forge:dusts/redstone" + } + ], + "output": { + "item": "bloodmagic:reagentbloodlight" + }, + "syphon": 1000, + "ticks": 200, + "upgradeLevel": 3 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_fastminer.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_fastminer.json new file mode 100644 index 00000000..7e90329b --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_fastminer.json @@ -0,0 +1,23 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "item": "minecraft:iron_pickaxe" + }, + { + "item": "minecraft:iron_axe" + }, + { + "item": "minecraft:iron_shovel" + }, + { + "tag": "forge:gunpowder" + } + ], + "output": { + "item": "bloodmagic:reagentfastminer" + }, + "syphon": 2000, + "ticks": 200, + "upgradeLevel": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_growth.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_growth.json new file mode 100644 index 00000000..8707950f --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_growth.json @@ -0,0 +1,23 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "tag": "minecraft:saplings" + }, + { + "tag": "minecraft:saplings" + }, + { + "item": "minecraft:sugar_cane" + }, + { + "item": "minecraft:sugar" + } + ], + "output": { + "item": "bloodmagic:reagentgrowth" + }, + "syphon": 2000, + "ticks": 200, + "upgradeLevel": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_lava.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_lava.json new file mode 100644 index 00000000..6618996f --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_lava.json @@ -0,0 +1,23 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "item": "minecraft:lava_bucket" + }, + { + "tag": "forge:dusts/redstone" + }, + { + "tag": "forge:cobblestone" + }, + { + "tag": "forge:storage_blocks/coal" + } + ], + "output": { + "item": "bloodmagic:reagentlava" + }, + "syphon": 1000, + "ticks": 200, + "upgradeLevel": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_magnetism.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_magnetism.json new file mode 100644 index 00000000..4fb4d117 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_magnetism.json @@ -0,0 +1,23 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "tag": "forge:string" + }, + { + "tag": "forge:ingots/gold" + }, + { + "tag": "forge:ingots/gold" + }, + { + "tag": "forge:storage_blocks/iron" + } + ], + "output": { + "item": "bloodmagic:reagentmagnetism" + }, + "syphon": 1000, + "ticks": 200, + "upgradeLevel": 3 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_sight.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_sight.json new file mode 100644 index 00000000..fb57653d --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_sight.json @@ -0,0 +1,23 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "tag": "forge:dusts/glowstone" + }, + { + "tag": "forge:glass" + }, + { + "tag": "forge:glass" + }, + { + "item": "bloodmagic:divinationsigil" + } + ], + "output": { + "item": "bloodmagic:reagentsight" + }, + "syphon": 500, + "ticks": 200, + "upgradeLevel": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_void.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_void.json new file mode 100644 index 00000000..d549746e --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_void.json @@ -0,0 +1,23 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "item": "minecraft:bucket" + }, + { + "tag": "forge:string" + }, + { + "tag": "forge:string" + }, + { + "tag": "forge:gunpowder" + } + ], + "output": { + "item": "bloodmagic:reagentvoid" + }, + "syphon": 1000, + "ticks": 200, + "upgradeLevel": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_water.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_water.json new file mode 100644 index 00000000..93a5b884 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_water.json @@ -0,0 +1,20 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "item": "minecraft:sugar" + }, + { + "item": "minecraft:water_bucket" + }, + { + "item": "minecraft:water_bucket" + } + ], + "output": { + "item": "bloodmagic:reagentwater" + }, + "syphon": 300, + "ticks": 200, + "upgradeLevel": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/blood_altar.json b/src/generated/resources/data/bloodmagic/recipes/blood_altar.json index 0985743c..aa83901e 100644 --- a/src/generated/resources/data/bloodmagic/recipes/blood_altar.json +++ b/src/generated/resources/data/bloodmagic/recipes/blood_altar.json @@ -16,7 +16,7 @@ "tag": "forge:ingots/gold" }, "d": { - "item": "bloodmagic:basemonstersoul" + "item": "minecraft:gold_ingot" } }, "result": { diff --git a/src/generated/resources/data/bloodmagic/recipes/soul_forge.json b/src/generated/resources/data/bloodmagic/recipes/soul_forge.json index 0916ce88..1b03fe65 100644 --- a/src/generated/resources/data/bloodmagic/recipes/soul_forge.json +++ b/src/generated/resources/data/bloodmagic/recipes/soul_forge.json @@ -2,15 +2,15 @@ "type": "minecraft:crafting_shaped", "pattern": [ "i i", - "sgs", + "sSs", "sos" ], "key": { "s": { "tag": "forge:stone" }, - "g": { - "tag": "forge:ingots/gold" + "S": { + "item": "bloodmagic:blankslate" }, "i": { "tag": "forge:ingots/iron" diff --git a/src/generated/resources/data/bloodmagic/recipes/soul_snare.json b/src/generated/resources/data/bloodmagic/recipes/soul_snare.json deleted file mode 100644 index a6cb99f2..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soul_snare.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "sis", - "iri", - "sis" - ], - "key": { - "r": { - "tag": "forge:dusts/redstone" - }, - "s": { - "tag": "forge:string" - }, - "i": { - "tag": "forge:ingots/iron" - } - }, - "result": { - "item": "bloodmagic:soulsnare", - "count": 4 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/arcaneashes.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/arcaneashes.json deleted file mode 100644 index 70e27273..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/arcaneashes.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "tag": "forge:dusts/redstone" - }, - "input1": { - "tag": "forge:dyes/white" - }, - "input2": { - "tag": "forge:gunpowder" - }, - "input3": { - "tag": "minecraft:coals" - }, - "output": { - "item": "bloodmagic:arcaneashes", - "nbt": "{Damage:0}" - }, - "minimumDrain": 0.0, - "drain": 0.0 -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyTableRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyTableRecipeProvider.java index 459f6483..c7a56908 100644 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyTableRecipeProvider.java +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyTableRecipeProvider.java @@ -53,5 +53,23 @@ public class AlchemyTableRecipeProvider implements ISubRecipeProvider AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.LOOTING_ANOINTMENT.get()), 500, 100, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.SLATE_VIAL.get())).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART)).addIngredient(Ingredient.fromTag(Tags.Items.GEMS_LAPIS)).addIngredient(Ingredient.fromTag(Tags.Items.BONES)).build(consumer, BloodMagic.rl(basePath + "looting_anointment")); AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.BOW_POWER_ANOINTMENT.get()), 500, 100, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.SLATE_VIAL.get())).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART)).addIngredient(Ingredient.fromTag(Tags.Items.INGOTS_IRON)).addIngredient(Ingredient.fromItems(Items.BOW)).build(consumer, BloodMagic.rl(basePath + "bow_power_anointment")); AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.SMELTING_ANOINTMENT.get()), 500, 100, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.SLATE_VIAL.get())).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART)).addIngredient(Ingredient.fromItems(Items.FURNACE)).addIngredient(Ingredient.fromItems(Items.CHARCOAL, Items.COAL)).build(consumer, BloodMagic.rl(basePath + "smelting_anointment")); + + // Changed Recipes + { + + } + { + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_AIR.get()), 2000, 200, 2).addIngredient(Ingredient.fromItems(Items.GHAST_TEAR)).addIngredient(Ingredient.fromTag(Tags.Items.FEATHERS)).addIngredient(Ingredient.fromTag(Tags.Items.FEATHERS)).build(consumer, BloodMagic.rl(basePath + "reagent_air")); + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_WATER.get()), 300, 200, 1).addIngredient(Ingredient.fromItems(Items.SUGAR)).addIngredient(Ingredient.fromItems(Items.WATER_BUCKET)).addIngredient(Ingredient.fromItems(Items.WATER_BUCKET)).build(consumer, BloodMagic.rl(basePath + "reagent_water")); + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_LAVA.get()), 1000, 200, 1).addIngredient(Ingredient.fromItems(Items.LAVA_BUCKET)).addIngredient(Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE)).addIngredient(Ingredient.fromTag(Tags.Items.COBBLESTONE)).addIngredient(Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_COAL)).build(consumer, BloodMagic.rl(basePath + "reagent_lava")); + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_VOID.get()), 1000, 200, 2).addIngredient(Ingredient.fromItems(Items.BUCKET)).addIngredient(Ingredient.fromTag(Tags.Items.STRING)).addIngredient(Ingredient.fromTag(Tags.Items.STRING)).addIngredient(Ingredient.fromTag(Tags.Items.GUNPOWDER)).build(consumer, BloodMagic.rl(basePath + "reagent_void")); + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_GROWTH.get()), 2000, 200, 2).addIngredient(Ingredient.fromTag(ItemTags.SAPLINGS)).addIngredient(Ingredient.fromTag(ItemTags.SAPLINGS)).addIngredient(Ingredient.fromItems(Items.SUGAR_CANE)).addIngredient(Ingredient.fromItems(Items.SUGAR)).build(consumer, BloodMagic.rl(basePath + "reagent_growth")); + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_MAGNETISM.get()), 1000, 200, 3).addIngredient(Ingredient.fromTag(Tags.Items.STRING)).addIngredient(Ingredient.fromTag(Tags.Items.INGOTS_GOLD)).addIngredient(Ingredient.fromTag(Tags.Items.INGOTS_GOLD)).addIngredient(Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_IRON)).build(consumer, BloodMagic.rl(basePath + "reagent_magnetism")); + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_FAST_MINER.get()), 2000, 200, 2).addIngredient(Ingredient.fromItems(Items.IRON_PICKAXE)).addIngredient(Ingredient.fromItems(Items.IRON_AXE)).addIngredient(Ingredient.fromItems(Items.IRON_SHOVEL)).addIngredient(Ingredient.fromTag(Tags.Items.GUNPOWDER)).build(consumer, BloodMagic.rl(basePath + "reagent_fastminer")); + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_BLOOD_LIGHT.get()), 1000, 200, 3).addIngredient(Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE)).addIngredient(Ingredient.fromItems(Items.TORCH)).addIngredient(Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE)).addIngredient(Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE)).build(consumer, BloodMagic.rl(basePath + "reagent_blood_light")); + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_SIGHT.get()), 500, 200, 1).addIngredient(Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE)).addIngredient(Ingredient.fromTag(Tags.Items.GLASS)).addIngredient(Ingredient.fromTag(Tags.Items.GLASS)).addIngredient(Ingredient.fromItems(BloodMagicItems.DIVINATION_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "reagent_sight")); + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_BINDING.get()), 1000, 200, 3).addIngredient(Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE)).addIngredient(Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE)).addIngredient(Ingredient.fromTag(Tags.Items.GUNPOWDER)).addIngredient(Ingredient.fromTag(Tags.Items.NUGGETS_GOLD)).build(consumer, BloodMagic.rl(basePath + "reagent_binding")); + + } } } diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/TartaricForgeRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/TartaricForgeRecipeProvider.java index 449440a6..6187852d 100644 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/TartaricForgeRecipeProvider.java +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/TartaricForgeRecipeProvider.java @@ -32,18 +32,6 @@ public class TartaricForgeRecipeProvider implements ISubRecipeProvider TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.SENTIENT_SHOVEL.get()), 0, 0, Ingredient.fromItems(BloodMagicItems.PETTY_GEM.get()), Ingredient.fromItems(Items.IRON_SHOVEL)).build(consumer, BloodMagic.rl(basePath + "sentientshovel")); TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.SENTIENT_SCYTHE.get()), 0, 0, Ingredient.fromItems(BloodMagicItems.PETTY_GEM.get()), Ingredient.fromItems(Items.IRON_HOE)).build(consumer, BloodMagic.rl(basePath + "sentientscythe")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_AIR.get()), 128, 20, Ingredient.fromItems(Items.GHAST_TEAR), Ingredient.fromTag(Tags.Items.FEATHERS), Ingredient.fromTag(Tags.Items.FEATHERS)).build(consumer, BloodMagic.rl(basePath + "reagent_air")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.ARCANE_ASHES.get()), 0, 0, Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromTag(Tags.Items.DYES_WHITE), Ingredient.fromTag(Tags.Items.GUNPOWDER), Ingredient.fromTag(ItemTags.COALS)).build(consumer, BloodMagic.rl(basePath + "arcaneashes")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_WATER.get()), 10, 3, Ingredient.fromItems(Items.SUGAR), Ingredient.fromItems(Items.WATER_BUCKET), Ingredient.fromItems(Items.WATER_BUCKET)).build(consumer, BloodMagic.rl(basePath + "reagent_water")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_LAVA.get()), 32, 10, Ingredient.fromItems(Items.LAVA_BUCKET), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromTag(Tags.Items.COBBLESTONE), Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_COAL)).build(consumer, BloodMagic.rl(basePath + "reagent_lava")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_VOID.get()), 64, 10, Ingredient.fromItems(Items.BUCKET), Ingredient.fromTag(Tags.Items.STRING), Ingredient.fromTag(Tags.Items.STRING), Ingredient.fromTag(Tags.Items.GUNPOWDER)).build(consumer, BloodMagic.rl(basePath + "reagent_void")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_GROWTH.get()), 128, 20, Ingredient.fromTag(ItemTags.SAPLINGS), Ingredient.fromTag(ItemTags.SAPLINGS), Ingredient.fromItems(Items.SUGAR_CANE), Ingredient.fromItems(Items.SUGAR)).build(consumer, BloodMagic.rl(basePath + "reagent_growth")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_MAGNETISM.get()), 600, 10, Ingredient.fromTag(Tags.Items.STRING), Ingredient.fromTag(Tags.Items.INGOTS_GOLD), Ingredient.fromTag(Tags.Items.INGOTS_GOLD), Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_IRON)).build(consumer, BloodMagic.rl(basePath + "reagent_magnetism")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_FAST_MINER.get()), 128, 20, Ingredient.fromItems(Items.IRON_PICKAXE), Ingredient.fromItems(Items.IRON_AXE), Ingredient.fromItems(Items.IRON_SHOVEL), Ingredient.fromTag(Tags.Items.GUNPOWDER)).build(consumer, BloodMagic.rl(basePath + "reagent_fastminer")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_BLOOD_LIGHT.get()), 300, 10, Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE), Ingredient.fromItems(Items.TORCH), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE)).build(consumer, BloodMagic.rl(basePath + "reagent_blood_light")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_SIGHT.get()), 64, 0, Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE), Ingredient.fromTag(Tags.Items.GLASS), Ingredient.fromTag(Tags.Items.GLASS), Ingredient.fromItems(BloodMagicItems.DIVINATION_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "reagent_sight")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_BINDING.get()), 400, 10, Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromTag(Tags.Items.GUNPOWDER), Ingredient.fromTag(Tags.Items.NUGGETS_GOLD)).build(consumer, BloodMagic.rl(basePath + "reagent_binding")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicBlocks.DEMON_CRUCIBLE.get()), 400, 100, Ingredient.fromItems(Items.CAULDRON), Ingredient.fromTag(Tags.Items.STONE), Ingredient.fromTag(Tags.Items.GEMS_LAPIS), Ingredient.fromTag(Tags.Items.GEMS_DIAMOND)).build(consumer, BloodMagic.rl(basePath + "demon_crucible")); TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicBlocks.DEMON_CRYSTALLIZER.get()), 500, 100, Ingredient.fromItems(BloodMagicBlocks.SOUL_FORGE.get()), Ingredient.fromTag(Tags.Items.STONE), Ingredient.fromTag(Tags.Items.GEMS_LAPIS), Ingredient.fromTag(Tags.Items.GLASS)).build(consumer, BloodMagic.rl(basePath + "demon_crystallizer")); @@ -61,6 +49,17 @@ public class TartaricForgeRecipeProvider implements ISubRecipeProvider // Changed Recipes { +// TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.ARCANE_ASHES.get()), 0, 0, Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromTag(Tags.Items.DYES_WHITE), Ingredient.fromTag(Tags.Items.GUNPOWDER), Ingredient.fromTag(ItemTags.COALS)).build(consumer, BloodMagic.rl(basePath + "arcaneashes")); + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_AIR.get()), 128, 20, Ingredient.fromItems(Items.GHAST_TEAR), Ingredient.fromTag(Tags.Items.FEATHERS), Ingredient.fromTag(Tags.Items.FEATHERS)).build(consumer, BloodMagic.rl(basePath + "reagent_air")); + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_WATER.get()), 10, 3, Ingredient.fromItems(Items.SUGAR), Ingredient.fromItems(Items.WATER_BUCKET), Ingredient.fromItems(Items.WATER_BUCKET)).build(consumer, BloodMagic.rl(basePath + "reagent_water")); + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_LAVA.get()), 32, 10, Ingredient.fromItems(Items.LAVA_BUCKET), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromTag(Tags.Items.COBBLESTONE), Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_COAL)).build(consumer, BloodMagic.rl(basePath + "reagent_lava")); + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_VOID.get()), 64, 10, Ingredient.fromItems(Items.BUCKET), Ingredient.fromTag(Tags.Items.STRING), Ingredient.fromTag(Tags.Items.STRING), Ingredient.fromTag(Tags.Items.GUNPOWDER)).build(consumer, BloodMagic.rl(basePath + "reagent_void")); + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_GROWTH.get()), 128, 20, Ingredient.fromTag(ItemTags.SAPLINGS), Ingredient.fromTag(ItemTags.SAPLINGS), Ingredient.fromItems(Items.SUGAR_CANE), Ingredient.fromItems(Items.SUGAR)).build(consumer, BloodMagic.rl(basePath + "reagent_growth")); + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_MAGNETISM.get()), 600, 10, Ingredient.fromTag(Tags.Items.STRING), Ingredient.fromTag(Tags.Items.INGOTS_GOLD), Ingredient.fromTag(Tags.Items.INGOTS_GOLD), Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_IRON)).build(consumer, BloodMagic.rl(basePath + "reagent_magnetism")); + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_FAST_MINER.get()), 128, 20, Ingredient.fromItems(Items.IRON_PICKAXE), Ingredient.fromItems(Items.IRON_AXE), Ingredient.fromItems(Items.IRON_SHOVEL), Ingredient.fromTag(Tags.Items.GUNPOWDER)).build(consumer, BloodMagic.rl(basePath + "reagent_fastminer")); + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_BLOOD_LIGHT.get()), 300, 10, Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE), Ingredient.fromItems(Items.TORCH), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE)).build(consumer, BloodMagic.rl(basePath + "reagent_blood_light")); + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_SIGHT.get()), 64, 0, Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE), Ingredient.fromTag(Tags.Items.GLASS), Ingredient.fromTag(Tags.Items.GLASS), Ingredient.fromItems(BloodMagicItems.DIVINATION_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "reagent_sight")); + TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_BINDING.get()), 400, 10, Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromTag(Tags.Items.GUNPOWDER), Ingredient.fromTag(Tags.Items.NUGGETS_GOLD)).build(consumer, BloodMagic.rl(basePath + "reagent_binding")); } { diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/air.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/air.json index aabb4326..1bc0d29a 100644 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/air.json +++ b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/air.json @@ -13,8 +13,8 @@ }, { "type": "crafting_2-step_sigil", - "soulforge.heading": "Air Reagent", - "soulforge.recipe": "bloodmagic:soulforge/reagent_air", + "alchemy_table.heading": "Air Reagent", + "alchemy_table.recipe": "bloodmagic:alchemytable/reagent_air", "array.heading": "Air Sigil", "array.recipe": "bloodmagic:array/airsigil", "array.text": "$(italic)I feel lighter already..." diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/blood_light.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/blood_light.json index 4837d8bf..17f9475f 100644 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/blood_light.json +++ b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/blood_light.json @@ -13,8 +13,8 @@ }, { "type": "crafting_2-step_sigil", - "soulforge.heading": "Blood Lamp Reagent", - "soulforge.recipe": "bloodmagic:soulforge/reagent_blood_light", + "alchemy_table.heading": "Blood Lamp Reagent", + "alchemy_table.recipe": "bloodmagic:alchemytable/reagent_blood_light", "array.heading": "Sigil of the Blood Lamp", "array.recipe": "bloodmagic:array/bloodlightsigil", "array.text": "$(italic)I see a light!" diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/grove.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/grove.json index 25cf50f2..3edef4d3 100644 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/grove.json +++ b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/grove.json @@ -28,8 +28,8 @@ }, { "type": "crafting_2-step_sigil", - "soulforge.heading": "Growth Reagent", - "soulforge.recipe": "bloodmagic:soulforge/reagent_growth", + "alchemy_table.heading": "Growth Reagent", + "alchemy_table.recipe": "bloodmagic:alchemytable/reagent_growth", "array.heading": "Sigil of the Green Grove", "array.recipe": "bloodmagic:array/growthsigil" } diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/lava.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/lava.json index 4cd3eb9a..e5af1cc4 100644 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/lava.json +++ b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/lava.json @@ -23,8 +23,8 @@ }, { "type": "crafting_2-step_sigil", - "soulforge.heading": "Lava Reagent", - "soulforge.recipe": "bloodmagic:soulforge/reagent_lava", + "alchemy_table.heading": "Lava Reagent", + "alchemy_table.recipe": "bloodmagic:alchemytable/reagent_lava", "array.heading": "Lava Sigil", "array.recipe": "bloodmagic:array/lavasigil", "array.text": "$(italic)HOT! DO NOT EAT" diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/magnetism.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/magnetism.json index e4bc3367..73812ee8 100644 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/magnetism.json +++ b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/magnetism.json @@ -13,8 +13,8 @@ }, { "type": "crafting_2-step_sigil", - "soulforge.heading": "Magnetism Reagent", - "soulforge.recipe": "bloodmagic:soulforge/reagent_magnetism", + "alchemy_table.heading": "Magnetism Reagent", + "alchemy_table.recipe": "bloodmagic:alchemytable/reagent_magnetism", "array.heading": "Sigil of Magnetism", "array.recipe": "bloodmagic:array/magnetismsigil" } diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/mining.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/mining.json index 593e60d1..0032c0d1 100644 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/mining.json +++ b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/mining.json @@ -23,8 +23,8 @@ }, { "type": "crafting_2-step_sigil", - "soulforge.heading": "Mining Reagent", - "soulforge.recipe": "bloodmagic:soulforge/reagent_fastminer", + "alchemy_table.heading": "Mining Reagent", + "alchemy_table.recipe": "bloodmagic:alchemytable/reagent_fastminer", "array.heading": "Sigil of the Fast Miner", "array.recipe": "bloodmagic:array/fastminersigil" } diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/seer.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/seer.json index 9ee952cb..fb695e1b 100644 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/seer.json +++ b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/seer.json @@ -13,8 +13,8 @@ }, { "type": "crafting_2-step_sigil", - "soulforge.heading": "Sight Reagent", - "soulforge.recipe": "bloodmagic:soulforge/reagent_sight", + "alchemy_table.heading": "Sight Reagent", + "alchemy_table.recipe": "bloodmagic:alchemytable/reagent_sight", "array.heading": "Seer's Sigil", "array.recipe": "bloodmagic:array/seersigil", "array.text": "$(italic)When seeing all is not enough" diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/void.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/void.json index bb4b4e4d..17939f21 100644 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/void.json +++ b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/void.json @@ -13,8 +13,8 @@ }, { "type": "crafting_2-step_sigil", - "soulforge.heading": "Void Reagent", - "soulforge.recipe": "bloodmagic:soulforge/reagent_void", + "alchemy_table.heading": "Void Reagent", + "alchemy_table.recipe": "bloodmagic:alchemytable/reagent_void", "array.heading": "Void Sigil", "array.recipe": "bloodmagic:array/voidsigil", "array.text": "$(italic)Better than a Swiffer\u00AE!" diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/water.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/water.json index a6d01a04..f7ce1c60 100644 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/water.json +++ b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/sigil/water.json @@ -23,8 +23,8 @@ }, { "type": "crafting_2-step_sigil", - "soulforge.heading": "Water Reagent", - "soulforge.recipe": "bloodmagic:soulforge/reagent_water", + "alchemy_table.heading": "Water Reagent", + "alchemy_table.recipe": "bloodmagic:alchemytable/reagent_water", "array.heading": "Water Sigil", "array.recipe": "bloodmagic:array/watersigil", "array.text": "$(italic)Infinite water, anyone?" diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_2-step_sigil.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_2-step_sigil.json index e6d8d468..adaaa240 100644 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_2-step_sigil.json +++ b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_2-step_sigil.json @@ -1,8 +1,8 @@ { "include": [ { - "template": "crafting_soulforge", - "as": "soulforge", + "template": "crafting_alchemy_table", + "as": "alchemy_table", "x": 0, "y": 0 },