diff --git a/src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9 b/src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9 index 2380111ec..13a17d3fb 100644 --- a/src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9 +++ b/src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9 @@ -1,4 +1,4 @@ -// 1.20.1 2024-09-02T22:36:27.358065 Create's Standard Recipes +// 1.20.1 2024-10-08T11:30:41.235223596 Create's Standard Recipes a8cc4af26f6c7c45a9eef12e92af1452fe042454 data/create/advancements/recipes/combat/crafting/appliances/netherite_backtank.json 2c2639c7b307ee7c7a4e97e5efebf496788998ad data/create/advancements/recipes/combat/crafting/appliances/netherite_backtank_from_netherite.json 81dcf0cb1aa99e39bc7d1a386e07cad4cee7d8b9 data/create/advancements/recipes/combat/crafting/appliances/netherite_diving_boots.json @@ -202,9 +202,9 @@ dd7c250fa8e41cbaae65754f38b8861397718ae4 data/create/advancements/recipes/misc/c 05a4420a08df24680b8a7c5c94d9a7ad1d13c0df data/create/advancements/recipes/misc/crafting/materials/zinc_nugget_from_decompacting.json ec99015f13bb194dfb197ea0839cceaed5135148 data/create/advancements/recipes/misc/crafting/palettes/scorchia.json 541c3cb26e0cae9ffd3df94829e5f55a62240bd8 data/create/advancements/recipes/misc/crafting/schematics/empty_schematic.json -3e73c3336f3ab13365d439c491b2e2ce6de6e401 data/create/advancements/recipes/misc/crafting/schematics/schematicannon.json 6e0b7056d229fc949cc7386aa307d0870929f555 data/create/advancements/recipes/misc/crafting/schematics/schematic_and_quill.json f0d041509b3752b3ec6c4ce2b2c6eef9825a0685 data/create/advancements/recipes/misc/crafting/schematics/schematic_table.json +3e73c3336f3ab13365d439c491b2e2ce6de6e401 data/create/advancements/recipes/misc/crafting/schematics/schematicannon.json a8003bd4c06bdf5f2aa3d1789eab2445df9513be data/create/advancements/recipes/misc/crafting/tree_fertilizer.json 0ac95fd4b991a6c61c1d03cc6a6f2f345530f62a data/create/advancements/recipes/misc/smelting/bread.json 53cb4643430e3fd69f81c375f3e334a3d6014128 data/create/advancements/recipes/misc/smelting/copper_ingot_from_crushed.json @@ -448,10 +448,10 @@ cde25f253da4d9800fd8f879a7d208e40510df82 data/create/recipes/crafting/materials/ 11583ad28f32b7f22ffb71e180aface890d1d2d0 data/create/recipes/crafting/materials/zinc_nugget_from_decompacting.json d849fafedd10c68e6bc6dc1e5a85be82aae1b139 data/create/recipes/crafting/palettes/scorchia.json 611c4a553408e0b6ddfcf6ed35bc972bea14ffda data/create/recipes/crafting/schematics/empty_schematic.json -9a687ee9dab44c439ab669aa596117064fb13457 data/create/recipes/crafting/schematics/schematicannon.json 4a20356c9ce01ebfbcacbdc5d3c31094a5599a17 data/create/recipes/crafting/schematics/schematic_and_quill.json 4a297162a630b48407dbc8ff8ca713387dcd3206 data/create/recipes/crafting/schematics/schematic_table.json -dd2b5bfb7ebd836e8b5639894736c226f2cac8c0 data/create/recipes/crafting/tree_fertilizer.json +9a687ee9dab44c439ab669aa596117064fb13457 data/create/recipes/crafting/schematics/schematicannon.json +2cf06129b47d1a2b733619514dc9e8cf1d8967f2 data/create/recipes/crafting/tree_fertilizer.json 78526658ca5ccaa3729c967b5283069945d183b7 data/create/recipes/smelting/bread.json 04bb0c80f3b5a6fe86fc4a8ed5293fc74c2d9aba data/create/recipes/smelting/copper_ingot_from_crushed.json d5b29fa27977691c3c50eb36c28bfe33b8462d09 data/create/recipes/smelting/glass_from_framed_glass.json diff --git a/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 b/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 index e1fbae293..fa9f688fe 100644 --- a/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 +++ b/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 @@ -1,4 +1,4 @@ -// 1.20.1 2024-09-02T22:36:27.2901169 Create's Processing Recipes +// 1.20.1 2024-09-28T17:26:28.246107482 Create's Processing Recipes 3c94326fb730f68c1e44fe1e2ef09c9db6ffd92b data/create/recipes/compacting/andesite_from_flint.json 8d3d5b31f3601b9f681ff710e0545a483a1494c6 data/create/recipes/compacting/blaze_cake.json 8bd7f4e3a686ab520b2d55594d2018d0e9a50c91 data/create/recipes/compacting/chocolate.json @@ -97,18 +97,18 @@ df364151c75a7d84446b2c6213e339115bc9d298 data/create/recipes/crushing/diorite_re 9e89294e53a94a05af47948c21ad192ef18f7710 data/create/recipes/crushing/emerald_ore.json 9c3989fd9e72e21353803f475a08b8f199717c1f data/create/recipes/crushing/gilded_blackstone.json 3c4c78e3a7137022f8f6e90324af6c8f97050e80 data/create/recipes/crushing/glowstone.json -95b76da439260151355fff74b3b7398ce13d6968 data/create/recipes/crushing/golden_horse_armor.json b036b1654d2deec20aca95ff43b60c7d0b28b2fc data/create/recipes/crushing/gold_ore.json +95b76da439260151355fff74b3b7398ce13d6968 data/create/recipes/crushing/golden_horse_armor.json cc939ba59b95db1c7a034df6f9e656772074a5fd data/create/recipes/crushing/gravel.json 17ab2d789c9c2df122b6a96ab06bbe2c02592a93 data/create/recipes/crushing/iron_horse_armor.json c9a47b29ba75ba29c8cb630fe32c4bf2f1f1d1ae data/create/recipes/crushing/iron_ore.json 855b6655dea911724ee68d07b993f17440ac422e data/create/recipes/crushing/lapis_ore.json 492827ab3d55ca3edfef5eb006b1f77d62e1b446 data/create/recipes/crushing/lead_ore.json e170bc17a796c73a05d2d77a85c086cfaac55c31 data/create/recipes/crushing/leather_horse_armor.json -606ccdf3119a62ab461028192d191ffb10332e21 data/create/recipes/crushing/netherrack.json 07e8991a2161aab4dd73bb74900fd0c70aad2847 data/create/recipes/crushing/nether_gold_ore.json c7c0d94707c2858a87d01cff6b284d7fb85acdbe data/create/recipes/crushing/nether_quartz_ore.json 0380b9416b263de2ee6a6cd1f4064df2e243c047 data/create/recipes/crushing/nether_wart_block.json +606ccdf3119a62ab461028192d191ffb10332e21 data/create/recipes/crushing/netherrack.json d3534d606382ec7c1d34275c5f069543d0955906 data/create/recipes/crushing/nickel_ore.json 66f75530e30d8572bdbf4696a32edc5a7850ac00 data/create/recipes/crushing/obsidian.json 17cacb19493b9bbe7236b19a2a50a817c449a915 data/create/recipes/crushing/ochrum.json @@ -666,42 +666,42 @@ ddb27a32c1b01812db7cc317c962e35d794dae88 data/create/recipes/cutting/warped_hyph 7a01147d3c7d8fb9acb870b33e5a792328f88c3c data/create/recipes/deploying/cogwheel.json 1230f449873262e79585752d3430e5f7f383bcb2 data/create/recipes/deploying/large_cogwheel.json dc35369da8514a5650704fd39e84861cce084b5d data/create/recipes/deploying/waxed_copper_block_from_adding_wax.json -7b7d596cdaa4000222177b405c04c6e8906561b4 data/create/recipes/deploying/waxed_copper_shingles_from_adding_wax.json afbe0c612651ee90651ee7b39683c8baac2a115e data/create/recipes/deploying/waxed_copper_shingle_slab_from_adding_wax.json 66cd83c15d46692f27deaac280ef782bb2bd7909 data/create/recipes/deploying/waxed_copper_shingle_stairs_from_adding_wax.json -bcb9750b7c3504996d6177d5980128af018942a8 data/create/recipes/deploying/waxed_copper_tiles_from_adding_wax.json +7b7d596cdaa4000222177b405c04c6e8906561b4 data/create/recipes/deploying/waxed_copper_shingles_from_adding_wax.json eecd6194b0efc2bee321ba7fac7348cd3f5911ab data/create/recipes/deploying/waxed_copper_tile_slab_from_adding_wax.json dfc1f8f6b0d1b6d23c9125c97eba31dadc370904 data/create/recipes/deploying/waxed_copper_tile_stairs_from_adding_wax.json +bcb9750b7c3504996d6177d5980128af018942a8 data/create/recipes/deploying/waxed_copper_tiles_from_adding_wax.json e260cded2b746bd79afaaa1e086cf2f0faffde76 data/create/recipes/deploying/waxed_cut_copper_from_adding_wax.json 33e338242aff64f9d52169392d2eb8e617b8da5c data/create/recipes/deploying/waxed_cut_copper_slab_from_adding_wax.json 5f4671548b18634ae440d7c64c4c97e5e533601b data/create/recipes/deploying/waxed_cut_copper_stairs_from_adding_wax.json ff182d5c0c4b832ff566691d9b680c9039c55c16 data/create/recipes/deploying/waxed_exposed_copper_from_adding_wax.json -eff2e77f004873e695e419afc71a7011328d3de8 data/create/recipes/deploying/waxed_exposed_copper_shingles_from_adding_wax.json 5a7a622d5b340f83ba2d32fe53620744c5193a32 data/create/recipes/deploying/waxed_exposed_copper_shingle_slab_from_adding_wax.json b895ef423e64936b5d94ee54a6527316ed48d9d6 data/create/recipes/deploying/waxed_exposed_copper_shingle_stairs_from_adding_wax.json -9d566e599cc05aefde637faab1957813a5b6f3f7 data/create/recipes/deploying/waxed_exposed_copper_tiles_from_adding_wax.json +eff2e77f004873e695e419afc71a7011328d3de8 data/create/recipes/deploying/waxed_exposed_copper_shingles_from_adding_wax.json 582083e0fed8760cde2c53aa2b02237eb59a3df0 data/create/recipes/deploying/waxed_exposed_copper_tile_slab_from_adding_wax.json fec9d744770bfc517a72a2be45701aab6f3040b2 data/create/recipes/deploying/waxed_exposed_copper_tile_stairs_from_adding_wax.json +9d566e599cc05aefde637faab1957813a5b6f3f7 data/create/recipes/deploying/waxed_exposed_copper_tiles_from_adding_wax.json 0f18c91f36e3abae99a7dca72f3d80e59f03cf7d data/create/recipes/deploying/waxed_exposed_cut_copper_from_adding_wax.json 7ed36f4f3abfd37aec13a273b87d97c8ccc36cb4 data/create/recipes/deploying/waxed_exposed_cut_copper_slab_from_adding_wax.json 9cd5a6c71b5102ef2660e8a5c650cbd2c2327580 data/create/recipes/deploying/waxed_exposed_cut_copper_stairs_from_adding_wax.json 97b7b3f65807328d0a036cb66ee53d898504da77 data/create/recipes/deploying/waxed_oxidized_copper_from_adding_wax.json -bd37d658666b2912c07b6daa6adaff99a479223a data/create/recipes/deploying/waxed_oxidized_copper_shingles_from_adding_wax.json 07c82e555617f9d9166f2d2c9068ac421eb0b37a data/create/recipes/deploying/waxed_oxidized_copper_shingle_slab_from_adding_wax.json d0c7805681e3ed6a6bc5775d42c702af924e8785 data/create/recipes/deploying/waxed_oxidized_copper_shingle_stairs_from_adding_wax.json -41c879946a24ff330466476bdee9148859398842 data/create/recipes/deploying/waxed_oxidized_copper_tiles_from_adding_wax.json +bd37d658666b2912c07b6daa6adaff99a479223a data/create/recipes/deploying/waxed_oxidized_copper_shingles_from_adding_wax.json af72234311a9abf5c57c767c05274c466dceac53 data/create/recipes/deploying/waxed_oxidized_copper_tile_slab_from_adding_wax.json b35d22f891d1c9cab4340399e3426c96132b3fc7 data/create/recipes/deploying/waxed_oxidized_copper_tile_stairs_from_adding_wax.json +41c879946a24ff330466476bdee9148859398842 data/create/recipes/deploying/waxed_oxidized_copper_tiles_from_adding_wax.json 9d78f4d16273015d181be586f91e77f3b82ee18f data/create/recipes/deploying/waxed_oxidized_cut_copper_from_adding_wax.json 2a9c57a8ca9b013b7bc11d2588d4ba00b402f97f data/create/recipes/deploying/waxed_oxidized_cut_copper_slab_from_adding_wax.json 5670c074c0f1961a5e499953a49c7e3f1f617ebf data/create/recipes/deploying/waxed_oxidized_cut_copper_stairs_from_adding_wax.json 58679c5c37eaa5a52ef9e0f4f7cc695c58ddee96 data/create/recipes/deploying/waxed_weathered_copper_from_adding_wax.json -5817055c1cf3ae572ffbe2765f3e519fda4c3342 data/create/recipes/deploying/waxed_weathered_copper_shingles_from_adding_wax.json e962429c48ed12bb2d7b299719513c23a2088879 data/create/recipes/deploying/waxed_weathered_copper_shingle_slab_from_adding_wax.json 2321ea4ed39d09b12a80be8df2c7c1dc4c6d2c18 data/create/recipes/deploying/waxed_weathered_copper_shingle_stairs_from_adding_wax.json -b635490492a22f88e24003bffb09c4d5e3fa2d61 data/create/recipes/deploying/waxed_weathered_copper_tiles_from_adding_wax.json +5817055c1cf3ae572ffbe2765f3e519fda4c3342 data/create/recipes/deploying/waxed_weathered_copper_shingles_from_adding_wax.json d0fc937a3e7ae42fb1891b7b87adb2b57292e01d data/create/recipes/deploying/waxed_weathered_copper_tile_slab_from_adding_wax.json 6852ea4c7f27520fb3388ec641be4cb94d907199 data/create/recipes/deploying/waxed_weathered_copper_tile_stairs_from_adding_wax.json +b635490492a22f88e24003bffb09c4d5e3fa2d61 data/create/recipes/deploying/waxed_weathered_copper_tiles_from_adding_wax.json 9ab3ba5847c3abbc17c476436978141f2c039ce9 data/create/recipes/deploying/waxed_weathered_cut_copper_from_adding_wax.json 733dd94b46186c19fdecced5d8231e46ea612cf2 data/create/recipes/deploying/waxed_weathered_cut_copper_slab_from_adding_wax.json cd4c050e6ad9227bf293768f2d8b965c0ecafeab data/create/recipes/deploying/waxed_weathered_cut_copper_stairs_from_adding_wax.json @@ -724,8 +724,8 @@ ff16c74f09edbc67ed969f64270ca376bb8ea955 data/create/recipes/filling/compat/regi 12c19b46eec5bd371300dfcff5d2a9dd7169bb1b data/create/recipes/filling/glowstone.json afeb566e5f989c58d239a2f66084ce3d813d111a data/create/recipes/filling/grass_block.json 36d0f06ea9fa065ed85fc596e08725a2e6c8d4af data/create/recipes/filling/gunpowder.json -c07c662c2ba8d7e5c72437096acfd7fdb99704f3 data/create/recipes/filling/honeyed_apple.json c4e0373516bc98def80d0a13803cf980e3f905e0 data/create/recipes/filling/honey_bottle.json +c07c662c2ba8d7e5c72437096acfd7fdb99704f3 data/create/recipes/filling/honeyed_apple.json 3acf4a649751c23c8e39d649131939659c105a53 data/create/recipes/filling/redstone.json deab6ea169b756376d89ea2200e0387a865ed2fc data/create/recipes/filling/sweet_roll.json 788cce637f455ea33408e5be5b75ce0e4cc57c95 data/create/recipes/haunting/blackstone.json @@ -792,22 +792,22 @@ e383106ff8f877b5995e20c03af5e41e3db541d9 data/create/recipes/milling/compat/biom 213e079f32baa2879702b72bdf08f146877a0bb9 data/create/recipes/milling/compat/biomesoplenty/violet.json b3f041e005491582f055da15871891357908d998 data/create/recipes/milling/compat/biomesoplenty/wildflower.json d08c4fcebb79e2e02ac9cb4623124332a05ed661 data/create/recipes/milling/compat/biomesoplenty/wilted_lily.json -ca03746c39143de7867aeab2fb450fe0a67b69e3 data/create/recipes/milling/compat/botania/black_petal.json -3192777eeb363a55174a0eb58197ee686b2e02c7 data/create/recipes/milling/compat/botania/blue_petal.json -ee99c9bdcc4da8d160fc762ce7b394848d6a86d1 data/create/recipes/milling/compat/botania/brown_petal.json -1d8dab24913945268f819c24e132d8bb74f792c2 data/create/recipes/milling/compat/botania/cyan_petal.json -010a111f9810f142315bc94dfb1be03ee02508c4 data/create/recipes/milling/compat/botania/gray_petal.json -dee8b4c26d6b78aceeb8e5a264693dad4e81dbcb data/create/recipes/milling/compat/botania/green_petal.json -285a24e440d6a8cf34f2925a3eed7fa1d16e102b data/create/recipes/milling/compat/botania/light_blue_petal.json -3cc232966240394aaf5a3a5d16a3ceebd41597a0 data/create/recipes/milling/compat/botania/light_gray_petal.json -1225119a7dc1f69dfaf2cec32a0267b1d47ef72d data/create/recipes/milling/compat/botania/lime_petal.json -09e114685483329a78c3cecf8b312f16d26cd981 data/create/recipes/milling/compat/botania/magenta_petal.json -ae3e7eb55dda1846b8fd849ea1c8f1cbd37b9fca data/create/recipes/milling/compat/botania/orange_petal.json -bf13e9807a96efc1ef684f0129cc21110e44cc4c data/create/recipes/milling/compat/botania/pink_petal.json -7e0a167201b9c915579ede71ee7128bccdeee9c2 data/create/recipes/milling/compat/botania/purple_petal.json -4e7c1ae95f10bb3466dd542a2e04c726c599ecd9 data/create/recipes/milling/compat/botania/red_petal.json -28cbeb278022b2ac62cae2f3deaa65cb375c6456 data/create/recipes/milling/compat/botania/white_petal.json -dd1e35234c419b1576410a2590fd33d88c8bb9bd data/create/recipes/milling/compat/botania/yellow_petal.json +4994095300eabfe98a86036e7fbba6c12cddb078 data/create/recipes/milling/compat/botania/black_petal.json +3516555e62ce7d6f0b5a57375339e69b4de41f83 data/create/recipes/milling/compat/botania/blue_petal.json +deb37dcb4b323590fbb76f21732e5b9016028f7d data/create/recipes/milling/compat/botania/brown_petal.json +d831337c28b89ce25a2be50e06719ab3be9400b6 data/create/recipes/milling/compat/botania/cyan_petal.json +1ec99d5ee65becc6c921827956e26f286398b1ba data/create/recipes/milling/compat/botania/gray_petal.json +7bcbd91fae49452fe30966b350c6830ad5bb588c data/create/recipes/milling/compat/botania/green_petal.json +5819b1ff0c54851d4bf7c60228ce2e31b8d8ffee data/create/recipes/milling/compat/botania/light_blue_petal.json +94b6cb826923907527c57e079d08fb410720b008 data/create/recipes/milling/compat/botania/light_gray_petal.json +4fe3b309902b0d59971d351d6e4a8066908df195 data/create/recipes/milling/compat/botania/lime_petal.json +b8f8ea5d52ae9cbdd59d60aabbac660859190855 data/create/recipes/milling/compat/botania/magenta_petal.json +eab4d51ba92d5a2f172de76bca72cf2746359b68 data/create/recipes/milling/compat/botania/orange_petal.json +c8cf3978e3bf0ffeccd18c1b16ea26c5e1c18634 data/create/recipes/milling/compat/botania/pink_petal.json +9ee958eb5fb176902255aa606517a362670f3d60 data/create/recipes/milling/compat/botania/purple_petal.json +3239b0a1ef91f61ab32f42ac3935ee99316089c5 data/create/recipes/milling/compat/botania/red_petal.json +15afbebf247ea66e0b023ea84aa5c5dad8ac8466 data/create/recipes/milling/compat/botania/white_petal.json +9c500a9d6cadb4f673ca63de38c1d3713dab061c data/create/recipes/milling/compat/botania/yellow_petal.json c7d2b07396448628123b81e1f34a8b131aa99c83 data/create/recipes/milling/compat/buzzier_bees/buttercup.json 0c4a3c7da1e151868740db2037504e35a02af3d0 data/create/recipes/milling/compat/buzzier_bees/pink_clover.json 355e89a3e003ae65ff06a9277c05699220eec569 data/create/recipes/milling/compat/buzzier_bees/white_clover.json @@ -870,8 +870,8 @@ eb9606bbb2e4c6fb82b6607c8d5c23834d9e44a8 data/create/recipes/milling/compat/byg/ fda00f49b9a5758ee7d24f2aeab81a3cc690544a data/create/recipes/milling/compat/byg/yellow_tulip.json 2e6a7a1b0e8ab1d6e514a30a21d47b404cfdcd45 data/create/recipes/milling/compat/druidcraft/lavender.json 5be32cdd48cf7d9e3f8273fc3479d559070b9872 data/create/recipes/milling/compat/environmental/bird_of_paradise.json -102130e75ea8f2b8c99ad9641d293a4e588912cf data/create/recipes/milling/compat/environmental/bluebell.json 50df88584dd6086c0dbb23fb16b7f36fee381534 data/create/recipes/milling/compat/environmental/blue_delphinium.json +102130e75ea8f2b8c99ad9641d293a4e588912cf data/create/recipes/milling/compat/environmental/bluebell.json a4beb691042be811eee8a130ff023065620b20b9 data/create/recipes/milling/compat/environmental/cartwheel.json d1d388667f9c8a5666cc2a1ef2eb77716a0b18ed data/create/recipes/milling/compat/environmental/dianthus.json ee3d1989d4a1069909aaeb99374602d0e92d6dfc data/create/recipes/milling/compat/environmental/magenta_hibiscus.json @@ -1066,11 +1066,11 @@ cccf4ef0891992687dcb7ce5c644499d93210b8a data/create/recipes/splashing/sand.json 0ee6d52e8966b6189f2841bcdf41417df1ab072c data/create/recipes/splashing/stained_glass.json f241ec6a8ad063b28281c18e1fbb03c482d7af8b data/create/recipes/splashing/stained_glass_pane.json 712b367223067cc468346d2fa485779f1501d5ec data/create/recipes/splashing/supplementaries/blackboard.json +a8fd822419fbb47b37412742fe13a785ae147d21 data/create/recipes/splashing/the_vault/ornate_chain_rusty.json 43bcc2f22cca830f11a48f4b48f699001f4ffbb5 data/create/recipes/splashing/thermal/crushed_raw_lead.json 4bc875e07f963f417e0a427ca7a6f9f9a40213ac data/create/recipes/splashing/thermal/crushed_raw_nickel.json 0ceeb253b478dde532e4de01d1ff60ed09819388 data/create/recipes/splashing/thermal/crushed_raw_silver.json 5fa818c04cb65048be0246ade3946cc1e01a0772 data/create/recipes/splashing/thermal/crushed_raw_tin.json -a8fd822419fbb47b37412742fe13a785ae147d21 data/create/recipes/splashing/the_vault/ornate_chain_rusty.json 23d70b869e50a1e11df264f3640becac4ec9100d data/create/recipes/splashing/wheat_flour.json a883796342143a5f2b5bc68d230b725964abdb8f data/create/recipes/splashing/white_concrete_powder.json d09bcaa2334e05e6cce37b7342c7de84ce954bb9 data/create/recipes/splashing/wool.json diff --git a/src/generated/resources/data/create/recipes/crafting/tree_fertilizer.json b/src/generated/resources/data/create/recipes/crafting/tree_fertilizer.json index f705b2e53..56bfafb78 100644 --- a/src/generated/resources/data/create/recipes/crafting/tree_fertilizer.json +++ b/src/generated/resources/data/create/recipes/crafting/tree_fertilizer.json @@ -1,6 +1,12 @@ { "type": "minecraft:crafting_shapeless", "category": "misc", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "upgrade_aquatic" + } + ], "ingredients": [ { "tag": "minecraft:small_flowers" diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/black_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/black_petal.json index 66f3fe09d..9e20ea920 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/black_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/black_petal.json @@ -1,5 +1,11 @@ { "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "botania" + } + ], "ingredients": [ { "tag": "botania:petals/black" diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/blue_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/blue_petal.json index d47e82023..54aa19cb0 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/blue_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/blue_petal.json @@ -1,5 +1,11 @@ { "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "botania" + } + ], "ingredients": [ { "tag": "botania:petals/blue" diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/brown_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/brown_petal.json index d1f3eb495..6fa6c006d 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/brown_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/brown_petal.json @@ -1,5 +1,11 @@ { "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "botania" + } + ], "ingredients": [ { "tag": "botania:petals/brown" diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/cyan_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/cyan_petal.json index 05fe7d87b..8657058c8 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/cyan_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/cyan_petal.json @@ -1,5 +1,11 @@ { "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "botania" + } + ], "ingredients": [ { "tag": "botania:petals/cyan" diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/gray_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/gray_petal.json index 9bb0bcd24..33d6c6bd6 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/gray_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/gray_petal.json @@ -1,5 +1,11 @@ { "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "botania" + } + ], "ingredients": [ { "tag": "botania:petals/gray" diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/green_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/green_petal.json index ed4641482..11f11ac3c 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/green_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/green_petal.json @@ -1,5 +1,11 @@ { "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "botania" + } + ], "ingredients": [ { "tag": "botania:petals/green" diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/light_blue_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/light_blue_petal.json index 595e18953..4368eecaf 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/light_blue_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/light_blue_petal.json @@ -1,5 +1,11 @@ { "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "botania" + } + ], "ingredients": [ { "tag": "botania:petals/light_blue" diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/light_gray_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/light_gray_petal.json index 5b9a6bd52..0b6a6d876 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/light_gray_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/light_gray_petal.json @@ -1,5 +1,11 @@ { "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "botania" + } + ], "ingredients": [ { "tag": "botania:petals/light_gray" diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/lime_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/lime_petal.json index 51bac8733..1ae7e3b14 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/lime_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/lime_petal.json @@ -1,5 +1,11 @@ { "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "botania" + } + ], "ingredients": [ { "tag": "botania:petals/lime" diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/magenta_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/magenta_petal.json index 8001d8fd7..e85b7d3f6 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/magenta_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/magenta_petal.json @@ -1,5 +1,11 @@ { "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "botania" + } + ], "ingredients": [ { "tag": "botania:petals/magenta" diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/orange_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/orange_petal.json index b0d9957e1..dd5bd028d 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/orange_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/orange_petal.json @@ -1,5 +1,11 @@ { "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "botania" + } + ], "ingredients": [ { "tag": "botania:petals/orange" diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/pink_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/pink_petal.json index c875d311e..6dd6bae9f 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/pink_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/pink_petal.json @@ -1,5 +1,11 @@ { "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "botania" + } + ], "ingredients": [ { "tag": "botania:petals/pink" diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/purple_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/purple_petal.json index 13ad6984c..815ccae3a 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/purple_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/purple_petal.json @@ -1,5 +1,11 @@ { "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "botania" + } + ], "ingredients": [ { "tag": "botania:petals/purple" diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/red_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/red_petal.json index 0fee03469..fea0a0b68 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/red_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/red_petal.json @@ -1,5 +1,11 @@ { "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "botania" + } + ], "ingredients": [ { "tag": "botania:petals/red" diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/white_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/white_petal.json index 0b8c714a9..de40fc9dc 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/white_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/white_petal.json @@ -1,5 +1,11 @@ { "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "botania" + } + ], "ingredients": [ { "tag": "botania:petals/white" diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/yellow_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/yellow_petal.json index ea71b8e71..704b039ae 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/yellow_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/yellow_petal.json @@ -1,5 +1,11 @@ { "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "botania" + } + ], "ingredients": [ { "tag": "botania:petals/yellow" diff --git a/src/main/java/com/simibubi/create/content/kinetics/crafter/MechanicalCrafterBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/crafter/MechanicalCrafterBlockEntity.java index 4dc940a64..d646d30cc 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/crafter/MechanicalCrafterBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/crafter/MechanicalCrafterBlockEntity.java @@ -120,6 +120,12 @@ public class MechanicalCrafterBlockEntity extends KineticBlockEntity { registerAwardables(behaviours, AllAdvancements.CRAFTER, AllAdvancements.CRAFTER_LAZY); } + @Override + public void invalidateCaps() { + inserting.removeListener(); + super.invalidateCaps(); + } + @Override public void onSpeedChanged(float previousSpeed) { super.onSpeedChanged(previousSpeed); @@ -132,6 +138,7 @@ public class MechanicalCrafterBlockEntity extends KineticBlockEntity { public void blockChanged() { removeBehaviour(InvManipulationBehaviour.TYPE); + inserting.removeListener(); inserting = new InvManipulationBehaviour(this, this::getTargetFace); attachBehaviourLate(inserting); } diff --git a/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlockEntity.java index 00474106b..8ff868acd 100644 --- a/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlockEntity.java @@ -273,6 +273,12 @@ public class FunnelBlockEntity extends SmartBlockEntity implements IHaveHovering registerAwardables(behaviours, AllAdvancements.FUNNEL); } + @Override + public void invalidateCaps() { + invManipulation.removeListener(); + super.invalidateCaps(); + } + private boolean supportsAmountOnFilter() { BlockState blockState = getBlockState(); boolean beltFunnelsupportsAmount = false; diff --git a/src/main/java/com/simibubi/create/content/redstone/smartObserver/SmartObserverBlockEntity.java b/src/main/java/com/simibubi/create/content/redstone/smartObserver/SmartObserverBlockEntity.java index e1c202639..34663ce88 100644 --- a/src/main/java/com/simibubi/create/content/redstone/smartObserver/SmartObserverBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/redstone/smartObserver/SmartObserverBlockEntity.java @@ -32,10 +32,10 @@ public class SmartObserverBlockEntity extends SmartBlockEntity { private FilteringBehaviour filtering; private InvManipulationBehaviour observedInventory; private TankManipulationBehaviour observedTank; - + private VersionedInventoryTrackerBehaviour invVersionTracker; private boolean sustainSignal; - + public int turnOffTicks = 0; public SmartObserverBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { @@ -56,13 +56,20 @@ public class SmartObserverBlockEntity extends SmartBlockEntity { behaviours.add(observedTank = new TankManipulationBehaviour(this, towardBlockFacing).bypassSidedness()); } + @Override + public void invalidateCaps() { + observedInventory.removeListener(); + observedTank.removeListener(); + super.invalidateCaps(); + } + @Override public void tick() { super.tick(); - + if (level.isClientSide()) return; - + BlockState state = getBlockState(); if (turnOffTicks > 0) { turnOffTicks--; diff --git a/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchBlockEntity.java b/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchBlockEntity.java index 0163ed260..dcb42fb44 100644 --- a/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchBlockEntity.java @@ -233,6 +233,13 @@ public class ThresholdSwitchBlockEntity extends SmartBlockEntity { behaviours.add(observedTank = new TankManipulationBehaviour(this, towardBlockFacing).bypassSidedness()); } + @Override + public void invalidateCaps() { + observedInventory.removeListener(); + observedTank.removeListener(); + super.invalidateCaps(); + } + public float getLevelForDisplay() { return currentLevel == -1 ? 0 : currentLevel; } diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/inventory/CapManipulationBehaviourBase.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/inventory/CapManipulationBehaviourBase.java index 9b25a050a..e13de96b8 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/inventory/CapManipulationBehaviourBase.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/inventory/CapManipulationBehaviourBase.java @@ -80,6 +80,10 @@ public abstract class CapManipulationBehaviourBase(this::onHandlerInvalidated, this)); + } + @Override public void lazyTick() { super.lazyTick(); diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/MillingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/MillingRecipeGen.java index f6a50ac70..6b28a22d5 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/MillingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/MillingRecipeGen.java @@ -817,7 +817,8 @@ public class MillingRecipeGen extends ProcessingRecipeGen { create(Mods.BTN.recipeId(color + "_petal"), b -> b.duration(50) .require(AllTags.optionalTag(ForgeRegistries.ITEMS, new ResourceLocation(Mods.BTN.getId(), "petals/" + color))) - .output(Mods.MC, color + "_dye")); + .output(Mods.MC, color + "_dye") + .whenModLoaded(Mods.BTN.getId())); } return null; } @@ -850,7 +851,7 @@ public class MillingRecipeGen extends ProcessingRecipeGen { public MillingRecipeGen(PackOutput output) { super(output); } - + @Override protected AllRecipeTypes getRecipeType() { return AllRecipeTypes.MILLING; diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java index 405fe0549..b7be3c7de 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java @@ -59,6 +59,8 @@ import net.minecraftforge.common.crafting.conditions.ICondition; import net.minecraftforge.common.crafting.conditions.ModLoadedCondition; import net.minecraftforge.common.crafting.conditions.NotCondition; +import org.jetbrains.annotations.NotNull; + @SuppressWarnings("unused") public class StandardRecipeGen extends CreateRecipeProvider { @@ -1178,7 +1180,8 @@ public class StandardRecipeGen extends CreateRecipeProvider { .inBlastFurnace(), UA_TREE_FERTILIZER = create(AllItems.TREE_FERTILIZER::get).returns(2) - .whenModLoaded(Mods.UA.getId()).unlockedBy(() -> Items.BONE_MEAL) + .unlockedBy(() -> Items.BONE_MEAL) + .whenModLoaded(Mods.UA.getId()) .viaShapeless(b -> b.requires(Ingredient.of(ItemTags.SMALL_FLOWERS), 2) .requires(AllItemTags.UA_CORAL.tag).requires(Items.BONE_MEAL)) @@ -1375,7 +1378,12 @@ public class StandardRecipeGen extends CreateRecipeProvider { ShapelessRecipeBuilder b = builder.apply(ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, result.get(), amount)); if (unlockedBy != null) b.unlockedBy("has_item", inventoryTrigger(unlockedBy.get())); - b.save(consumer, createLocation("crafting")); + + b.save(result -> { + consumer.accept( + !recipeConditions.isEmpty() ? new ConditionSupportingShapelessRecipeResult(result, recipeConditions) + : result); + }, createLocation("crafting")); }); } @@ -1478,10 +1486,10 @@ public class StandardRecipeGen extends CreateRecipeProvider { SimpleCookingRecipeBuilder b = builder.apply(SimpleCookingRecipeBuilder.generic(ingredient.get(), RecipeCategory.MISC, isOtherMod ? Items.DIRT : result.get(), exp, (int) (cookingTime * cookingTimeModifier), serializer)); - + if (unlockedBy != null) b.unlockedBy("has_item", inventoryTrigger(unlockedBy.get())); - + b.save(result -> { consumer.accept( isOtherMod ? new ModdedCookingRecipeResult(result, compatDatagenOutput, recipeConditions) @@ -1502,19 +1510,39 @@ public class StandardRecipeGen extends CreateRecipeProvider { super(p_i48262_1_); } - private static class ModdedCookingRecipeResult implements FinishedRecipe { + private record ModdedCookingRecipeResult(FinishedRecipe wrapped, ResourceLocation outputOverride, List conditions) implements FinishedRecipe { + @Override + public ResourceLocation getId() { + return wrapped.getId(); + } - private FinishedRecipe wrapped; - private ResourceLocation outputOverride; - private List conditions; + @Override + public RecipeSerializer getType() { + return wrapped.getType(); + } - public ModdedCookingRecipeResult(FinishedRecipe wrapped, ResourceLocation outputOverride, - List conditions) { - this.wrapped = wrapped; - this.outputOverride = outputOverride; - this.conditions = conditions; + @Override + public JsonObject serializeAdvancement() { + return wrapped.serializeAdvancement(); + } + + @Override + public ResourceLocation getAdvancementId() { + return wrapped.getAdvancementId(); + } + + @Override + public void serializeRecipeData(JsonObject object) { + wrapped.serializeRecipeData(object); + object.addProperty("result", outputOverride.toString()); + + JsonArray conds = new JsonArray(); + conditions.forEach(c -> conds.add(CraftingHelper.serialize(c))); + object.add("conditions", conds); + } } + private record ConditionSupportingShapelessRecipeResult(FinishedRecipe wrapped, List conditions) implements FinishedRecipe { @Override public ResourceLocation getId() { return wrapped.getId(); @@ -1536,15 +1564,12 @@ public class StandardRecipeGen extends CreateRecipeProvider { } @Override - public void serializeRecipeData(JsonObject object) { - wrapped.serializeRecipeData(object); - object.addProperty("result", outputOverride.toString()); + public void serializeRecipeData(@NotNull JsonObject pJson) { + wrapped.serializeRecipeData(pJson); JsonArray conds = new JsonArray(); conditions.forEach(c -> conds.add(CraftingHelper.serialize(c))); - object.add("conditions", conds); + pJson.add("conditions", conds); } - } - }