diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/acacia_leaves_dupe.json b/src/generated/resources/data/botania/recipes/mana_infusion/acacia_leaves_dupe.json index 7b293d393..81831978c 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/acacia_leaves_dupe.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/acacia_leaves_dupe.json @@ -8,5 +8,7 @@ "count": 2 }, "mana": 2000, - "catalyst": "botania:conjuration_catalyst" + "catalyst": { + "name": "botania:conjuration_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/acacia_log_to_dark_oak_log.json b/src/generated/resources/data/botania/recipes/mana_infusion/acacia_log_to_dark_oak_log.json index fbca6216e..e7802adee 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/acacia_log_to_dark_oak_log.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/acacia_log_to_dark_oak_log.json @@ -8,5 +8,7 @@ }, "mana": 40, "group": "botania:log_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/acacia_sapling_to_dark_oak_sapling.json b/src/generated/resources/data/botania/recipes/mana_infusion/acacia_sapling_to_dark_oak_sapling.json index 71424397d..667480cbd 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/acacia_sapling_to_dark_oak_sapling.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/acacia_sapling_to_dark_oak_sapling.json @@ -8,5 +8,7 @@ }, "mana": 120, "group": "botania:sapling_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/agricarnation_chibi.json b/src/generated/resources/data/botania/recipes/mana_infusion/agricarnation_chibi.json index 2e7df3976..084d80719 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/agricarnation_chibi.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/agricarnation_chibi.json @@ -8,5 +8,7 @@ }, "mana": 2500, "group": "botania:flower_shrinking", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/allium_to_azure_bluet.json b/src/generated/resources/data/botania/recipes/mana_infusion/allium_to_azure_bluet.json index d1352a11c..97834a406 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/allium_to_azure_bluet.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/allium_to_azure_bluet.json @@ -8,5 +8,7 @@ }, "mana": 400, "group": "botania:flower_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/andesite_to_diorite.json b/src/generated/resources/data/botania/recipes/mana_infusion/andesite_to_diorite.json index 97c04a472..14102a9c7 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/andesite_to_diorite.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/andesite_to_diorite.json @@ -7,5 +7,7 @@ "item": "minecraft:diorite" }, "mana": 200, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/apple_to_sweet_berries.json b/src/generated/resources/data/botania/recipes/mana_infusion/apple_to_sweet_berries.json index 9c6d1ef4e..6b11a3cea 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/apple_to_sweet_berries.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/apple_to_sweet_berries.json @@ -8,5 +8,7 @@ }, "mana": 240, "group": "botania:berry_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/azure_bluet_to_red_tulip.json b/src/generated/resources/data/botania/recipes/mana_infusion/azure_bluet_to_red_tulip.json index a530eefd7..1322d7df9 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/azure_bluet_to_red_tulip.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/azure_bluet_to_red_tulip.json @@ -8,5 +8,7 @@ }, "mana": 400, "group": "botania:flower_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/beetroot_seeds_to_melon_seeds.json b/src/generated/resources/data/botania/recipes/mana_infusion/beetroot_seeds_to_melon_seeds.json index 1d22a4fb1..769c0b1a3 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/beetroot_seeds_to_melon_seeds.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/beetroot_seeds_to_melon_seeds.json @@ -8,5 +8,7 @@ }, "mana": 6000, "group": "botania:crop_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/bellethorn_chibi.json b/src/generated/resources/data/botania/recipes/mana_infusion/bellethorn_chibi.json index 305628a7f..5c9324700 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/bellethorn_chibi.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/bellethorn_chibi.json @@ -8,5 +8,7 @@ }, "mana": 2500, "group": "botania:flower_shrinking", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/birch_leaves_dupe.json b/src/generated/resources/data/botania/recipes/mana_infusion/birch_leaves_dupe.json index 60f6433e6..8db3ce79c 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/birch_leaves_dupe.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/birch_leaves_dupe.json @@ -8,5 +8,7 @@ "count": 2 }, "mana": 2000, - "catalyst": "botania:conjuration_catalyst" + "catalyst": { + "name": "botania:conjuration_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/birch_log_to_jungle_log.json b/src/generated/resources/data/botania/recipes/mana_infusion/birch_log_to_jungle_log.json index 084c8cbc2..303f4871c 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/birch_log_to_jungle_log.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/birch_log_to_jungle_log.json @@ -8,5 +8,7 @@ }, "mana": 40, "group": "botania:log_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/birch_sapling_to_jungle_sapling.json b/src/generated/resources/data/botania/recipes/mana_infusion/birch_sapling_to_jungle_sapling.json index a417a6509..8e2249b0e 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/birch_sapling_to_jungle_sapling.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/birch_sapling_to_jungle_sapling.json @@ -8,5 +8,7 @@ }, "mana": 120, "group": "botania:sapling_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/blaze_quartz_deconstruct.json b/src/generated/resources/data/botania/recipes/mana_infusion/blaze_quartz_deconstruct.json index 058087ed4..5c8c3841b 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/blaze_quartz_deconstruct.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/blaze_quartz_deconstruct.json @@ -8,5 +8,7 @@ "count": 4 }, "mana": 25, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/blaze_rod_to_nether_wart.json b/src/generated/resources/data/botania/recipes/mana_infusion/blaze_rod_to_nether_wart.json index b35bbe4ab..835f1dc7f 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/blaze_rod_to_nether_wart.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/blaze_rod_to_nether_wart.json @@ -7,5 +7,7 @@ "item": "minecraft:nether_wart" }, "mana": 4000, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/blue_orchid_to_allium.json b/src/generated/resources/data/botania/recipes/mana_infusion/blue_orchid_to_allium.json index c26f0505a..aa984925f 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/blue_orchid_to_allium.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/blue_orchid_to_allium.json @@ -8,5 +8,7 @@ }, "mana": 400, "group": "botania:flower_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/book_to_name_tag.json b/src/generated/resources/data/botania/recipes/mana_infusion/book_to_name_tag.json index bf96893a2..3c9dc6dc6 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/book_to_name_tag.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/book_to_name_tag.json @@ -7,5 +7,7 @@ "item": "minecraft:name_tag" }, "mana": 16000, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/brick_deconstruct.json b/src/generated/resources/data/botania/recipes/mana_infusion/brick_deconstruct.json index a6ed62778..1d9ddc210 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/brick_deconstruct.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/brick_deconstruct.json @@ -8,5 +8,7 @@ "count": 4 }, "mana": 25, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/bubbell_chibi.json b/src/generated/resources/data/botania/recipes/mana_infusion/bubbell_chibi.json index 94a8d0d20..4e73b6db4 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/bubbell_chibi.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/bubbell_chibi.json @@ -8,5 +8,7 @@ }, "mana": 2500, "group": "botania:flower_shrinking", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/cactus_to_slime.json b/src/generated/resources/data/botania/recipes/mana_infusion/cactus_to_slime.json index f79d0d7e7..03b8f2bdf 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/cactus_to_slime.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/cactus_to_slime.json @@ -7,5 +7,7 @@ "item": "minecraft:slime_ball" }, "mana": 1200, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/carrot_to_beetroot_seeds.json b/src/generated/resources/data/botania/recipes/mana_infusion/carrot_to_beetroot_seeds.json index 2a386846e..35d5be53e 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/carrot_to_beetroot_seeds.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/carrot_to_beetroot_seeds.json @@ -8,5 +8,7 @@ }, "mana": 6000, "group": "botania:crop_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/chiseled_stone_bricks.json b/src/generated/resources/data/botania/recipes/mana_infusion/chiseled_stone_bricks.json index d505eebe2..f4f893c93 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/chiseled_stone_bricks.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/chiseled_stone_bricks.json @@ -7,5 +7,7 @@ "item": "minecraft:chiseled_stone_bricks" }, "mana": 150, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/chorus_fruit_to_flower.json b/src/generated/resources/data/botania/recipes/mana_infusion/chorus_fruit_to_flower.json index 3a532f5e8..85b218436 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/chorus_fruit_to_flower.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/chorus_fruit_to_flower.json @@ -7,5 +7,7 @@ "item": "minecraft:chorus_flower" }, "mana": 10000, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/clay_deconstruct.json b/src/generated/resources/data/botania/recipes/mana_infusion/clay_deconstruct.json index ff7997ff9..b20c88b6f 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/clay_deconstruct.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/clay_deconstruct.json @@ -8,5 +8,7 @@ "count": 4 }, "mana": 25, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/clayconia_chibi.json b/src/generated/resources/data/botania/recipes/mana_infusion/clayconia_chibi.json index e781f51b0..93eccf618 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/clayconia_chibi.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/clayconia_chibi.json @@ -8,5 +8,7 @@ }, "mana": 2500, "group": "botania:flower_shrinking", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/coal_dupe.json b/src/generated/resources/data/botania/recipes/mana_infusion/coal_dupe.json index aee12c2fe..d40fa520f 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/coal_dupe.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/coal_dupe.json @@ -8,5 +8,7 @@ "count": 2 }, "mana": 2100, - "catalyst": "botania:conjuration_catalyst" + "catalyst": { + "name": "botania:conjuration_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/coarse_dirt.json b/src/generated/resources/data/botania/recipes/mana_infusion/coarse_dirt.json index a690a70ce..c12b671ab 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/coarse_dirt.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/coarse_dirt.json @@ -7,5 +7,7 @@ "item": "minecraft:coarse_dirt" }, "mana": 120, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/cobble_to_sand.json b/src/generated/resources/data/botania/recipes/mana_infusion/cobble_to_sand.json index 1006ebd1f..00dc0a0f8 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/cobble_to_sand.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/cobble_to_sand.json @@ -7,5 +7,7 @@ "item": "minecraft:sand" }, "mana": 50, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/cocoa_beans_to_wheat_seeds.json b/src/generated/resources/data/botania/recipes/mana_infusion/cocoa_beans_to_wheat_seeds.json index 58e5c95e7..7409b091c 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/cocoa_beans_to_wheat_seeds.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/cocoa_beans_to_wheat_seeds.json @@ -8,5 +8,7 @@ }, "mana": 6000, "group": "botania:crop_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/cod_to_salmon.json b/src/generated/resources/data/botania/recipes/mana_infusion/cod_to_salmon.json index d79be7d32..d5b98294d 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/cod_to_salmon.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/cod_to_salmon.json @@ -8,5 +8,7 @@ }, "mana": 200, "group": "botania:fish_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/cornflower_to_lily_of_the_valley.json b/src/generated/resources/data/botania/recipes/mana_infusion/cornflower_to_lily_of_the_valley.json index 6612ff4ca..8707cfee6 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/cornflower_to_lily_of_the_valley.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/cornflower_to_lily_of_the_valley.json @@ -8,5 +8,7 @@ }, "mana": 400, "group": "botania:flower_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/dandelion_to_poppy.json b/src/generated/resources/data/botania/recipes/mana_infusion/dandelion_to_poppy.json index 29b5f3da9..3a5e057c9 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/dandelion_to_poppy.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/dandelion_to_poppy.json @@ -8,5 +8,7 @@ }, "mana": 400, "group": "botania:flower_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/dark_oak_leaves_dupe.json b/src/generated/resources/data/botania/recipes/mana_infusion/dark_oak_leaves_dupe.json index c3363a136..3abaeeed0 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/dark_oak_leaves_dupe.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/dark_oak_leaves_dupe.json @@ -8,5 +8,7 @@ "count": 2 }, "mana": 2000, - "catalyst": "botania:conjuration_catalyst" + "catalyst": { + "name": "botania:conjuration_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/dark_oak_log_to_oak_log.json b/src/generated/resources/data/botania/recipes/mana_infusion/dark_oak_log_to_oak_log.json index 3fb8083f5..cc80c9702 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/dark_oak_log_to_oak_log.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/dark_oak_log_to_oak_log.json @@ -8,5 +8,7 @@ }, "mana": 40, "group": "botania:log_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/dark_oak_sapling_to_oak_sapling.json b/src/generated/resources/data/botania/recipes/mana_infusion/dark_oak_sapling_to_oak_sapling.json index 59b58ec9c..6276989d7 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/dark_oak_sapling_to_oak_sapling.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/dark_oak_sapling_to_oak_sapling.json @@ -8,5 +8,7 @@ }, "mana": 120, "group": "botania:sapling_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/dark_quartz_deconstruct.json b/src/generated/resources/data/botania/recipes/mana_infusion/dark_quartz_deconstruct.json index 8687da282..f196bdde6 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/dark_quartz_deconstruct.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/dark_quartz_deconstruct.json @@ -8,5 +8,7 @@ "count": 4 }, "mana": 25, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/dead_bush_to_grass.json b/src/generated/resources/data/botania/recipes/mana_infusion/dead_bush_to_grass.json index 8baac0a5c..cd0b28efa 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/dead_bush_to_grass.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/dead_bush_to_grass.json @@ -8,5 +8,7 @@ }, "mana": 500, "group": "botania:shrub_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/diorite_to_granite.json b/src/generated/resources/data/botania/recipes/mana_infusion/diorite_to_granite.json index 650167e23..7ce90afb9 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/diorite_to_granite.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/diorite_to_granite.json @@ -7,5 +7,7 @@ "item": "minecraft:granite" }, "mana": 200, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/elf_quartz_deconstruct.json b/src/generated/resources/data/botania/recipes/mana_infusion/elf_quartz_deconstruct.json index c69de58bc..850538b43 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/elf_quartz_deconstruct.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/elf_quartz_deconstruct.json @@ -8,5 +8,7 @@ "count": 4 }, "mana": 25, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/ender_pearl_from_ghast_tear.json b/src/generated/resources/data/botania/recipes/mana_infusion/ender_pearl_from_ghast_tear.json index dbf29827e..55d07ab17 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/ender_pearl_from_ghast_tear.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/ender_pearl_from_ghast_tear.json @@ -7,5 +7,7 @@ "item": "minecraft:ender_pearl" }, "mana": 28000, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/fern_to_dead_bush.json b/src/generated/resources/data/botania/recipes/mana_infusion/fern_to_dead_bush.json index edb9b644b..df53bcd11 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/fern_to_dead_bush.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/fern_to_dead_bush.json @@ -8,5 +8,7 @@ }, "mana": 500, "group": "botania:shrub_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/flint_to_gunpowder.json b/src/generated/resources/data/botania/recipes/mana_infusion/flint_to_gunpowder.json index 51e09505b..dbc1ddf0b 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/flint_to_gunpowder.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/flint_to_gunpowder.json @@ -7,5 +7,7 @@ "item": "minecraft:gunpowder" }, "mana": 200, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/glowstone_deconstruct.json b/src/generated/resources/data/botania/recipes/mana_infusion/glowstone_deconstruct.json index 210091d87..218ccde3a 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/glowstone_deconstruct.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/glowstone_deconstruct.json @@ -8,5 +8,7 @@ "count": 4 }, "mana": 25, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/glowstone_dupe.json b/src/generated/resources/data/botania/recipes/mana_infusion/glowstone_dupe.json index c89358e35..71ba89b47 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/glowstone_dupe.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/glowstone_dupe.json @@ -8,5 +8,7 @@ "count": 2 }, "mana": 5000, - "catalyst": "botania:conjuration_catalyst" + "catalyst": { + "name": "botania:conjuration_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/glowstone_dust_to_redstone.json b/src/generated/resources/data/botania/recipes/mana_infusion/glowstone_dust_to_redstone.json index 5c0c2f02f..54141c25f 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/glowstone_dust_to_redstone.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/glowstone_dust_to_redstone.json @@ -7,5 +7,7 @@ "item": "minecraft:redstone" }, "mana": 300, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/granite_to_andesite.json b/src/generated/resources/data/botania/recipes/mana_infusion/granite_to_andesite.json index 99b762888..b56550e9e 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/granite_to_andesite.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/granite_to_andesite.json @@ -7,5 +7,7 @@ "item": "minecraft:andesite" }, "mana": 200, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/grass.json b/src/generated/resources/data/botania/recipes/mana_infusion/grass.json index 62c024cf3..3bcb48441 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/grass.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/grass.json @@ -8,5 +8,7 @@ "count": 2 }, "mana": 800, - "catalyst": "botania:conjuration_catalyst" + "catalyst": { + "name": "botania:conjuration_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/grass_to_fern.json b/src/generated/resources/data/botania/recipes/mana_infusion/grass_to_fern.json index d9522d73b..c1feac770 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/grass_to_fern.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/grass_to_fern.json @@ -8,5 +8,7 @@ }, "mana": 500, "group": "botania:shrub_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/gravel_dupe.json b/src/generated/resources/data/botania/recipes/mana_infusion/gravel_dupe.json index c8056717b..80f30cc8f 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/gravel_dupe.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/gravel_dupe.json @@ -8,5 +8,7 @@ "count": 2 }, "mana": 720, - "catalyst": "botania:conjuration_catalyst" + "catalyst": { + "name": "botania:conjuration_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/gunpowder_to_flint.json b/src/generated/resources/data/botania/recipes/mana_infusion/gunpowder_to_flint.json index a4d5c0206..47b90425d 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/gunpowder_to_flint.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/gunpowder_to_flint.json @@ -7,5 +7,7 @@ "item": "minecraft:flint" }, "mana": 200, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/hopperhock_chibi.json b/src/generated/resources/data/botania/recipes/mana_infusion/hopperhock_chibi.json index 69c654ad3..f78d680df 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/hopperhock_chibi.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/hopperhock_chibi.json @@ -8,5 +8,7 @@ }, "mana": 2500, "group": "botania:flower_shrinking", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/ice.json b/src/generated/resources/data/botania/recipes/mana_infusion/ice.json index de3610e4e..1a7cee0d1 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/ice.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/ice.json @@ -7,5 +7,7 @@ "item": "minecraft:ice" }, "mana": 2250, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/jungle_leaves_dupe.json b/src/generated/resources/data/botania/recipes/mana_infusion/jungle_leaves_dupe.json index 7ba179911..66de84a59 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/jungle_leaves_dupe.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/jungle_leaves_dupe.json @@ -8,5 +8,7 @@ "count": 2 }, "mana": 2000, - "catalyst": "botania:conjuration_catalyst" + "catalyst": { + "name": "botania:conjuration_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/jungle_log_to_acacia_log.json b/src/generated/resources/data/botania/recipes/mana_infusion/jungle_log_to_acacia_log.json index 5ff8a94d3..c5df9b87b 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/jungle_log_to_acacia_log.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/jungle_log_to_acacia_log.json @@ -8,5 +8,7 @@ }, "mana": 40, "group": "botania:log_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/jungle_sapling_to_acacia_sapling.json b/src/generated/resources/data/botania/recipes/mana_infusion/jungle_sapling_to_acacia_sapling.json index 4e0f2689d..c91932fa2 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/jungle_sapling_to_acacia_sapling.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/jungle_sapling_to_acacia_sapling.json @@ -8,5 +8,7 @@ }, "mana": 120, "group": "botania:sapling_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/lavender_quartz_deconstruct.json b/src/generated/resources/data/botania/recipes/mana_infusion/lavender_quartz_deconstruct.json index 22915fe37..f7e391e83 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/lavender_quartz_deconstruct.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/lavender_quartz_deconstruct.json @@ -8,5 +8,7 @@ "count": 4 }, "mana": 25, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/lilac_to_rose_bush.json b/src/generated/resources/data/botania/recipes/mana_infusion/lilac_to_rose_bush.json index 5c8d498fc..490b4d34a 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/lilac_to_rose_bush.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/lilac_to_rose_bush.json @@ -8,5 +8,7 @@ }, "mana": 400, "group": "botania:flower_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/lily_of_the_valley_to_sunflower.json b/src/generated/resources/data/botania/recipes/mana_infusion/lily_of_the_valley_to_sunflower.json index 1d12ac266..33e3ba970 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/lily_of_the_valley_to_sunflower.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/lily_of_the_valley_to_sunflower.json @@ -8,5 +8,7 @@ }, "mana": 400, "group": "botania:flower_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/lily_pad_to_vine.json b/src/generated/resources/data/botania/recipes/mana_infusion/lily_pad_to_vine.json index a39350423..5b0989c55 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/lily_pad_to_vine.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/lily_pad_to_vine.json @@ -7,5 +7,7 @@ "item": "minecraft:vine" }, "mana": 320, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/mana_quartz_deconstruct.json b/src/generated/resources/data/botania/recipes/mana_infusion/mana_quartz_deconstruct.json index 7ccc6a8b8..fffac3459 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/mana_quartz_deconstruct.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/mana_quartz_deconstruct.json @@ -8,5 +8,7 @@ "count": 4 }, "mana": 25, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/marimorphosis_chibi.json b/src/generated/resources/data/botania/recipes/mana_infusion/marimorphosis_chibi.json index 9c48a9195..c90bdd3c3 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/marimorphosis_chibi.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/marimorphosis_chibi.json @@ -8,5 +8,7 @@ }, "mana": 2500, "group": "botania:flower_shrinking", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/melon_seeds_to_pumpkin_seeds.json b/src/generated/resources/data/botania/recipes/mana_infusion/melon_seeds_to_pumpkin_seeds.json index 24ff691ab..7d3ec7cd3 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/melon_seeds_to_pumpkin_seeds.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/melon_seeds_to_pumpkin_seeds.json @@ -8,5 +8,7 @@ }, "mana": 6000, "group": "botania:crop_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/netherrack_dupe.json b/src/generated/resources/data/botania/recipes/mana_infusion/netherrack_dupe.json index 8ce4c1fb4..10e95a2dd 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/netherrack_dupe.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/netherrack_dupe.json @@ -8,5 +8,7 @@ "count": 2 }, "mana": 200, - "catalyst": "botania:conjuration_catalyst" + "catalyst": { + "name": "botania:conjuration_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/oak_leaves_dupe.json b/src/generated/resources/data/botania/recipes/mana_infusion/oak_leaves_dupe.json index cd6cf687b..f0ae36688 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/oak_leaves_dupe.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/oak_leaves_dupe.json @@ -8,5 +8,7 @@ "count": 2 }, "mana": 2000, - "catalyst": "botania:conjuration_catalyst" + "catalyst": { + "name": "botania:conjuration_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/oak_log_to_spruce_log.json b/src/generated/resources/data/botania/recipes/mana_infusion/oak_log_to_spruce_log.json index 87da85940..e9ba2c13d 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/oak_log_to_spruce_log.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/oak_log_to_spruce_log.json @@ -8,5 +8,7 @@ }, "mana": 40, "group": "botania:log_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/oak_sapling_to_spruce_sapling.json b/src/generated/resources/data/botania/recipes/mana_infusion/oak_sapling_to_spruce_sapling.json index 879cd5937..d4424bfe8 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/oak_sapling_to_spruce_sapling.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/oak_sapling_to_spruce_sapling.json @@ -8,5 +8,7 @@ }, "mana": 120, "group": "botania:sapling_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/orange_tulip_to_white_tulip.json b/src/generated/resources/data/botania/recipes/mana_infusion/orange_tulip_to_white_tulip.json index 8f5b3a1ca..a82bca3d1 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/orange_tulip_to_white_tulip.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/orange_tulip_to_white_tulip.json @@ -8,5 +8,7 @@ }, "mana": 400, "group": "botania:flower_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/oxeye_daisy_to_cornflower.json b/src/generated/resources/data/botania/recipes/mana_infusion/oxeye_daisy_to_cornflower.json index 4878dee2e..d96546431 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/oxeye_daisy_to_cornflower.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/oxeye_daisy_to_cornflower.json @@ -8,5 +8,7 @@ }, "mana": 400, "group": "botania:flower_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/peony_to_dandelion.json b/src/generated/resources/data/botania/recipes/mana_infusion/peony_to_dandelion.json index 842ec70a3..8585c0481 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/peony_to_dandelion.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/peony_to_dandelion.json @@ -8,5 +8,7 @@ }, "mana": 400, "group": "botania:flower_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/pink_tulip_to_oxeye_daisy.json b/src/generated/resources/data/botania/recipes/mana_infusion/pink_tulip_to_oxeye_daisy.json index 62e2ac100..49017064b 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/pink_tulip_to_oxeye_daisy.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/pink_tulip_to_oxeye_daisy.json @@ -8,5 +8,7 @@ }, "mana": 400, "group": "botania:flower_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/poppy_to_blue_orchid.json b/src/generated/resources/data/botania/recipes/mana_infusion/poppy_to_blue_orchid.json index 96eb16f11..615fe446d 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/poppy_to_blue_orchid.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/poppy_to_blue_orchid.json @@ -8,5 +8,7 @@ }, "mana": 400, "group": "botania:flower_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/potato_to_carrot.json b/src/generated/resources/data/botania/recipes/mana_infusion/potato_to_carrot.json index 5253d284f..1a653c14e 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/potato_to_carrot.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/potato_to_carrot.json @@ -8,5 +8,7 @@ }, "mana": 6000, "group": "botania:crop_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/potato_unpoison.json b/src/generated/resources/data/botania/recipes/mana_infusion/potato_unpoison.json index 3710f333c..6b5c1c2fe 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/potato_unpoison.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/potato_unpoison.json @@ -7,5 +7,7 @@ "item": "minecraft:potato" }, "mana": 1200, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/pufferfish_to_cod.json b/src/generated/resources/data/botania/recipes/mana_infusion/pufferfish_to_cod.json index 310a432f9..8a77729f7 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/pufferfish_to_cod.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/pufferfish_to_cod.json @@ -8,5 +8,7 @@ }, "mana": 200, "group": "botania:fish_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/pumpkin_seeds_to_cocoa_beans.json b/src/generated/resources/data/botania/recipes/mana_infusion/pumpkin_seeds_to_cocoa_beans.json index 3a94b4642..524de28e3 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/pumpkin_seeds_to_cocoa_beans.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/pumpkin_seeds_to_cocoa_beans.json @@ -8,5 +8,7 @@ }, "mana": 6000, "group": "botania:crop_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/quartz_deconstruct.json b/src/generated/resources/data/botania/recipes/mana_infusion/quartz_deconstruct.json index a75405cb2..0e6d5c3c2 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/quartz_deconstruct.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/quartz_deconstruct.json @@ -8,5 +8,7 @@ "count": 4 }, "mana": 25, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/quartz_dupe.json b/src/generated/resources/data/botania/recipes/mana_infusion/quartz_dupe.json index 04bb7ba7e..c3810c40f 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/quartz_dupe.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/quartz_dupe.json @@ -8,5 +8,7 @@ "count": 2 }, "mana": 2500, - "catalyst": "botania:conjuration_catalyst" + "catalyst": { + "name": "botania:conjuration_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/rannuncarpus_chibi.json b/src/generated/resources/data/botania/recipes/mana_infusion/rannuncarpus_chibi.json index 955b638e5..fe4e01934 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/rannuncarpus_chibi.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/rannuncarpus_chibi.json @@ -8,5 +8,7 @@ }, "mana": 2500, "group": "botania:flower_shrinking", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/red_quartz_deconstruct.json b/src/generated/resources/data/botania/recipes/mana_infusion/red_quartz_deconstruct.json index 18eaf0fce..d92575aa9 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/red_quartz_deconstruct.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/red_quartz_deconstruct.json @@ -8,5 +8,7 @@ "count": 4 }, "mana": 25, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/red_tulip_to_orange_tulip.json b/src/generated/resources/data/botania/recipes/mana_infusion/red_tulip_to_orange_tulip.json index c0018880d..72ff25916 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/red_tulip_to_orange_tulip.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/red_tulip_to_orange_tulip.json @@ -8,5 +8,7 @@ }, "mana": 400, "group": "botania:flower_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/redstone_dupe.json b/src/generated/resources/data/botania/recipes/mana_infusion/redstone_dupe.json index 6c128f0dc..c6b8f0f24 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/redstone_dupe.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/redstone_dupe.json @@ -8,5 +8,7 @@ "count": 2 }, "mana": 5000, - "catalyst": "botania:conjuration_catalyst" + "catalyst": { + "name": "botania:conjuration_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/redstone_to_glowstone_dust.json b/src/generated/resources/data/botania/recipes/mana_infusion/redstone_to_glowstone_dust.json index e84dd3597..4655a4265 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/redstone_to_glowstone_dust.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/redstone_to_glowstone_dust.json @@ -7,5 +7,7 @@ "item": "minecraft:glowstone_dust" }, "mana": 300, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/rose_bush_to_peony.json b/src/generated/resources/data/botania/recipes/mana_infusion/rose_bush_to_peony.json index f8305360f..bd3f41d9f 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/rose_bush_to_peony.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/rose_bush_to_peony.json @@ -8,5 +8,7 @@ }, "mana": 400, "group": "botania:flower_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/rotten_flesh_to_leather.json b/src/generated/resources/data/botania/recipes/mana_infusion/rotten_flesh_to_leather.json index 64ebc0da4..f809c154f 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/rotten_flesh_to_leather.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/rotten_flesh_to_leather.json @@ -7,5 +7,7 @@ "item": "minecraft:leather" }, "mana": 600, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/salmon_to_tropical_fish.json b/src/generated/resources/data/botania/recipes/mana_infusion/salmon_to_tropical_fish.json index de8bc8e5d..880ea6b11 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/salmon_to_tropical_fish.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/salmon_to_tropical_fish.json @@ -8,5 +8,7 @@ }, "mana": 200, "group": "botania:fish_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/slime_to_cactus.json b/src/generated/resources/data/botania/recipes/mana_infusion/slime_to_cactus.json index ce6af2a8e..c71613087 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/slime_to_cactus.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/slime_to_cactus.json @@ -7,5 +7,7 @@ "item": "minecraft:cactus" }, "mana": 1200, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/snowball_dupe.json b/src/generated/resources/data/botania/recipes/mana_infusion/snowball_dupe.json index 9d9414f5e..6c8e9fc3e 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/snowball_dupe.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/snowball_dupe.json @@ -8,5 +8,7 @@ "count": 2 }, "mana": 200, - "catalyst": "botania:conjuration_catalyst" + "catalyst": { + "name": "botania:conjuration_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/solegnolia_chibi.json b/src/generated/resources/data/botania/recipes/mana_infusion/solegnolia_chibi.json index 44ee2c3e1..517ca0946 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/solegnolia_chibi.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/solegnolia_chibi.json @@ -8,5 +8,7 @@ }, "mana": 2500, "group": "botania:flower_shrinking", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/soul_sand_dupe.json b/src/generated/resources/data/botania/recipes/mana_infusion/soul_sand_dupe.json index add2e9115..c1d1a8402 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/soul_sand_dupe.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/soul_sand_dupe.json @@ -8,5 +8,7 @@ "count": 2 }, "mana": 1500, - "catalyst": "botania:conjuration_catalyst" + "catalyst": { + "name": "botania:conjuration_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/spruce_leaves_dupe.json b/src/generated/resources/data/botania/recipes/mana_infusion/spruce_leaves_dupe.json index ba2b7da5d..f1223fbed 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/spruce_leaves_dupe.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/spruce_leaves_dupe.json @@ -8,5 +8,7 @@ "count": 2 }, "mana": 2000, - "catalyst": "botania:conjuration_catalyst" + "catalyst": { + "name": "botania:conjuration_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/spruce_log_to_birch_log.json b/src/generated/resources/data/botania/recipes/mana_infusion/spruce_log_to_birch_log.json index c2a6c8b89..96baeb8d7 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/spruce_log_to_birch_log.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/spruce_log_to_birch_log.json @@ -8,5 +8,7 @@ }, "mana": 40, "group": "botania:log_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/spruce_sapling_to_birch_sapling.json b/src/generated/resources/data/botania/recipes/mana_infusion/spruce_sapling_to_birch_sapling.json index 339a6fb8a..3fdb92ca9 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/spruce_sapling_to_birch_sapling.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/spruce_sapling_to_birch_sapling.json @@ -8,5 +8,7 @@ }, "mana": 120, "group": "botania:sapling_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/stone_to_andesite.json b/src/generated/resources/data/botania/recipes/mana_infusion/stone_to_andesite.json index 7f964c1a6..87cf55359 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/stone_to_andesite.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/stone_to_andesite.json @@ -7,5 +7,7 @@ "item": "minecraft:andesite" }, "mana": 200, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/sunflower_to_lilac.json b/src/generated/resources/data/botania/recipes/mana_infusion/sunflower_to_lilac.json index fe694db18..f4d61e0bf 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/sunflower_to_lilac.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/sunflower_to_lilac.json @@ -8,5 +8,7 @@ }, "mana": 400, "group": "botania:flower_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/sweet_berries_to_apple.json b/src/generated/resources/data/botania/recipes/mana_infusion/sweet_berries_to_apple.json index d6d4e9a4a..60d262984 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/sweet_berries_to_apple.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/sweet_berries_to_apple.json @@ -8,5 +8,7 @@ }, "mana": 240, "group": "botania:berry_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/terracotta_to_red_sand.json b/src/generated/resources/data/botania/recipes/mana_infusion/terracotta_to_red_sand.json index cd4529fd4..08a9c09d4 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/terracotta_to_red_sand.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/terracotta_to_red_sand.json @@ -7,5 +7,7 @@ "item": "minecraft:red_sand" }, "mana": 50, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/tropical_fish_to_pufferfish.json b/src/generated/resources/data/botania/recipes/mana_infusion/tropical_fish_to_pufferfish.json index 4b84ab278..fa71fcbc1 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/tropical_fish_to_pufferfish.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/tropical_fish_to_pufferfish.json @@ -8,5 +8,7 @@ }, "mana": 200, "group": "botania:fish_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/vine_to_lily_pad.json b/src/generated/resources/data/botania/recipes/mana_infusion/vine_to_lily_pad.json index e76345711..b2aa216a7 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/vine_to_lily_pad.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/vine_to_lily_pad.json @@ -7,5 +7,7 @@ "item": "minecraft:lily_pad" }, "mana": 320, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/wheat_seeds_to_potato.json b/src/generated/resources/data/botania/recipes/mana_infusion/wheat_seeds_to_potato.json index 9f5cbcd7f..64d2b06c2 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/wheat_seeds_to_potato.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/wheat_seeds_to_potato.json @@ -8,5 +8,7 @@ }, "mana": 6000, "group": "botania:crop_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/white_tulip_to_pink_tulip.json b/src/generated/resources/data/botania/recipes/mana_infusion/white_tulip_to_pink_tulip.json index 21dac4b35..f73872fb3 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/white_tulip_to_pink_tulip.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/white_tulip_to_pink_tulip.json @@ -8,5 +8,7 @@ }, "mana": 400, "group": "botania:flower_cycle", - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/mana_infusion/wool_deconstruct.json b/src/generated/resources/data/botania/recipes/mana_infusion/wool_deconstruct.json index 5e1997de7..37e7aa302 100644 --- a/src/generated/resources/data/botania/recipes/mana_infusion/wool_deconstruct.json +++ b/src/generated/resources/data/botania/recipes/mana_infusion/wool_deconstruct.json @@ -8,5 +8,7 @@ "count": 3 }, "mana": 100, - "catalyst": "botania:alchemy_catalyst" + "catalyst": { + "name": "botania:alchemy_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/pure_daisy/blue_ice.json b/src/generated/resources/data/botania/recipes/pure_daisy/blue_ice.json new file mode 100644 index 000000000..70527660b --- /dev/null +++ b/src/generated/resources/data/botania/recipes/pure_daisy/blue_ice.json @@ -0,0 +1,10 @@ +{ + "type": "botania:pure_daisy", + "input": { + "type": "block", + "block": "minecraft:packed_ice" + }, + "output": { + "name": "minecraft:blue_ice" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/pure_daisy/cobblestone.json b/src/generated/resources/data/botania/recipes/pure_daisy/cobblestone.json new file mode 100644 index 000000000..4b2cf4003 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/pure_daisy/cobblestone.json @@ -0,0 +1,10 @@ +{ + "type": "botania:pure_daisy", + "input": { + "type": "tag", + "tag": "forge:netherrack" + }, + "output": { + "name": "minecraft:cobblestone" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/pure_daisy/livingrock.json b/src/generated/resources/data/botania/recipes/pure_daisy/livingrock.json new file mode 100644 index 000000000..0df24ebfa --- /dev/null +++ b/src/generated/resources/data/botania/recipes/pure_daisy/livingrock.json @@ -0,0 +1,10 @@ +{ + "type": "botania:pure_daisy", + "input": { + "type": "tag", + "tag": "forge:stone" + }, + "output": { + "name": "botania:livingrock" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/pure_daisy/livingwood.json b/src/generated/resources/data/botania/recipes/pure_daisy/livingwood.json new file mode 100644 index 000000000..19a89cee5 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/pure_daisy/livingwood.json @@ -0,0 +1,10 @@ +{ + "type": "botania:pure_daisy", + "input": { + "type": "tag", + "tag": "minecraft:logs" + }, + "output": { + "name": "botania:livingwood" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/pure_daisy/obsidian.json b/src/generated/resources/data/botania/recipes/pure_daisy/obsidian.json new file mode 100644 index 000000000..9a7ec1090 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/pure_daisy/obsidian.json @@ -0,0 +1,10 @@ +{ + "type": "botania:pure_daisy", + "input": { + "type": "block", + "block": "botania:blaze_block" + }, + "output": { + "name": "minecraft:obsidian" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/pure_daisy/packed_ice.json b/src/generated/resources/data/botania/recipes/pure_daisy/packed_ice.json new file mode 100644 index 000000000..60fd3c898 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/pure_daisy/packed_ice.json @@ -0,0 +1,10 @@ +{ + "type": "botania:pure_daisy", + "input": { + "type": "block", + "block": "minecraft:ice" + }, + "output": { + "name": "minecraft:packed_ice" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/pure_daisy/sand.json b/src/generated/resources/data/botania/recipes/pure_daisy/sand.json new file mode 100644 index 000000000..70d565beb --- /dev/null +++ b/src/generated/resources/data/botania/recipes/pure_daisy/sand.json @@ -0,0 +1,10 @@ +{ + "type": "botania:pure_daisy", + "input": { + "type": "block", + "block": "minecraft:soul_sand" + }, + "output": { + "name": "minecraft:sand" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/pure_daisy/snow_block.json b/src/generated/resources/data/botania/recipes/pure_daisy/snow_block.json new file mode 100644 index 000000000..fd4bed46e --- /dev/null +++ b/src/generated/resources/data/botania/recipes/pure_daisy/snow_block.json @@ -0,0 +1,10 @@ +{ + "type": "botania:pure_daisy", + "input": { + "type": "block", + "block": "minecraft:water" + }, + "output": { + "name": "minecraft:snow_block" + } +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index bf8208dc0..35bae71db 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -32,10 +32,7 @@ import vazkii.botania.api.internal.IInternalMethodHandler; import vazkii.botania.api.item.IExoflameHeatable; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.recipe.RecipeBrew; -import vazkii.botania.api.recipe.RecipeElvenTrade; -import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; -import vazkii.botania.api.recipe.RecipePureDaisy; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.common.core.handler.PixieHandler; @@ -61,7 +58,6 @@ public final class BotaniaAPI { * These maps are not meant to be mutated! */ public static Map petalRecipes = Collections.emptyMap(); - public static Map pureDaisyRecipes = Collections.emptyMap(); public static Map runeAltarRecipes = Collections.emptyMap(); public static Map brewRecipes = Collections.emptyMap(); diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java index 007004171..61aa10d3b 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java @@ -153,15 +153,9 @@ public class RecipeManaInfusion implements IRecipe { ItemStack output = CraftingHelper.getItemStack(JSONUtils.getJsonObject(json, "output"), true); int mana = JSONUtils.getInt(json, "mana"); String group = JSONUtils.getString(json, "group", ""); - String catalyst = JSONUtils.getString(json, "catalyst", ""); BlockState catalystState = null; - if (!catalyst.isEmpty()) { - try { - BlockStateParser parser = new BlockStateParser(new StringReader(catalyst), false).parse(false); - catalystState = parser.getState(); - } catch (CommandSyntaxException e) { - throw new JsonParseException("Failure reading catalyst state", e); - } + if (json.has("catalyst")) { + catalystState = StateIngredient.readBlockState(json.getAsJsonObject("catalyst")); } RecipeManaInfusion ret = new RecipeManaInfusion(id, output, ing, mana, group); diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java index 1e07e93a4..1caf34448 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java @@ -9,29 +9,38 @@ package vazkii.botania.api.recipe; import com.google.common.base.Preconditions; +import com.google.gson.JsonObject; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.IRecipeType; import net.minecraft.network.PacketBuffer; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.Tag; +import net.minecraft.util.JSONUtils; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.registry.Registry; import net.minecraft.world.World; +import net.minecraftforge.registries.ForgeRegistryEntry; import vazkii.botania.api.subtile.TileEntitySpecialFlower; +import vazkii.botania.common.crafting.ModRecipeTypes; -public class RecipePureDaisy { +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +public class RecipePureDaisy implements IRecipe { public static final int DEFAULT_TIME = 150; private final ResourceLocation id; - private final Object input; + private final StateIngredient input; private final BlockState outputState; private final int time; - public RecipePureDaisy(ResourceLocation id, Object input, BlockState state) { + public RecipePureDaisy(ResourceLocation id, StateIngredient input, BlockState state) { this(id, input, state, DEFAULT_TIME); } @@ -43,37 +52,19 @@ public class RecipePureDaisy { * total time. * The Pure Daisy only ticks one block at a time in a round robin fashion. */ - public RecipePureDaisy(ResourceLocation id, Object input, BlockState state, int time) { + public RecipePureDaisy(ResourceLocation id, StateIngredient input, BlockState state, int time) { Preconditions.checkArgument(time >= 0, "Time must be nonnegative"); this.id = id; this.input = input; this.outputState = state; this.time = time; - if (input != null - && !(input instanceof Block) - && !(input instanceof BlockState) - && !(input instanceof Tag && checkBlockTag((Tag) input))) { - throw new IllegalArgumentException("input must be a Tag, Block, or IBlockState"); - } - } - - private static boolean checkBlockTag(Tag tag) { - return tag.getAllElements().stream().allMatch(o -> o instanceof Block); } /** * This gets called every tick, please be careful with your checks. */ public boolean matches(World world, BlockPos pos, TileEntitySpecialFlower pureDaisy, BlockState state) { - if (input instanceof Block) { - return state.getBlock() == input; - } - - if (input instanceof BlockState) { - return state == input; - } - - return ((Tag) input).contains(state.getBlock()); + return input.test(state); } /** @@ -88,7 +79,7 @@ public class RecipePureDaisy { return true; } - public Object getInput() { + public StateIngredient getInput() { return input; } @@ -104,41 +95,61 @@ public class RecipePureDaisy { return id; } - public void write(PacketBuffer buf) { - buf.writeResourceLocation(id); - if (input instanceof Tag) { - buf.writeVarInt(0); - buf.writeResourceLocation(((Tag) input).getId()); - } else if (input instanceof Block) { - buf.writeVarInt(1); - buf.writeVarInt(Registry.BLOCK.getId((Block) input)); - } else { - buf.writeVarInt(2); - buf.writeVarInt(Block.getStateId((BlockState) input)); - } - buf.writeVarInt(Block.getStateId(outputState)); - buf.writeVarInt(time); + @Override + public IRecipeSerializer getSerializer() { + return ModRecipeTypes.PURE_DAISY_SERIALIZER; } - public static RecipePureDaisy read(PacketBuffer buf) { - ResourceLocation id = buf.readResourceLocation(); - Object input; - switch (buf.readVarInt()) { - case 0: - input = new BlockTags.Wrapper(buf.readResourceLocation()); - break; - case 1: - input = Registry.BLOCK.getByValue(buf.readVarInt()); - break; - case 2: - input = Block.getStateById(buf.readVarInt()); - break; - default: - throw new RuntimeException("Unknown input discriminator"); - } - BlockState output = Block.getStateById(buf.readVarInt()); - int time = buf.readVarInt(); - return new RecipePureDaisy(id, input, output, time); + @Override + public IRecipeType getType() { + return ModRecipeTypes.PURE_DAISY_TYPE; } + // Ignored IRecipe overrides + @Override + public boolean matches(IInventory p_77569_1_, World p_77569_2_) { + return false; + } + + @Override + public ItemStack getCraftingResult(IInventory p_77572_1_) { + return ItemStack.EMPTY; + } + + @Override + public boolean canFit(int p_194133_1_, int p_194133_2_) { + return false; + } + + @Override + public ItemStack getRecipeOutput() { + return ItemStack.EMPTY; + } + + public static class Serializer extends ForgeRegistryEntry> implements IRecipeSerializer { + @Nonnull + @Override + public RecipePureDaisy read(@Nonnull ResourceLocation id, JsonObject object) { + StateIngredient input = StateIngredient.deserialize(object.getAsJsonObject("input")); + BlockState output = StateIngredient.readBlockState(object.getAsJsonObject("output")); + int time = JSONUtils.getInt(object, "time", DEFAULT_TIME); + return new RecipePureDaisy(id, input, output, time); + } + + @Override + public void write(@Nonnull PacketBuffer buf, RecipePureDaisy recipe) { + recipe.input.write(buf); + buf.writeVarInt(Block.getStateId(recipe.outputState)); + buf.writeVarInt(recipe.time); + } + + @Nullable + @Override + public RecipePureDaisy read(@Nonnull ResourceLocation id, @Nonnull PacketBuffer buf) { + StateIngredient input = StateIngredient.read(buf); + BlockState output = Block.getStateById(buf.readVarInt()); + int time = buf.readVarInt(); + return new RecipePureDaisy(id, input, output, time); + } + } } diff --git a/src/main/java/vazkii/botania/api/recipe/RegisterRecipesEvent.java b/src/main/java/vazkii/botania/api/recipe/RegisterRecipesEvent.java index ae4db21da..880908171 100644 --- a/src/main/java/vazkii/botania/api/recipe/RegisterRecipesEvent.java +++ b/src/main/java/vazkii/botania/api/recipe/RegisterRecipesEvent.java @@ -20,24 +20,16 @@ import java.util.function.Consumer; * handlers as stateless as possible. */ public class RegisterRecipesEvent extends Event { - private final Consumer pureDaisy; private final Consumer brew; private final Consumer apothecary; private final Consumer runeAltar; - public RegisterRecipesEvent(Consumer pureDaisy, - Consumer brew, - Consumer apothecary, Consumer runeAltar) { - this.pureDaisy = pureDaisy; + public RegisterRecipesEvent(Consumer brew, Consumer apothecary, Consumer runeAltar) { this.brew = brew; this.apothecary = apothecary; this.runeAltar = runeAltar; } - public Consumer pureDaisy() { - return pureDaisy; - } - public Consumer brew() { return brew; } diff --git a/src/main/java/vazkii/botania/api/recipe/StateIngredient.java b/src/main/java/vazkii/botania/api/recipe/StateIngredient.java new file mode 100644 index 000000000..f516fd716 --- /dev/null +++ b/src/main/java/vazkii/botania/api/recipe/StateIngredient.java @@ -0,0 +1,214 @@ +/* + * This class is distributed as part of the Botania Mod. + * Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ +package vazkii.botania.api.recipe; + +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import com.mojang.datafixers.Dynamic; +import com.mojang.datafixers.types.JsonOps; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.INBT; +import net.minecraft.nbt.NBTDynamicOps; +import net.minecraft.nbt.NBTUtil; +import net.minecraft.network.PacketBuffer; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.Tag; +import net.minecraft.util.JSONUtils; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.registries.ForgeRegistries; + +import java.util.Collections; +import java.util.List; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +public abstract class StateIngredient implements Predicate { + + public static StateIngredient of(Block block) { + return new OfBlock(block); + } + + public static StateIngredient of(BlockState state) { + return new OfState(state); + } + + public static StateIngredient of(Tag tag) { + return new OfTag(tag); + } + + public static StateIngredient of(ResourceLocation id) { + return new OfTag(id); + } + + public static StateIngredient deserialize(JsonObject object) { + switch (JSONUtils.getString(object, "type")) { + case "tag": + return new OfTag(new BlockTags.Wrapper(new ResourceLocation(JSONUtils.getString(object, "tag")))); + case "block": + return new OfBlock(ForgeRegistries.BLOCKS.getValue(new ResourceLocation(JSONUtils.getString(object, "block")))); + case "state": + return new OfState(readBlockState(object)); + default: + throw new JsonParseException("Unknown type!"); + } + } + + public static StateIngredient read(PacketBuffer buffer) { + switch (buffer.readVarInt()) { + case 0: + return new OfTag(buffer.readResourceLocation()); + case 1: + return new OfBlock(buffer.readRegistryIdUnsafe(ForgeRegistries.BLOCKS)); + case 2: + return new OfState(Block.getStateById(buffer.readVarInt())); + default: + throw new IllegalArgumentException("Unknown input discriminator!"); + } + } + + /** + * Writes data about the block state to the provided json object. + */ + public static JsonObject serializeBlockState(BlockState state) { + CompoundNBT nbt = NBTUtil.writeBlockState(state); + renameTag(nbt, "Name", "name"); + renameTag(nbt, "Properties", "properties"); + Dynamic dyn = new Dynamic<>(NBTDynamicOps.INSTANCE, nbt); + return dyn.convert(JsonOps.INSTANCE).getValue().getAsJsonObject(); + } + + /** + * Reads the block state from the provided json object. + */ + 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"); + 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); + + public abstract List getDisplayed(); + + private static class OfBlock extends StateIngredient { + private final net.minecraft.block.Block block; + + private OfBlock(net.minecraft.block.Block block) { + this.block = block; + } + + @Override + public boolean test(BlockState blockState) { + return block == blockState.getBlock(); + } + + @Override + public JsonObject serialize() { + JsonObject object = new JsonObject(); + object.addProperty("type", "block"); + object.addProperty("block", block.getRegistryName().toString()); + return object; + } + + @Override + public void write(PacketBuffer buffer) { + buffer.writeVarInt(1); + buffer.writeRegistryIdUnsafe(ForgeRegistries.BLOCKS, block); + } + + @Override + public List getDisplayed() { + return Collections.singletonList(block.getDefaultState()); + } + + } + + private static class OfState extends StateIngredient { + private final BlockState state; + + private OfState(BlockState state) { + this.state = state; + } + + @Override + public boolean test(BlockState blockState) { + return false; + } + + @Override + public JsonObject serialize() { + JsonObject object = serializeBlockState(state); + object.addProperty("type", "state"); + return object; + } + + @Override + public void write(PacketBuffer buffer) { + buffer.writeVarInt(2); + buffer.writeVarInt(Block.getStateId(state)); + } + + @Override + public List getDisplayed() { + return Collections.singletonList(state); + } + + } + + private static class OfTag extends StateIngredient { + private final Tag tag; + + public OfTag(Tag tag) { + this.tag = tag; + } + + public OfTag(ResourceLocation id) { + this(new BlockTags.Wrapper(id)); + } + + @Override + public boolean test(BlockState state) { + return tag.contains(state.getBlock()); + } + + @Override + public JsonObject serialize() { + JsonObject object = new JsonObject(); + object.addProperty("type", "tag"); + object.addProperty("tag", tag.getId().toString()); + return object; + } + + @Override + public void write(PacketBuffer buffer) { + buffer.writeVarInt(0); + buffer.writeResourceLocation(tag.getId()); + } + + @Override + public List getDisplayed() { + return tag.getAllElements().stream().map(Block::getDefaultState).collect(Collectors.toList()); + } + + } +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index b96420446..2590f8338 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -53,6 +53,7 @@ import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.AbstractElvenTradeRecipe; import vazkii.botania.common.crafting.LexiconElvenTradeRecipe; +import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.botania.common.crafting.recipe.AncientWillRecipe; import vazkii.botania.common.crafting.recipe.CompositeLensRecipe; import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe; @@ -121,7 +122,7 @@ public class JEIBotaniaPlugin implements IModPlugin { @Override public void registerRecipes(@Nonnull IRecipeRegistration registry) { registry.addRecipes(BotaniaAPI.brewRecipes.values(), BreweryRecipeCategory.UID); - registry.addRecipes(BotaniaAPI.pureDaisyRecipes.values(), PureDaisyRecipeCategory.UID); + registry.addRecipes(Minecraft.getInstance().world.getRecipeManager().getRecipes(ModRecipeTypes.PURE_DAISY_TYPE).values(), PureDaisyRecipeCategory.UID); registry.addRecipes(BotaniaAPI.petalRecipes.values(), PetalApothecaryRecipeCategory.UID); registry.addRecipes(TileAlfPortal.elvenTradeRecipes(Minecraft.getInstance().world.getRecipeManager()), ElvenTradeRecipeCategory.UID); registry.addRecipes(BotaniaAPI.runeAltarRecipes.values(), RunicAltarRecipeCategory.UID); diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index 66b27392c..35032f37c 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -28,6 +28,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; import vazkii.botania.api.recipe.RecipePureDaisy; +import vazkii.botania.api.recipe.StateIngredient; import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lib.LibMisc; @@ -46,7 +47,7 @@ public class PureDaisyRecipeCategory implements IRecipeCategory private final IDrawable icon; public PureDaisyRecipeCategory(IGuiHelper guiHelper) { - background = guiHelper.createBlankDrawable(168, 64); + background = guiHelper.createBlankDrawable(168, 46); localizedName = I18n.format("botania.nei.pureDaisy"); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pure_daisy_overlay.png"), 0, 0, 64, 46); @@ -85,11 +86,15 @@ public class PureDaisyRecipeCategory implements IRecipeCategory @Override public void setIngredients(RecipePureDaisy recipe, IIngredients iIngredients) { - if (recipe.getInput() instanceof Tag) { - Collection all = ((Tag) recipe.getInput()).getAllElements(); - iIngredients.setInputLists(VanillaTypes.ITEM, Collections.singletonList(all.stream().map(ItemStack::new).filter(s -> !s.isEmpty()).collect(Collectors.toList()))); - } else if (recipe.getInput() instanceof Block || recipe.getInput() instanceof BlockState) { - BlockState state = recipe.getInput() instanceof BlockState ? (BlockState) recipe.getInput() : ((Block) recipe.getInput()).getDefaultState(); + StateIngredient input = recipe.getInput(); + if (input.getDisplayed().size() > 1) { + iIngredients.setInputLists(VanillaTypes.ITEM, Collections.singletonList(input.getDisplayed().stream() + .map(BlockState::getBlock) + .map(ItemStack::new) + .filter(s -> !s.isEmpty()) + .collect(Collectors.toList()))); + } else { + BlockState state = input.getDisplayed().get(0); Block b = state.getBlock(); if (b instanceof FlowingFluidBlock) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java index cf4dd65e3..3cef91cf5 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block.subtile; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; @@ -23,6 +24,7 @@ import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.botania.common.lib.LibMisc; import java.util.Arrays; @@ -118,9 +120,9 @@ public class SubTilePureDaisy extends TileEntitySpecialFlower { private RecipePureDaisy findRecipe(BlockPos coords) { BlockState state = getWorld().getBlockState(coords); - for (RecipePureDaisy recipe : BotaniaAPI.pureDaisyRecipes.values()) { - if (recipe.matches(getWorld(), coords, this, state)) { - return recipe; + for (IRecipe recipe : world.getRecipeManager().getRecipes(ModRecipeTypes.PURE_DAISY_TYPE).values()) { + if (recipe instanceof RecipePureDaisy && ((RecipePureDaisy) recipe).matches(getWorld(), coords, this, state)) { + return ((RecipePureDaisy) recipe); } } diff --git a/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java deleted file mode 100644 index 7ba881b8e..000000000 --- a/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This class is distributed as part of the Botania Mod. - * Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.common.crafting; - -import net.minecraft.block.Blocks; -import net.minecraft.tags.BlockTags; -import net.minecraftforge.common.Tags; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -import vazkii.botania.api.recipe.RecipePureDaisy; -import vazkii.botania.api.recipe.RegisterRecipesEvent; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.lib.LibMisc; - -import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; - -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) -public final class ModPureDaisyRecipes { - @SubscribeEvent - public static void register(RegisterRecipesEvent evt) { - evt.pureDaisy().accept(new RecipePureDaisy(prefix("livingrock"), Tags.Blocks.STONE, ModBlocks.livingrock.getDefaultState())); - evt.pureDaisy().accept(new RecipePureDaisy(prefix("livingwood"), BlockTags.LOGS, ModBlocks.livingwood.getDefaultState())); - - evt.pureDaisy().accept(new RecipePureDaisy(prefix("cobblestone"), Tags.Blocks.NETHERRACK, Blocks.COBBLESTONE.getDefaultState())); - evt.pureDaisy().accept(new RecipePureDaisy(prefix("sand"), Blocks.SOUL_SAND, Blocks.SAND.getDefaultState())); - evt.pureDaisy().accept(new RecipePureDaisy(prefix("packed_ice"), Blocks.ICE, Blocks.PACKED_ICE.getDefaultState())); - evt.pureDaisy().accept(new RecipePureDaisy(prefix("blue_ice"), Blocks.PACKED_ICE, Blocks.BLUE_ICE.getDefaultState())); - evt.pureDaisy().accept(new RecipePureDaisy(prefix("obsidian"), ModBlocks.blazeBlock, Blocks.OBSIDIAN.getDefaultState())); - evt.pureDaisy().accept(new RecipePureDaisy(prefix("snow_block"), Blocks.WATER, Blocks.SNOW_BLOCK.getDefaultState())); - } -} diff --git a/src/main/java/vazkii/botania/common/crafting/ModRecipeTypes.java b/src/main/java/vazkii/botania/common/crafting/ModRecipeTypes.java index e08c584b4..2b5aa0862 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModRecipeTypes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModRecipeTypes.java @@ -21,7 +21,6 @@ import net.minecraftforge.fml.common.Mod; import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePureDaisy; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lib.LibMisc; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; @@ -30,10 +29,14 @@ import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; public class ModRecipeTypes { public static final IRecipeType MANA_INFUSION_TYPE = new RecipeType<>(); public static final IRecipeSerializer MANA_INFUSION_SERIALIZER = new RecipeManaInfusion.Serializer(); + public static final IRecipeType ELVEN_TRADE_TYPE = new RecipeType<>(); public static final IRecipeSerializer ELVEN_TRADE_SERIALIZER = new RecipeElvenTrade.Serializer(); public static final SpecialRecipeSerializer LEXICON_ELVEN_TRADE_SERIALIZER = new SpecialRecipeSerializer<>(LexiconElvenTradeRecipe::new); + public static final IRecipeType PURE_DAISY_TYPE = new RecipeType<>(); + public static final IRecipeSerializer PURE_DAISY_SERIALIZER = new RecipePureDaisy.Serializer(); + @SubscribeEvent public static void register(RegistryEvent.Register> evt) { ResourceLocation id = prefix("elven_trade"); @@ -44,6 +47,10 @@ public class ModRecipeTypes { id = prefix("mana_infusion"); Registry.register(Registry.RECIPE_TYPE, id, MANA_INFUSION_TYPE); evt.getRegistry().register(MANA_INFUSION_SERIALIZER.setRegistryName(id)); + + id = prefix("pure_daisy"); + Registry.register(Registry.RECIPE_TYPE, id, PURE_DAISY_TYPE); + evt.getRegistry().register(PURE_DAISY_SERIALIZER.setRegistryName(id)); } private static class RecipeType> implements IRecipeType { diff --git a/src/main/java/vazkii/botania/common/crafting/SyncHandler.java b/src/main/java/vazkii/botania/common/crafting/SyncHandler.java index d686e5bd7..47d94a47e 100644 --- a/src/main/java/vazkii/botania/common/crafting/SyncHandler.java +++ b/src/main/java/vazkii/botania/common/crafting/SyncHandler.java @@ -22,9 +22,7 @@ import net.minecraftforge.fml.network.PacketDistributor; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeBrew; -import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; -import vazkii.botania.api.recipe.RecipePureDaisy; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.recipe.RegisterRecipesEvent; import vazkii.botania.common.lib.LibMisc; @@ -41,20 +39,17 @@ public class SyncHandler { public static class ReloadListener implements IResourceManagerReloadListener { @Override public void onResourceManagerReload(@Nullable IResourceManager manager) { - Map pureDaisy = new HashMap<>(); Map brew = new HashMap<>(); Map apothecary = new HashMap<>(); Map runeAltar = new HashMap<>(); RegisterRecipesEvent evt = new RegisterRecipesEvent( - r -> pureDaisy.put(r.getId(), r), r -> brew.put(r.getId(), r), r -> apothecary.put(r.getId(), r), r -> runeAltar.put(r.getId(), r) ); MinecraftForge.EVENT_BUS.post(evt); - BotaniaAPI.pureDaisyRecipes = ImmutableMap.copyOf(pureDaisy); BotaniaAPI.brewRecipes = ImmutableMap.copyOf(brew); BotaniaAPI.petalRecipes = ImmutableMap.copyOf(apothecary); BotaniaAPI.runeAltarRecipes = ImmutableMap.copyOf(runeAltar); @@ -63,8 +58,7 @@ public class SyncHandler { } private static PacketSyncRecipes syncPacket() { - return new PacketSyncRecipes(BotaniaAPI.brewRecipes, - BotaniaAPI.petalRecipes, BotaniaAPI.pureDaisyRecipes, BotaniaAPI.runeAltarRecipes); + return new PacketSyncRecipes(BotaniaAPI.brewRecipes, BotaniaAPI.petalRecipes, BotaniaAPI.runeAltarRecipes); } @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, value = Dist.CLIENT) @@ -73,7 +67,6 @@ public class SyncHandler { public static void clientLogout(ClientPlayerNetworkEvent.LoggedOutEvent evt) { BotaniaAPI.brewRecipes = Collections.emptyMap(); BotaniaAPI.petalRecipes = Collections.emptyMap(); - BotaniaAPI.pureDaisyRecipes = Collections.emptyMap(); BotaniaAPI.runeAltarRecipes = Collections.emptyMap(); } } diff --git a/src/main/java/vazkii/botania/common/network/PacketSyncRecipes.java b/src/main/java/vazkii/botania/common/network/PacketSyncRecipes.java index f1917d71f..6afe1a5a3 100644 --- a/src/main/java/vazkii/botania/common/network/PacketSyncRecipes.java +++ b/src/main/java/vazkii/botania/common/network/PacketSyncRecipes.java @@ -16,7 +16,6 @@ import net.minecraftforge.fml.network.NetworkEvent; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.api.recipe.RecipePetals; -import vazkii.botania.api.recipe.RecipePureDaisy; import vazkii.botania.api.recipe.RecipeRuneAltar; import java.util.Map; @@ -27,13 +26,11 @@ import java.util.stream.Stream; public class PacketSyncRecipes { private Map brew; private Map petal; - private Map pureDaisy; private Map runeAltar; - public PacketSyncRecipes(Map brew, Map petal, Map pureDaisy, Map runeAltar) { + public PacketSyncRecipes(Map brew, Map petal, Map runeAltar) { this.brew = brew; this.petal = petal; - this.pureDaisy = pureDaisy; this.runeAltar = runeAltar; } @@ -46,10 +43,6 @@ public class PacketSyncRecipes { for (RecipePetals recipe : petal.values()) { recipe.write(buf); } - buf.writeVarInt(pureDaisy.size()); - for (RecipePureDaisy recipe : pureDaisy.values()) { - recipe.write(buf); - } buf.writeVarInt(runeAltar.size()); for (RecipeRuneAltar recipe : runeAltar.values()) { recipe.write(buf); @@ -65,15 +58,11 @@ public class PacketSyncRecipes { Map petal = Stream.generate(() -> RecipePetals.read(buf)) .limit(petalCount) .collect(Collectors.toMap(RecipePetals::getId, r -> r)); - int pureDaisyCount = buf.readVarInt(); - Map pureDaisy = Stream.generate(() -> RecipePureDaisy.read(buf)) - .limit(pureDaisyCount) - .collect(Collectors.toMap(RecipePureDaisy::getId, r -> r)); int runeCount = buf.readVarInt(); Map rune = Stream.generate(() -> RecipeRuneAltar.read(buf)) .limit(runeCount) .collect(Collectors.toMap(RecipeRuneAltar::getId, r -> r)); - return new PacketSyncRecipes(brew, petal, pureDaisy, rune); + return new PacketSyncRecipes(brew, petal, rune); } public void handle(Supplier ctx) { @@ -84,7 +73,6 @@ public class PacketSyncRecipes { } BotaniaAPI.brewRecipes = brew; BotaniaAPI.petalRecipes = petal; - BotaniaAPI.pureDaisyRecipes = pureDaisy; BotaniaAPI.runeAltarRecipes = runeAltar; }); } @@ -97,8 +85,7 @@ public class PacketSyncRecipes { private int loginIndex; public Login() { - this(new PacketSyncRecipes(BotaniaAPI.brewRecipes, BotaniaAPI.petalRecipes, - BotaniaAPI.pureDaisyRecipes, BotaniaAPI.runeAltarRecipes)); + this(new PacketSyncRecipes(BotaniaAPI.brewRecipes, BotaniaAPI.petalRecipes, BotaniaAPI.runeAltarRecipes)); } public Login(PacketSyncRecipes packet) { diff --git a/src/main/java/vazkii/botania/data/DataGenerators.java b/src/main/java/vazkii/botania/data/DataGenerators.java index d992bf0e4..962da3c04 100644 --- a/src/main/java/vazkii/botania/data/DataGenerators.java +++ b/src/main/java/vazkii/botania/data/DataGenerators.java @@ -30,6 +30,7 @@ public class DataGenerators { evt.getGenerator().addProvider(new BlockstateProvider(evt.getGenerator(), evt.getExistingFileHelper())); evt.getGenerator().addProvider(new ElvenTradeProvider(evt.getGenerator())); evt.getGenerator().addProvider(new ManaInfusionProvider(evt.getGenerator())); + evt.getGenerator().addProvider(new PureDaisyProvider(evt.getGenerator())); } } } diff --git a/src/main/java/vazkii/botania/data/ManaInfusionProvider.java b/src/main/java/vazkii/botania/data/ManaInfusionProvider.java index accdf466d..2370b7096 100644 --- a/src/main/java/vazkii/botania/data/ManaInfusionProvider.java +++ b/src/main/java/vazkii/botania/data/ManaInfusionProvider.java @@ -27,6 +27,7 @@ import net.minecraft.util.IItemProvider; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.Tags; +import vazkii.botania.api.recipe.StateIngredient; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; @@ -248,14 +249,7 @@ public class ManaInfusionProvider extends RecipeProvider { json.addProperty("group", group); } if (catalyst != null) { - StringBuilder catalystStr = new StringBuilder(catalyst.getBlock().getRegistryName().toString()); - if (catalyst != catalyst.getBlock().getDefaultState()) { - catalystStr.append('['); - catalystStr.append(catalyst.getProperties().stream().map(prop -> prop.getName() + "=" + getName(prop, catalyst.get(prop))) - .collect(Collectors.joining(","))); - catalystStr.append(']'); - } - json.addProperty("catalyst", catalystStr.toString()); + json.add("catalyst", StateIngredient.serializeBlockState(catalyst)); } } diff --git a/src/main/java/vazkii/botania/data/PureDaisyProvider.java b/src/main/java/vazkii/botania/data/PureDaisyProvider.java new file mode 100644 index 000000000..03193ddfa --- /dev/null +++ b/src/main/java/vazkii/botania/data/PureDaisyProvider.java @@ -0,0 +1,113 @@ +/* + * This class is distributed as part of the Botania Mod. + * Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ +package vazkii.botania.data; + +import com.google.common.base.Preconditions; +import com.google.gson.JsonObject; + +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.IFinishedRecipe; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.tags.BlockTags; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Rotation; +import net.minecraftforge.common.Tags; + +import vazkii.botania.api.recipe.StateIngredient; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.crafting.ModRecipeTypes; + +import javax.annotation.Nullable; + +import java.util.function.Consumer; + +import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; + +public class PureDaisyProvider extends RecipeProvider { + public PureDaisyProvider(DataGenerator generator) { + super(generator); + } + + @Override + protected void registerRecipes(Consumer consumer) { + + consumer.accept(new FinishedRecipe(id("livingrock"), StateIngredient.of(Tags.Blocks.STONE), ModBlocks.livingrock.getDefaultState())); + consumer.accept(new FinishedRecipe(id("livingwood"), StateIngredient.of(BlockTags.LOGS), ModBlocks.livingwood.getDefaultState())); + + consumer.accept(new FinishedRecipe(id("cobblestone"), StateIngredient.of(Tags.Blocks.NETHERRACK), Blocks.COBBLESTONE.getDefaultState())); + consumer.accept(new FinishedRecipe(id("sand"), StateIngredient.of(Blocks.SOUL_SAND), Blocks.SAND.getDefaultState())); + consumer.accept(new FinishedRecipe(id("packed_ice"), StateIngredient.of(Blocks.ICE), Blocks.PACKED_ICE.getDefaultState())); + consumer.accept(new FinishedRecipe(id("blue_ice"), StateIngredient.of(Blocks.PACKED_ICE), Blocks.BLUE_ICE.getDefaultState())); + consumer.accept(new FinishedRecipe(id("obsidian"), StateIngredient.of(ModBlocks.blazeBlock), Blocks.OBSIDIAN.getDefaultState())); + consumer.accept(new FinishedRecipe(id("snow_block"), StateIngredient.of(Blocks.WATER), Blocks.SNOW_BLOCK.getDefaultState())); + } + + @Override + public String getName() { + return "Botania Pure Daisy recipes"; + } + + private static ResourceLocation id(String path) { + return prefix("pure_daisy/" + path); + } + + private static class FinishedRecipe implements IFinishedRecipe { + public static final int DEFAULT_TIME = 150; + + private final ResourceLocation id; + private final StateIngredient input; + private final BlockState outputState; + private final int time; + + private FinishedRecipe(ResourceLocation id, StateIngredient input, BlockState state) { + this(id, input, state, DEFAULT_TIME); + } + + private FinishedRecipe(ResourceLocation id, StateIngredient input, BlockState state, int time) { + Preconditions.checkArgument(time >= 0, "Time must be nonnegative"); + this.id = id; + this.input = input; + this.outputState = state; + this.time = time; + } + + @Override + public void serialize(JsonObject json) { + json.add("input", input.serialize()); + json.add("output", StateIngredient.serializeBlockState(outputState)); + if (time != DEFAULT_TIME) { + json.addProperty("time", time); + } + } + + @Override + public ResourceLocation getID() { + return id; + } + + @Override + public IRecipeSerializer getSerializer() { + return ModRecipeTypes.PURE_DAISY_SERIALIZER; + } + + @Nullable + @Override + public JsonObject getAdvancementJson() { + return null; + } + + @Nullable + @Override + public ResourceLocation getAdvancementID() { + return null; + } + } +}