diff --git a/src/generated/resources/.cache/5971ca79ecd127e7d1e65be1cd906ac939e6a245 b/src/generated/resources/.cache/5971ca79ecd127e7d1e65be1cd906ac939e6a245 index 24fac3e0d1..5d9a59449c 100644 --- a/src/generated/resources/.cache/5971ca79ecd127e7d1e65be1cd906ac939e6a245 +++ b/src/generated/resources/.cache/5971ca79ecd127e7d1e65be1cd906ac939e6a245 @@ -1,4 +1,4 @@ -// 1.20.1 2025-09-10T22:15:14.76278042 Registrate Provider for create [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), generic_server_provider, Blockstates, Item models, Lang (en_us/en_ud), generic_client_provider] +// 1.20.1 2025-06-10T19:27:13.538878 Registrate Provider for create [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] 60bbdf92d2ac9824ea6144955c74043a6005f79d assets/create/blockstates/acacia_window.json 6a67703c2697d81b7dc83e9d72a66f9c9ff08383 assets/create/blockstates/acacia_window_pane.json c3ae87b62e81d8e9476eccd793bb1548d74c66a1 assets/create/blockstates/adjustable_chain_gearshift.json @@ -642,8 +642,8 @@ b0d8f08968763a5f74e5cd5644377a76a9f39753 assets/create/blockstates/yellow_toolbo fe8c497aacc641c2f01cec90bba9f19e59cc2ed2 assets/create/blockstates/yellow_valve_handle.json e819e93fdcbe9fd9c050a052d2718ff3b3539365 assets/create/blockstates/zinc_block.json 64121dcb216381c83b4fe28aa361ea07c24c9ad0 assets/create/blockstates/zinc_ore.json -30dd92866fb1516cc171825f1562109b3768eb96 assets/create/lang/en_ud.json -77ece18f03c73bd494989335bcf319202b02fa10 assets/create/lang/en_us.json +53a6843019a9a8f78863687d81dea37cb8ecd24a assets/create/lang/en_ud.json +4793ab3e91a6ad78ee9415ae817751f7d388583b assets/create/lang/en_us.json a97e1060e00ae701a02e39cd4ef8054cf345fac4 assets/create/models/block/acacia_window.json 103e032c0b1a0a6a27c67da8c91179a564bd281c assets/create/models/block/acacia_window_pane_noside.json fb00b627abda76ad4fea867ca57dbfadd24fffa3 assets/create/models/block/acacia_window_pane_noside_alt.json @@ -4687,18 +4687,22 @@ c603fae95069714ac3d256dfa31f8d2639efafa7 data/create/tags/blocks/chest_mounted_s c7ec0dbc18e9c1b58e568ed925287b89df11a136 data/create/tags/blocks/copycat_allow.json 876eb9210f4a14898a2fe6d225699c66b5bdfeef data/create/tags/blocks/copycat_deny.json 7296238b4c6b81251870addce1de8ecda63381dc data/create/tags/blocks/corals.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/create/tags/blocks/fallback_mounted_storage_blacklist.json f675c20350ed60da4878b5d6301f02c8c05624bd data/create/tags/blocks/fan_processing_catalysts/blasting.json 0592b99f657415f6546564ed8efa1fcbef07ba15 data/create/tags/blocks/fan_processing_catalysts/haunting.json 9386dd9a1d234813f9b8ae4ec88866d396aa1d37 data/create/tags/blocks/fan_processing_catalysts/smoking.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/create/tags/blocks/fan_processing_catalysts/splashing.json 6858173c670bb593664ac3c62ded726d57d581f1 data/create/tags/blocks/fan_transparent.json 2589b135c0e96ad29076569e144528fe32ea5b39 data/create/tags/blocks/girdable_tracks.json 02c0a018f2b8540dc2f1fb420172cc716552f321 data/create/tags/blocks/movable_empty_collider.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/create/tags/blocks/non_breakable.json 7f7eb361dcdaa2f081bfed7582c93d6b1b29f8db data/create/tags/blocks/non_harvestable.json 4970078b49ddac1b1d500ed0469cedf42bdc3d35 data/create/tags/blocks/non_movable.json +06e13efbb7b0d09ff7ecd1a7dc45a0760b91ad67 data/create/tags/blocks/ore_override_stone.json a5874f73c7dc0a3ae12999e6ae8abf45bc7fb9be data/create/tags/blocks/passive_boiler_heaters.json f400870b8dbcd14238be3ec99c419093073ba3a6 data/create/tags/blocks/postboxes.json 9bc8c13fd80bdbe7f767b91ee1a1042e9aff02b0 data/create/tags/blocks/roots.json -575c7b20bcd6d698c5961aa3db0ac7d206b3dbd2 data/create/tags/blocks/safe_nbt.json +55dccb895bbdacfbd6ee9005486cd3fe9df01249 data/create/tags/blocks/safe_nbt.json 79418bd729cef417b322cef9b491e7ae83317d61 data/create/tags/blocks/seats.json 7d783d948cc49503fb645045fe9ef48906b74341 data/create/tags/blocks/simple_mounted_storage.json da544bd0281138617f5cd6b2a04920ccf7034d4b data/create/tags/blocks/single_block_inventories.json @@ -4711,9 +4715,14 @@ da739ad2160e7df4e0e5cc89587670ce5e9450c3 data/create/tags/blocks/valve_handles.j 72143286fb5cb372a0696550e2eac76ca50e6fbc data/create/tags/blocks/windmill_sails.json a109dab3eeeae64b2eb909ae1b5027716c5dd271 data/create/tags/blocks/wrench_pickup.json 76c0522664726c09461ad4565b6fba80b4f816b2 data/create/tags/entity_types/blaze_burner_capturable.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/create/tags/entity_types/ignore_seat.json 894e1e4fd1e32712abdda18ec64ab13750d3c039 data/create/tags/fluids/bottomless/allow.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/create/tags/fluids/bottomless/deny.json e191d5f912e05091b3a0b1df17f4c4181e04d96f data/create/tags/fluids/fan_processing_catalysts/blasting.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/create/tags/fluids/fan_processing_catalysts/haunting.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/create/tags/fluids/fan_processing_catalysts/smoking.json c9ae54a7510073b17edf82f7591e14bdb2c51837 data/create/tags/fluids/fan_processing_catalysts/splashing.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/create/tags/items/blaze_burner_fuel/regular.json 8ba98bf390a326abeebfd5d84be5f740c935a8b6 data/create/tags/items/blaze_burner_fuel/special.json 8b6c0b444b15f7fb2d55b9cbcb68537c1269f877 data/create/tags/items/casing.json 3e65a1f943cae7927da2f45388efe248474e5397 data/create/tags/items/chain_rideable.json @@ -4721,6 +4730,7 @@ f43cac8216e2a9347e48cf93a43de95dd810ca20 data/create/tags/items/contraption_cont d371dfd35e49a7bef19f59c03e7f4ae20992f03d data/create/tags/items/create_ingots.json 910d0f5ccbc4c84b224eca1f1588b1695f41447b data/create/tags/items/crushed_raw_materials.json 0fa526e7e742573b603ad26b09526cf724efa1dc data/create/tags/items/deployable_drink.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/create/tags/items/dispense_behavior_wrap_blacklist.json ebd7b09daf2f64c0c04d821696b0e145683d8693 data/create/tags/items/dyed_table_cloths.json d2bb65d893d71d2d9871f81f430c233a93adb4bb data/create/tags/items/invalid_for_track_paving.json 218d52ae145859084033df805024a86fd32e9d4d data/create/tags/items/modded_stripped_logs.json @@ -4776,8 +4786,10 @@ bcd593714f43bc6a0aefbd714c24db3cf9e71250 data/forge/tags/blocks/storage_blocks/r 0ccc9ff76001cdd7db1b79c1371f59d3283abe64 data/forge/tags/fluids/honey.json cca816b34ac2e9b7933df680aa9778ff2cfe9605 data/forge/tags/fluids/tea.json 1a9ce7d5f5fe92d3b73e269cd5dbf5cd1f1fe5b8 data/forge/tags/items/armors/boots.json -056046998d063e7405c267f1ec2923260ef8c109 data/forge/tags/items/armors/chestplates.json -9eb6474e9336c2c378100b7e2577a6ba9c62e403 data/forge/tags/items/armors/helmets.json +6749b53c23aefe4baa55c4b2f624bbc6dfe5f423 data/forge/tags/items/armors/chestplate.json +695d75b352fd190b303c724d1aaee9bb786a903b data/forge/tags/items/armors/chestplates.json +5b91b107f48b47958db20f13cb3cc0c6f7085fdc data/forge/tags/items/armors/helmet.json +3580dae058fc75b45fab4c4ebbd1b01573ba9e11 data/forge/tags/items/armors/helmets.json afdac448376ff5624f49cbf31feedf691ecbc4c5 data/forge/tags/items/armors/leggings.json 06ebf72e8f6c081862236d4b068b5dfb275a8385 data/forge/tags/items/buckets/honey.json 801d097b0af7153e0c5c72a924d61f8afb4cf264 data/forge/tags/items/dough.json diff --git a/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 b/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 index ee7abc9d3b..d9043504d2 100644 --- a/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 +++ b/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 @@ -1,4 +1,4 @@ -// 1.20.1 2025-08-06T02:20:16.7273492 Create's Processing Recipes +// 1.20.1 2025-06-10T19:33:57.719451 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 @@ -100,18 +100,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 @@ -160,6 +160,12 @@ cdb26cd91feeda5901f31f57c16517dda5287810 data/create/recipes/cutting/andesite_al 4ac4bb94de7b25a3eec85e8290ab5f2f6b2b4167 data/create/recipes/cutting/bamboo_planks.json 1c2e2e992a9cee466c4303d6ea57167276563a95 data/create/recipes/cutting/compat/ars_elemental/stripped_yellow_archwood.json 7c9563a2b9c1512f6356faa13d4aceb42831e1ba data/create/recipes/cutting/compat/ars_elemental/stripped_yellow_archwood_log.json +1ff887f11099b4536bf6fad3e407a37e83d3bfca data/create/recipes/cutting/compat/ars_nouveau/green_archwood_log.json +ec130b4ca348a1245e18785df0714bf41b11aecd data/create/recipes/cutting/compat/ars_nouveau/green_archwood_wood.json +da71348a35a0c921b447a817e6e2d48b6df47307 data/create/recipes/cutting/compat/ars_nouveau/purple_archwood_log.json +af1ca00e05d554bba1d85c766e52560d5ea8fe4d data/create/recipes/cutting/compat/ars_nouveau/purple_archwood_wood.json +1f8e313658c55cef063d6301c4cc4305df9342e8 data/create/recipes/cutting/compat/ars_nouveau/red_archwood_log.json +144d0b6fdce5a7d394161f61c1bab37630be4d64 data/create/recipes/cutting/compat/ars_nouveau/red_archwood_wood.json 6f51d9c5490e7249b19ea98b8b995e6efcc5f83f data/create/recipes/cutting/compat/ars_nouveau/stripped_green_archwood_log.json 31d05d982d59f11bd1aba2e3a1a54557e3370163 data/create/recipes/cutting/compat/ars_nouveau/stripped_green_archwood_wood.json 080e8f9c81b692bf396a41e7fe2800ebf83cb640 data/create/recipes/cutting/compat/ars_nouveau/stripped_purple_archwood_log.json @@ -175,8 +181,6 @@ c2f1bca179d6218aa75526df386106b72eb0dd67 data/create/recipes/cutting/compat/imme e9086dc98d03798ded6f3170a5c51528d1f5eba7 data/create/recipes/cutting/compat/immersiveengineering/wire_electrum.json ca543d1e95ac73dbf3eaac91e80830fb3a071276 data/create/recipes/cutting/compat/immersiveengineering/wire_lead.json bcab848fda66d20cf871f97db3c7c41f7c4b55c9 data/create/recipes/cutting/compat/immersiveengineering/wire_steel.json -ce9597b133e5e719b6638cd70759be5f879c6a3c data/create/recipes/cutting/compat/netherexp/cerebrage_claret_hyphae.json -6558e29015ed0ae7d23b68e761029b7e9b3707a5 data/create/recipes/cutting/compat/netherexp/cerebrage_claret_stem.json 27585fe96d7e211e4469c437c82c89c1268cf0bf data/create/recipes/cutting/compat/regions_unexplored/ashen_log.json bf04910ca9246aec3146eff28bc7d5d778c5d6d4 data/create/recipes/cutting/compat/regions_unexplored/ashen_wood.json 2dcbacc9105ece46b17ff124d7e8a8116e16a811 data/create/recipes/cutting/compat/regions_unexplored/brimwood_log_magma.json @@ -185,18 +189,18 @@ aa75d5f92d23fb24aece736145ac8372f6cff3f3 data/create/recipes/cutting/compat/regi 7a01147d3c7d8fb9acb870b33e5a792328f88c3c data/create/recipes/deploying/cogwheel.json 71823595ba3f587a0940125d87f2d33a99d317d8 data/create/recipes/deploying/copper_block_from_deoxidising.json 2e94155860aae80bc3c66e92cb0815cf259dfff4 data/create/recipes/deploying/copper_block_from_removing_wax.json -05053abe2e15cc6eb885c220e7c4fcac983611eb data/create/recipes/deploying/copper_shingles_from_deoxidising.json -aec726a5c61af90cd67bf30b8f3db07253fd42d0 data/create/recipes/deploying/copper_shingles_from_removing_wax.json 728e234e700be32ee721e245e274eb050ef4f606 data/create/recipes/deploying/copper_shingle_slab_from_deoxidising.json e46c329904515063d9fc58c3006b432248d84ebe data/create/recipes/deploying/copper_shingle_slab_from_removing_wax.json a44bf77f812215cdb6bb24f2bbf97667ce7db990 data/create/recipes/deploying/copper_shingle_stairs_from_deoxidising.json 7e1fddd9635b98e778eb122f5a000618d16b11c2 data/create/recipes/deploying/copper_shingle_stairs_from_removing_wax.json -c0960ea4e0379f56b653262052fb2de3c4b0bce7 data/create/recipes/deploying/copper_tiles_from_deoxidising.json -4920419c9bd94d05c237b6b8b12c4d2e4795bf42 data/create/recipes/deploying/copper_tiles_from_removing_wax.json +05053abe2e15cc6eb885c220e7c4fcac983611eb data/create/recipes/deploying/copper_shingles_from_deoxidising.json +aec726a5c61af90cd67bf30b8f3db07253fd42d0 data/create/recipes/deploying/copper_shingles_from_removing_wax.json 67dc0704987c703fd49183994e6470e104858a95 data/create/recipes/deploying/copper_tile_slab_from_deoxidising.json 7e7f8c3decba1506b22b72b644a2025318fc8822 data/create/recipes/deploying/copper_tile_slab_from_removing_wax.json a6eaa28d82bda3f6b24b408f7c67aab88c93829e data/create/recipes/deploying/copper_tile_stairs_from_deoxidising.json 4066d8d646a9ce873cac5177beb2fa107b290956 data/create/recipes/deploying/copper_tile_stairs_from_removing_wax.json +c0960ea4e0379f56b653262052fb2de3c4b0bce7 data/create/recipes/deploying/copper_tiles_from_deoxidising.json +4920419c9bd94d05c237b6b8b12c4d2e4795bf42 data/create/recipes/deploying/copper_tiles_from_removing_wax.json a45a2f53e770e9f7435b0159e2a6ffe13d91d82d data/create/recipes/deploying/cut_copper_from_deoxidising.json a0f38792e9b993a793e6c35a4e0e0c68906218c9 data/create/recipes/deploying/cut_copper_from_removing_wax.json 45db539abee9c99e5683f993b003bfe4e27afa67 data/create/recipes/deploying/cut_copper_slab_from_deoxidising.json @@ -205,18 +209,18 @@ cffe8fdd5375773b8d91cd375c3d47e03774675f data/create/recipes/deploying/cut_coppe 4fb27e34f4315be61b0708c53800ee72bf6809a1 data/create/recipes/deploying/cut_copper_stairs_from_removing_wax.json 13bf7a638b279a2b84d68bbcde2ef2a0e6957f97 data/create/recipes/deploying/exposed_copper_from_deoxidising.json faaa8eab8175bb55c7ade06491d0be3419a2258d data/create/recipes/deploying/exposed_copper_from_removing_wax.json -09353cbd6cd87e622668303cc83d5cf6c96d14f4 data/create/recipes/deploying/exposed_copper_shingles_from_deoxidising.json -e5f64c97b09c9609f2bfb1c7e9a931f016144961 data/create/recipes/deploying/exposed_copper_shingles_from_removing_wax.json 9bac720038284c15807b1af46fb737061fc408e1 data/create/recipes/deploying/exposed_copper_shingle_slab_from_deoxidising.json ff63016d6a4e3d3fabc233e1c343524b0cd3eec6 data/create/recipes/deploying/exposed_copper_shingle_slab_from_removing_wax.json cb0dff707a1ce997c60475397e694087d235288d data/create/recipes/deploying/exposed_copper_shingle_stairs_from_deoxidising.json ff93d9667bc252c5f7323d6613756ad884499eac data/create/recipes/deploying/exposed_copper_shingle_stairs_from_removing_wax.json -9c5491e571dbd52a758bacc77fd193d3f435d19f data/create/recipes/deploying/exposed_copper_tiles_from_deoxidising.json -72359d16366ce29ba88f2536c2af82e7ba33af92 data/create/recipes/deploying/exposed_copper_tiles_from_removing_wax.json +09353cbd6cd87e622668303cc83d5cf6c96d14f4 data/create/recipes/deploying/exposed_copper_shingles_from_deoxidising.json +e5f64c97b09c9609f2bfb1c7e9a931f016144961 data/create/recipes/deploying/exposed_copper_shingles_from_removing_wax.json 6ec863a95f4bdd0917f9cacec5c02e09ef843b34 data/create/recipes/deploying/exposed_copper_tile_slab_from_deoxidising.json 68777658e9ecac0653cd22a154edd7af06b36138 data/create/recipes/deploying/exposed_copper_tile_slab_from_removing_wax.json fc936eb34042c2fdb751a4f5b53c7bd283aa8f82 data/create/recipes/deploying/exposed_copper_tile_stairs_from_deoxidising.json ea381bc5a0adcb7f1b74e7dac02e988b5e93f056 data/create/recipes/deploying/exposed_copper_tile_stairs_from_removing_wax.json +9c5491e571dbd52a758bacc77fd193d3f435d19f data/create/recipes/deploying/exposed_copper_tiles_from_deoxidising.json +72359d16366ce29ba88f2536c2af82e7ba33af92 data/create/recipes/deploying/exposed_copper_tiles_from_removing_wax.json 1612bd37a109f7876ac03c5988dc7d6ddfad0ff8 data/create/recipes/deploying/exposed_cut_copper_from_deoxidising.json 6151c9f5925ead0056d338fdfd673500902e417d data/create/recipes/deploying/exposed_cut_copper_from_removing_wax.json a44eaf00ef5e746c62aa72552a37447676fcd385 data/create/recipes/deploying/exposed_cut_copper_slab_from_deoxidising.json @@ -225,69 +229,69 @@ a44eaf00ef5e746c62aa72552a37447676fcd385 data/create/recipes/deploying/exposed_c 98ac326a1e2c80fd0f3cb73c7ad80b86ba7cf980 data/create/recipes/deploying/exposed_cut_copper_stairs_from_removing_wax.json 1230f449873262e79585752d3430e5f7f383bcb2 data/create/recipes/deploying/large_cogwheel.json 051faceb93f5cba4be8632198272500bcf461334 data/create/recipes/deploying/oxidized_copper_from_removing_wax.json -00cad77046b42466fb40798f11480d7370cab579 data/create/recipes/deploying/oxidized_copper_shingles_from_removing_wax.json deecff3e485442af83fb01d16b0a46d98e5214bb data/create/recipes/deploying/oxidized_copper_shingle_slab_from_removing_wax.json 162ddbeb10da4eec0709813d3f55465a658e76d1 data/create/recipes/deploying/oxidized_copper_shingle_stairs_from_removing_wax.json -6f4ad2120309481203e1ac839263099bb7e36ea0 data/create/recipes/deploying/oxidized_copper_tiles_from_removing_wax.json +00cad77046b42466fb40798f11480d7370cab579 data/create/recipes/deploying/oxidized_copper_shingles_from_removing_wax.json dff292537e007aabdffdf997509838c6168799b4 data/create/recipes/deploying/oxidized_copper_tile_slab_from_removing_wax.json 42cc953f2f2cf2b2af7d3d1480abf6d7d363abec data/create/recipes/deploying/oxidized_copper_tile_stairs_from_removing_wax.json +6f4ad2120309481203e1ac839263099bb7e36ea0 data/create/recipes/deploying/oxidized_copper_tiles_from_removing_wax.json 58e6abf60ee8d830143fa6a48830c3d20acfc8c0 data/create/recipes/deploying/oxidized_cut_copper_from_removing_wax.json 52eb357d1d13edc250726f70c7b3639cb902a933 data/create/recipes/deploying/oxidized_cut_copper_slab_from_removing_wax.json 5daf82089854fda3a264b26303fe02764539a87e data/create/recipes/deploying/oxidized_cut_copper_stairs_from_removing_wax.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 20c2fefb17fcdde2b817b1634d805dececf8b0e5 data/create/recipes/deploying/weathered_copper_from_deoxidising.json ba026a1c407eca2f8acc66a10a1fcc97cb318b1e data/create/recipes/deploying/weathered_copper_from_removing_wax.json -5e01f5da2ad67a939a7630bf2607a0159d1dd177 data/create/recipes/deploying/weathered_copper_shingles_from_deoxidising.json -7f962473189c296c02f5e97fa3e920cc7e26f112 data/create/recipes/deploying/weathered_copper_shingles_from_removing_wax.json 4c903ea6449f7ef494c66e20671a323b6703fa05 data/create/recipes/deploying/weathered_copper_shingle_slab_from_deoxidising.json 231350a2d36a11b5848052fe20e11f32b0cd7838 data/create/recipes/deploying/weathered_copper_shingle_slab_from_removing_wax.json 94cb495f52ca2b88b8680a6bcd2d326a91357e0c data/create/recipes/deploying/weathered_copper_shingle_stairs_from_deoxidising.json 0160f12204d05b0f094a7b7d189692501aa90ed0 data/create/recipes/deploying/weathered_copper_shingle_stairs_from_removing_wax.json -6210a2a41161ff2d0ceca8ca209954af4c63002a data/create/recipes/deploying/weathered_copper_tiles_from_deoxidising.json -03ad0e1d06b1197fa45db23d73eb9f76a45944f8 data/create/recipes/deploying/weathered_copper_tiles_from_removing_wax.json +5e01f5da2ad67a939a7630bf2607a0159d1dd177 data/create/recipes/deploying/weathered_copper_shingles_from_deoxidising.json +7f962473189c296c02f5e97fa3e920cc7e26f112 data/create/recipes/deploying/weathered_copper_shingles_from_removing_wax.json 3f218e4ab4a52d0df55725088c4128582c9b6918 data/create/recipes/deploying/weathered_copper_tile_slab_from_deoxidising.json 18bbbcdbf4e57e6fe567b3494f492332745cd6fc data/create/recipes/deploying/weathered_copper_tile_slab_from_removing_wax.json a24e82558aa7aee7840f6310531cec46b626cee4 data/create/recipes/deploying/weathered_copper_tile_stairs_from_deoxidising.json 6b8b807ebd14158d2d14c5210d5c60c781d112db data/create/recipes/deploying/weathered_copper_tile_stairs_from_removing_wax.json +6210a2a41161ff2d0ceca8ca209954af4c63002a data/create/recipes/deploying/weathered_copper_tiles_from_deoxidising.json +03ad0e1d06b1197fa45db23d73eb9f76a45944f8 data/create/recipes/deploying/weathered_copper_tiles_from_removing_wax.json 45dfc86b09a4b777974026697bfd444063920374 data/create/recipes/deploying/weathered_cut_copper_from_deoxidising.json b19f74374347bb123ad32b9d1bb680763467fe1d data/create/recipes/deploying/weathered_cut_copper_from_removing_wax.json 58cf0f39fd70e58a97a8458907ea6af393efe5b8 data/create/recipes/deploying/weathered_cut_copper_slab_from_deoxidising.json @@ -314,8 +318,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 @@ -461,8 +465,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 @@ -541,9 +545,7 @@ dd92906041688b897fe8259eb63ab5a26fb790c4 data/create/recipes/milling/lily_of_the fc6f30a97d0d9da10ae70547f2b1cf59ed1345a2 data/create/recipes/milling/orange_tulip.json f788ef9822a5884afe3ac6db187bddd86b0d5d89 data/create/recipes/milling/oxeye_daisy.json ce353a1083c769d5984cf2c9f6b70132a19c4a2f data/create/recipes/milling/peony.json -11ebb5df7e28755767002d8b45dba047f91c1775 data/create/recipes/milling/pink_petals.json a654ff381c572da2b860b20e53f017f59828e4d9 data/create/recipes/milling/pink_tulip.json -01b6ed50f5928fbd9b2c90f9a656af3c3d88c923 data/create/recipes/milling/pitcher_plant.json 9fb8da4cf864ebd5d32acf3048153afc778bd5f9 data/create/recipes/milling/poppy.json 7af146a5537a561343938d9377e8ee5a92fbd587 data/create/recipes/milling/red_tulip.json a816354b8323dad95e552ff959b5101b65be8742 data/create/recipes/milling/rose_bush.json @@ -554,25 +556,24 @@ f4f8d3d7e14580c5926b325b04db9cc9c0ab76bd data/create/recipes/milling/sandstone.j b9f76af7f58d3e9b0689795dcad4c72be7f75211 data/create/recipes/milling/sunflower.json 1c4d6364e5b3f2dd361756f481615088d5cf8331 data/create/recipes/milling/tall_grass.json c5846a4c7ccbe7b4bf6251f7ee11f3899c8926d2 data/create/recipes/milling/terracotta.json -3db3005e676a57a4e9b91c9e34e4488829fd2d66 data/create/recipes/milling/torchflower.json 67ad673d1f7b6000b8b2c88d8205210c8a563f68 data/create/recipes/milling/wheat.json a91dae829938d3f69a7007d3cf8db02b70fe3a7f data/create/recipes/milling/white_tulip.json 023ab0c2abaf87295fb7c3fbe841a09c519b74f7 data/create/recipes/milling/wither_rose.json 74bb289e20e891112f4964761eb76c3ce4d3c8cd data/create/recipes/milling/wool.json 5f1b8a82af091cd4589ecfa5c13a4db6ad9c51b9 data/create/recipes/mixing/andesite_alloy.json 48604c2205b18fe1401eac58d14aa1677cbd9c2b data/create/recipes/mixing/andesite_alloy_from_zinc.json -d06c1d0362dccc4e5f8b22f851dc8316b35c06b0 data/create/recipes/mixing/brass_ingot.json +e02c9e5eb3e915a20ce9fac61f55e9146e98a0f0 data/create/recipes/mixing/brass_ingot.json 84a789f57691cb1e515f98cb162d7eda416eae7a data/create/recipes/mixing/cardboard_pulp.json -840a9008d4531425beadfcf224d21e938acc4502 data/create/recipes/mixing/chocolate.json -e7b86d4ca5de2df474794424d93b447e5f9dcdc3 data/create/recipes/mixing/chocolate_melting.json +a81c1955899569ccf4691977c3b660153b74e20b data/create/recipes/mixing/chocolate.json +4902bc0410366fbba41e75fc1585a6dd69b176f8 data/create/recipes/mixing/chocolate_melting.json 39e832016fa5e360434271505d09ced17a40e7eb data/create/recipes/mixing/compat/ae2/fluix_crystal.json f0648e6b963e1ac1c1756f769988e779963eb1a1 data/create/recipes/mixing/compat/regions_unexplored/peat_mud.json a2cf143f409a26709ad119f151c611331dca960c data/create/recipes/mixing/compat/regions_unexplored/silt_mud.json 4cf9a0979fb6401c51c763d71f0bb53ea2c8c32b data/create/recipes/mixing/dough_by_mixing.json -ac2a2456e2f0ccd74db6dc5ad029eb4e6781a25d data/create/recipes/mixing/honey.json -251c09ac25bb73e092fac483ceb5a9196a479919 data/create/recipes/mixing/lava_from_cobble.json +589a0fccb25f16c4a26bd3c77a8d225500cafdd0 data/create/recipes/mixing/honey.json +7ff78a2644738fecdea7b238cadeacb748321388 data/create/recipes/mixing/lava_from_cobble.json 939c55202f06b50cec3c16e66e85f915f2272db2 data/create/recipes/mixing/mud_by_mixing.json -4454cb7a73571d90e19826ee394b0c9e52ac8620 data/create/recipes/mixing/tea.json +7ae0e4d9b533bacc38f2b5bf84bb93a64108cf34 data/create/recipes/mixing/tea.json 77de88a8d25b974a63a5d132dd5461523e798fe2 data/create/recipes/pressing/aether_dirt_path.json 92a1198c990660458565ca871520b7c32fb0e24b data/create/recipes/pressing/aether_dirt_path_from_grass.json 8bd950c78b4db3b7f5a9a1f42c116677049b77fc data/create/recipes/pressing/brass_ingot.json @@ -659,10 +660,10 @@ 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 d09bcaa2334e05e6cce37b7342c7de84ce954bb9 data/create/recipes/splashing/wool.json diff --git a/src/generated/resources/data/create/recipes/mixing/brass_ingot.json b/src/generated/resources/data/create/recipes/mixing/brass_ingot.json index 9c2cabae7e..8f528d105c 100644 --- a/src/generated/resources/data/create/recipes/mixing/brass_ingot.json +++ b/src/generated/resources/data/create/recipes/mixing/brass_ingot.json @@ -1,6 +1,6 @@ { "type": "create:mixing", - "heatRequirement": "heated", + "heatRequirement": "create:heated", "ingredients": [ { "tag": "forge:ingots/copper" diff --git a/src/generated/resources/data/create/recipes/mixing/chocolate.json b/src/generated/resources/data/create/recipes/mixing/chocolate.json index cdf1308a93..c8522b1d52 100644 --- a/src/generated/resources/data/create/recipes/mixing/chocolate.json +++ b/src/generated/resources/data/create/recipes/mixing/chocolate.json @@ -1,6 +1,6 @@ { "type": "create:mixing", - "heatRequirement": "heated", + "heatRequirement": "create:heated", "ingredients": [ { "item": "minecraft:sugar" diff --git a/src/generated/resources/data/create/recipes/mixing/chocolate_melting.json b/src/generated/resources/data/create/recipes/mixing/chocolate_melting.json index 37ae358d1f..616fd51eb1 100644 --- a/src/generated/resources/data/create/recipes/mixing/chocolate_melting.json +++ b/src/generated/resources/data/create/recipes/mixing/chocolate_melting.json @@ -1,6 +1,6 @@ { "type": "create:mixing", - "heatRequirement": "heated", + "heatRequirement": "create:heated", "ingredients": [ { "item": "create:bar_of_chocolate" diff --git a/src/generated/resources/data/create/recipes/mixing/honey.json b/src/generated/resources/data/create/recipes/mixing/honey.json index 0165c90f0b..b4518ee028 100644 --- a/src/generated/resources/data/create/recipes/mixing/honey.json +++ b/src/generated/resources/data/create/recipes/mixing/honey.json @@ -1,6 +1,6 @@ { "type": "create:mixing", - "heatRequirement": "heated", + "heatRequirement": "create:heated", "ingredients": [ { "item": "minecraft:honey_block" diff --git a/src/generated/resources/data/create/recipes/mixing/lava_from_cobble.json b/src/generated/resources/data/create/recipes/mixing/lava_from_cobble.json index 127c2bfe92..f8e8e6d410 100644 --- a/src/generated/resources/data/create/recipes/mixing/lava_from_cobble.json +++ b/src/generated/resources/data/create/recipes/mixing/lava_from_cobble.json @@ -1,6 +1,6 @@ { "type": "create:mixing", - "heatRequirement": "superheated", + "heatRequirement": "create:superheated", "ingredients": [ { "tag": "forge:cobblestone" diff --git a/src/generated/resources/data/create/recipes/mixing/tea.json b/src/generated/resources/data/create/recipes/mixing/tea.json index db46698368..1108ee0974 100644 --- a/src/generated/resources/data/create/recipes/mixing/tea.json +++ b/src/generated/resources/data/create/recipes/mixing/tea.json @@ -1,6 +1,6 @@ { "type": "create:mixing", - "heatRequirement": "heated", + "heatRequirement": "create:heated", "ingredients": [ { "tag": "minecraft:leaves" diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java index c0d442b278..50e4d7ebb4 100644 --- a/src/main/java/com/simibubi/create/Create.java +++ b/src/main/java/com/simibubi/create/Create.java @@ -2,6 +2,8 @@ import java.util.Random; +import com.simibubi.create.content.processing.recipe.AllHeatConditions; + import org.slf4j.Logger; import com.google.gson.Gson; @@ -198,6 +200,7 @@ public static void onRegister(final RegisterEvent event) { AllPotatoProjectileRenderModes.init(); AllPotatoProjectileEntityHitActions.init(); AllPotatoProjectileBlockHitActions.init(); + AllHeatConditions.init(); } public static LangBuilder lang() { diff --git a/src/main/java/com/simibubi/create/api/recipe/HeatCondition.java b/src/main/java/com/simibubi/create/api/recipe/HeatCondition.java new file mode 100644 index 0000000000..c1278b6d46 --- /dev/null +++ b/src/main/java/com/simibubi/create/api/recipe/HeatCondition.java @@ -0,0 +1,57 @@ +package com.simibubi.create.api.recipe; + +import com.simibubi.create.api.registry.CreateBuiltInRegistries; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.item.ItemStack; + +import net.minecraft.world.level.Level; + +import org.jetbrains.annotations.ApiStatus.Internal; +import org.jetbrains.annotations.NotNull; + +import java.util.List; + +/** + * A HeatCondition is a recipe condition such as the requirement of being heated or superheated. + * This is demonstrated with the Blaze Burner. + *

+ * This interface provides integration with JEI through {@link #getItemHints()} and {@link #getColor()}. + * To make your heat source render within Create's categories, add your IDrawable to {@link com.simibubi.create.compat.jei.CreateJEI#heatConditionDrawables}. + * You should do this from your JEI plugin's onRuntimeAvailable method. + *

+ */ +public interface HeatCondition { + /** + * Tests the HeatCondition's criteria against a position. + * @param level The level in which the test is located in. + * @param testPos The position of the block entity to be heated (e.g. a Basin) + * @return Whether the HeatCondition is valid for this position. + */ + boolean test(Level level, BlockPos testPos); + + /** + * @return The HeatingCondition's translation key. + */ + String getTranslationKey(); + + /** + * Provides items associated with this HeatCondition (e.g. a Blaze Burner) + */ + @NotNull + default List getItemHints() { + return List.of(); + } + + /** + * The color of the HeatCondition when shown in JEI. + */ + default int getColor() { + return 0xffffff; + } + + @Internal + default int ordinal() { + return CreateBuiltInRegistries.HEAT_CONDITION.getId(this); + } +} diff --git a/src/main/java/com/simibubi/create/api/registry/CreateBuiltInRegistries.java b/src/main/java/com/simibubi/create/api/registry/CreateBuiltInRegistries.java index d517af66cb..d0d08017c8 100644 --- a/src/main/java/com/simibubi/create/api/registry/CreateBuiltInRegistries.java +++ b/src/main/java/com/simibubi/create/api/registry/CreateBuiltInRegistries.java @@ -1,5 +1,7 @@ package com.simibubi.create.api.registry; +import com.simibubi.create.api.recipe.HeatCondition; + import org.jetbrains.annotations.ApiStatus; import com.mojang.serialization.Codec; @@ -41,6 +43,7 @@ public class CreateBuiltInRegistries { public static final Registry> POTATO_PROJECTILE_RENDER_MODE = simple(CreateRegistries.POTATO_PROJECTILE_RENDER_MODE); public static final Registry> POTATO_PROJECTILE_ENTITY_HIT_ACTION = simple(CreateRegistries.POTATO_PROJECTILE_ENTITY_HIT_ACTION); public static final Registry> POTATO_PROJECTILE_BLOCK_HIT_ACTION = simple(CreateRegistries.POTATO_PROJECTILE_BLOCK_HIT_ACTION); + public static final Registry HEAT_CONDITION = simple(CreateRegistries.HEAT_CONDITION); private static Registry simple(ResourceKey> key) { return register(key, new MappedRegistry<>(key, Lifecycle.stable(), false)); diff --git a/src/main/java/com/simibubi/create/api/registry/CreateRegistries.java b/src/main/java/com/simibubi/create/api/registry/CreateRegistries.java index 73efe5aed1..490209c343 100644 --- a/src/main/java/com/simibubi/create/api/registry/CreateRegistries.java +++ b/src/main/java/com/simibubi/create/api/registry/CreateRegistries.java @@ -15,6 +15,8 @@ import com.simibubi.create.content.kinetics.mechanicalArm.ArmInteractionPointType; import com.simibubi.create.content.logistics.item.filter.attribute.ItemAttributeType; +import com.simibubi.create.api.recipe.HeatCondition; + import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; @@ -36,6 +38,7 @@ public class CreateRegistries { public static final ResourceKey>> POTATO_PROJECTILE_RENDER_MODE = key("potato_projectile/render_mode"); public static final ResourceKey>> POTATO_PROJECTILE_ENTITY_HIT_ACTION = key("potato_projectile/entity_hit_action"); public static final ResourceKey>> POTATO_PROJECTILE_BLOCK_HIT_ACTION = key("potato_projectile/block_hit_action"); + public static final ResourceKey> HEAT_CONDITION = key("heat_condition"); private static ResourceKey> key(String name) { return ResourceKey.createRegistryKey(Create.asResource(name)); diff --git a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java index 27f0867120..ac6c160ebc 100644 --- a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java +++ b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -21,6 +22,7 @@ import com.simibubi.create.AllItems; import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.Create; +import com.simibubi.create.api.recipe.HeatCondition; import com.simibubi.create.compat.jei.category.BlockCuttingCategory; import com.simibubi.create.compat.jei.category.BlockCuttingCategory.CondensedBlockCuttingRecipe; import com.simibubi.create.compat.jei.category.CreateRecipeCategory; @@ -43,6 +45,7 @@ import com.simibubi.create.compat.jei.category.SawingCategory; import com.simibubi.create.compat.jei.category.SequencedAssemblyCategory; import com.simibubi.create.compat.jei.category.SpoutCategory; +import com.simibubi.create.compat.jei.category.animations.AnimatedBlazeBurner; import com.simibubi.create.content.equipment.blueprint.BlueprintScreen; import com.simibubi.create.content.equipment.sandPaper.SandPaperPolishingRecipe; import com.simibubi.create.content.fluids.potion.PotionFluid; @@ -64,6 +67,8 @@ import com.simibubi.create.content.logistics.redstoneRequester.RedstoneRequesterScreen; import com.simibubi.create.content.logistics.stockTicker.StockKeeperRequestScreen; import com.simibubi.create.content.processing.basin.BasinRecipe; +import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel; +import com.simibubi.create.content.processing.recipe.BlazeBurnerHeatCondition; import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe; import com.simibubi.create.content.redstone.link.controller.LinkedControllerScreen; import com.simibubi.create.content.trains.schedule.ScheduleScreen; @@ -124,6 +129,8 @@ public class CreateJEI implements IModPlugin { public static IJeiRuntime runtime; + public static Map heatConditionDrawables = new HashMap<>(); + private void loadCategories() { allCategories.clear(); @@ -618,8 +625,10 @@ public static boolean doOutputsMatch(Recipe recipe1, Recipe recipe2) { } @Override - public void onRuntimeAvailable(IJeiRuntime runtime) { - CreateJEI.runtime = runtime; - } + public void onRuntimeAvailable(IJeiRuntime runtime) { + CreateJEI.runtime = runtime; + heatConditionDrawables.put(BlazeBurnerHeatCondition.HEATED, new AnimatedBlazeBurner().withHeat(HeatLevel.KINDLED)); + heatConditionDrawables.put(BlazeBurnerHeatCondition.SUPERHEATED, new AnimatedBlazeBurner().withHeat(HeatLevel.SEETHING)); + } } diff --git a/src/main/java/com/simibubi/create/compat/jei/category/BasinCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/BasinCategory.java index 03c0dfebee..4b8611fc0f 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/BasinCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/BasinCategory.java @@ -5,18 +5,17 @@ import javax.annotation.ParametersAreNonnullByDefault; +import com.simibubi.create.api.recipe.HeatCondition; + +import net.minecraft.network.chat.Component; + import org.apache.commons.lang3.mutable.MutableInt; -import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllItems; import com.simibubi.create.content.processing.basin.BasinRecipe; -import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel; -import com.simibubi.create.content.processing.recipe.HeatCondition; import com.simibubi.create.content.processing.recipe.ProcessingOutput; import com.simibubi.create.foundation.fluid.FluidIngredient; import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.item.ItemHelper; -import com.simibubi.create.foundation.utility.CreateLang; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; @@ -91,24 +90,21 @@ public void setRecipe(IRecipeLayoutBuilder builder, BasinRecipe recipe, IFocusGr i++; } - HeatCondition requiredHeat = recipe.getRequiredHeat(); - if (!requiredHeat.testBlazeBurner(HeatLevel.NONE)) { - builder - .addSlot(RecipeIngredientRole.RENDER_ONLY, 134, 81) - .addItemStack(AllBlocks.BLAZE_BURNER.asStack()); - } - if (!requiredHeat.testBlazeBurner(HeatLevel.KINDLED)) { - builder - .addSlot(RecipeIngredientRole.CATALYST, 153, 81) - .addItemStack(AllItems.BLAZE_CAKE.asStack()); + HeatCondition heatCondition = recipe.getRequiredHeat(); + if (heatCondition == null) return; + + List itemHints = heatCondition.getItemHints(); + for (int j = 0; j < itemHints.size(); j++) { + builder.addSlot(RecipeIngredientRole.RENDER_ONLY, 134 + (j*20), 81) + .addItemStack(itemHints.get(j)); } } @Override public void draw(BasinRecipe recipe, IRecipeSlotsView recipeSlotsView, GuiGraphics graphics, double mouseX, double mouseY) { - HeatCondition requiredHeat = recipe.getRequiredHeat(); + HeatCondition heatCondition = recipe.getRequiredHeat(); - boolean noHeat = requiredHeat == HeatCondition.NONE; + boolean noHeat = heatCondition == null; int vRows = (1 + recipe.getFluidResults().size() + recipe.getRollableResults().size()) / 2; @@ -123,8 +119,14 @@ public void draw(BasinRecipe recipe, IRecipeSlotsView recipeSlotsView, GuiGraphi AllGuiTextures heatBar = noHeat ? AllGuiTextures.JEI_NO_HEAT_BAR : AllGuiTextures.JEI_HEAT_BAR; heatBar.render(graphics, 4, 80); - graphics.drawString(Minecraft.getInstance().font, CreateLang.translateDirect(requiredHeat.getTranslationKey()), 9, - 86, requiredHeat.getColor(), false); + + if (noHeat) { + graphics.drawString(Minecraft.getInstance().font, Component.translatable("create.recipe.heat_requirement.none"), 9, + 86, 0xffffff, false); + } else { + graphics.drawString(Minecraft.getInstance().font, Component.translatable(heatCondition.getTranslationKey()), 9, + 86, heatCondition.getColor(), false); + } } } diff --git a/src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java index 2c8c621fb4..2d3eea5689 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java @@ -1,9 +1,11 @@ package com.simibubi.create.compat.jei.category; -import com.simibubi.create.compat.jei.category.animations.AnimatedBlazeBurner; +import com.simibubi.create.compat.jei.CreateJEI; import com.simibubi.create.compat.jei.category.animations.AnimatedMixer; import com.simibubi.create.content.processing.basin.BasinRecipe; -import com.simibubi.create.content.processing.recipe.HeatCondition; +import com.simibubi.create.api.recipe.HeatCondition; + +import mezz.jei.api.gui.drawable.IDrawable; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import net.minecraft.client.gui.GuiGraphics; @@ -13,7 +15,6 @@ public class MixingCategory extends BasinCategory { private final AnimatedMixer mixer = new AnimatedMixer(); - private final AnimatedBlazeBurner heater = new AnimatedBlazeBurner(); MixingType type; enum MixingType { @@ -41,10 +42,12 @@ protected MixingCategory(Info info, MixingType type) { public void draw(BasinRecipe recipe, IRecipeSlotsView iRecipeSlotsView, GuiGraphics graphics, double mouseX, double mouseY) { super.draw(recipe, iRecipeSlotsView, graphics, mouseX, mouseY); - HeatCondition requiredHeat = recipe.getRequiredHeat(); - if (requiredHeat != HeatCondition.NONE) - heater.withHeat(requiredHeat.visualizeAsBlazeBurner()) - .draw(graphics, getBackground().getWidth() / 2 + 3, 55); + HeatCondition heatCondition = recipe.getRequiredHeat(); + if (heatCondition != null) { + IDrawable drawable = CreateJEI.heatConditionDrawables.get(heatCondition); + if (drawable != null) + drawable.draw(graphics, getBackground().getWidth() / 2 + 3, 55); + } mixer.draw(graphics, getBackground().getWidth() / 2 + 3, 34); } diff --git a/src/main/java/com/simibubi/create/compat/jei/category/PackingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/PackingCategory.java index 1b207bf247..31a32811ce 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/PackingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/PackingCategory.java @@ -1,11 +1,12 @@ package com.simibubi.create.compat.jei.category; -import com.simibubi.create.compat.jei.category.animations.AnimatedBlazeBurner; +import com.simibubi.create.compat.jei.CreateJEI; import com.simibubi.create.compat.jei.category.animations.AnimatedPress; import com.simibubi.create.content.processing.basin.BasinRecipe; -import com.simibubi.create.content.processing.recipe.HeatCondition; +import com.simibubi.create.api.recipe.HeatCondition; import com.simibubi.create.foundation.gui.AllGuiTextures; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; +import mezz.jei.api.gui.drawable.IDrawable; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.RecipeIngredientRole; @@ -19,7 +20,6 @@ public class PackingCategory extends BasinCategory { private final AnimatedPress press = new AnimatedPress(true); - private final AnimatedBlazeBurner heater = new AnimatedBlazeBurner(); private final PackingType type; enum PackingType { @@ -76,10 +76,12 @@ public void draw(BasinRecipe recipe, IRecipeSlotsView iRecipeSlotsView, GuiGraph } - HeatCondition requiredHeat = recipe.getRequiredHeat(); - if (requiredHeat != HeatCondition.NONE) - heater.withHeat(requiredHeat.visualizeAsBlazeBurner()) - .draw(graphics, getBackground().getWidth() / 2 + 3, 55); + HeatCondition heatCondition = recipe.getRequiredHeat(); + if (heatCondition != null) { + IDrawable drawable = CreateJEI.heatConditionDrawables.get(heatCondition); + if (drawable != null) + drawable.draw(graphics, getBackground().getWidth() / 2 + 3, 55); + } press.draw(graphics, getBackground().getWidth() / 2 + 3, 34); diff --git a/src/main/java/com/simibubi/create/content/fluids/potion/PotionMixingRecipes.java b/src/main/java/com/simibubi/create/content/fluids/potion/PotionMixingRecipes.java index 9433c0aa61..9a71e80abe 100644 --- a/src/main/java/com/simibubi/create/content/fluids/potion/PotionMixingRecipes.java +++ b/src/main/java/com/simibubi/create/content/fluids/potion/PotionMixingRecipes.java @@ -10,7 +10,7 @@ import com.simibubi.create.Create; import com.simibubi.create.content.fluids.potion.PotionFluid.BottleType; import com.simibubi.create.content.kinetics.mixer.MixingRecipe; -import com.simibubi.create.content.processing.recipe.HeatCondition; +import com.simibubi.create.content.processing.recipe.BlazeBurnerHeatCondition; import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; import com.simibubi.create.foundation.fluid.FluidIngredient; @@ -122,7 +122,7 @@ private static MixingRecipe createRecipe(String id, Ingredient ingredient, Fluid Create.asResource(id)).require(ingredient) .require(FluidIngredient.fromFluidStack(fromFluid)) .output(toFluid) - .requiresHeat(HeatCondition.HEATED) + .requiresHeat(BlazeBurnerHeatCondition.HEATED) .build(); } diff --git a/src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java b/src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java index bd2cea7fb0..0197019adc 100644 --- a/src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java +++ b/src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java @@ -8,7 +8,7 @@ import javax.annotation.Nonnull; import com.simibubi.create.AllRecipeTypes; -import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel; +import com.simibubi.create.api.recipe.HeatCondition; import com.simibubi.create.content.processing.recipe.ProcessingRecipe; import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams; @@ -72,10 +72,12 @@ private static boolean apply(BasinBlockEntity basin, Recipe recipe, boolean t if (availableItems == null || availableFluids == null) return false; - HeatLevel heat = basin.getHeatLevel(); - if (isBasinRecipe && !((BasinRecipe) recipe).getRequiredHeat() - .testBlazeBurner(heat)) - return false; + if (isBasinRecipe) { + HeatCondition heatCondition = ((BasinRecipe) recipe).getRequiredHeat(); + if (heatCondition != null) { + if (!heatCondition.test(basin.getLevel(), basin.getBlockPos())) return false; + } + } List recipeOutputItems = new ArrayList<>(); List recipeOutputFluids = new ArrayList<>(); diff --git a/src/main/java/com/simibubi/create/content/processing/recipe/AllHeatConditions.java b/src/main/java/com/simibubi/create/content/processing/recipe/AllHeatConditions.java new file mode 100644 index 0000000000..fff9b323d3 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/processing/recipe/AllHeatConditions.java @@ -0,0 +1,18 @@ +package com.simibubi.create.content.processing.recipe; + +import com.simibubi.create.Create; +import com.simibubi.create.api.recipe.HeatCondition; +import com.simibubi.create.api.registry.CreateBuiltInRegistries; + +import net.minecraft.core.Registry; + +public class AllHeatConditions { + public static final BlazeBurnerHeatCondition HEATED = register("heated", BlazeBurnerHeatCondition.HEATED); + public static final BlazeBurnerHeatCondition SUPERHEATED = register("superheated", BlazeBurnerHeatCondition.SUPERHEATED); + + private static T register(String name, T type) { + return Registry.register(CreateBuiltInRegistries.HEAT_CONDITION, Create.asResource(name), type); + } + + public static void init() {} +} diff --git a/src/main/java/com/simibubi/create/content/processing/recipe/BlazeBurnerHeatCondition.java b/src/main/java/com/simibubi/create/content/processing/recipe/BlazeBurnerHeatCondition.java new file mode 100644 index 0000000000..18401c46df --- /dev/null +++ b/src/main/java/com/simibubi/create/content/processing/recipe/BlazeBurnerHeatCondition.java @@ -0,0 +1,60 @@ +package com.simibubi.create.content.processing.recipe; + +import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllItems; +import com.simibubi.create.api.recipe.HeatCondition; +import com.simibubi.create.content.processing.burner.BlazeBurnerBlock; +import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel; + +import net.createmod.catnip.lang.Lang; +import net.minecraft.core.BlockPos; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.ItemLike; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; + +import org.jetbrains.annotations.NotNull; + +import java.util.List; + +public enum BlazeBurnerHeatCondition implements HeatCondition { + HEATED(0xE88300, HeatLevel.KINDLED, AllBlocks.BLAZE_BURNER), + SUPERHEATED(0x5C93E8, HeatLevel.SEETHING, AllBlocks.BLAZE_BURNER, AllItems.BLAZE_CAKE); + + private final int color; + private final HeatLevel heatLevel; + private final List itemHints; + + BlazeBurnerHeatCondition(int color, HeatLevel heatLevel, ItemLike... hints) { + this.color = color; + this.heatLevel = heatLevel; + this.itemHints = List.of(hints); + } + + @Override + public boolean test(Level level, BlockPos testPos) { + BlockState stateBelow = level.getBlockState(testPos.below()); + if(!stateBelow.is(AllBlocks.BLAZE_BURNER.get())) return false; + HeatLevel basinHeat = stateBelow.getValue(BlazeBurnerBlock.HEAT_LEVEL); + return basinHeat.isAtLeast(heatLevel); + } + + @Override + @NotNull + public List getItemHints() { + return itemHints.stream().map(ItemStack::new).toList(); + } + + public String serialize() { + return Lang.asId(name()); + } + + public String getTranslationKey() { + return "create.recipe.heat_requirement." + serialize(); + } + + public int getColor() { + return color; + } + +} diff --git a/src/main/java/com/simibubi/create/content/processing/recipe/HeatCondition.java b/src/main/java/com/simibubi/create/content/processing/recipe/HeatCondition.java deleted file mode 100644 index 9c26f0bb52..0000000000 --- a/src/main/java/com/simibubi/create/content/processing/recipe/HeatCondition.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.simibubi.create.content.processing.recipe; - -import com.simibubi.create.Create; -import com.simibubi.create.content.processing.burner.BlazeBurnerBlock; -import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel; - -import net.createmod.catnip.lang.Lang; - -public enum HeatCondition { - - NONE(0xffffff), HEATED(0xE88300), SUPERHEATED(0x5C93E8), - - ; - - private int color; - - private HeatCondition(int color) { - this.color = color; - } - - public boolean testBlazeBurner(BlazeBurnerBlock.HeatLevel level) { - if (this == SUPERHEATED) - return level == HeatLevel.SEETHING; - if (this == HEATED) - return level != HeatLevel.NONE && level != HeatLevel.SMOULDERING; - return true; - } - - public BlazeBurnerBlock.HeatLevel visualizeAsBlazeBurner() { - if (this == SUPERHEATED) - return HeatLevel.SEETHING; - if (this == HEATED) - return HeatLevel.KINDLED; - return HeatLevel.NONE; - } - - public String serialize() { - return Lang.asId(name()); - } - - public String getTranslationKey() { - return "recipe.heat_requirement." + serialize(); - } - - public static HeatCondition deserialize(String name) { - for (HeatCondition heatCondition : values()) - if (heatCondition.serialize() - .equals(name)) - return heatCondition; - Create.LOGGER.warn("Tried to deserialize invalid heat condition: \"" + name + "\""); - return NONE; - } - - public int getColor() { - return color; - } - -} diff --git a/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipe.java b/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipe.java index 7bf6363b71..b594abfa91 100644 --- a/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipe.java +++ b/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipe.java @@ -5,8 +5,11 @@ import java.util.function.Supplier; import java.util.stream.Collectors; +import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; +import com.simibubi.create.api.recipe.HeatCondition; + import org.slf4j.Logger; import com.google.gson.JsonObject; @@ -102,7 +105,7 @@ private void validate(ResourceLocation recipeTypeId) { if (processingDuration > 0 && !canSpecifyDuration()) logger.warn(messageHeader + " specified a duration. Durations have no impact on this type of recipe."); - if (requiredHeat != HeatCondition.NONE && !canRequireHeat()) + if (requiredHeat != null && !canRequireHeat()) logger.warn( messageHeader + " specified a heat condition. Heat conditions have no impact on this type of recipe."); @@ -164,6 +167,7 @@ public int getProcessingDuration() { return processingDuration; } + @Nullable public HeatCondition getRequiredHeat() { return requiredHeat; } diff --git a/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipeBuilder.java b/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipeBuilder.java index 1527ab0779..6f1ffd4b1d 100644 --- a/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipeBuilder.java +++ b/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipeBuilder.java @@ -6,6 +6,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import com.simibubi.create.api.recipe.HeatCondition; import com.simibubi.create.api.data.recipe.DatagenMod; import com.simibubi.create.foundation.data.SimpleDatagenIngredient; import com.simibubi.create.foundation.fluid.FluidHelper; @@ -242,7 +243,7 @@ protected ProcessingRecipeParams(ResourceLocation id) { fluidIngredients = NonNullList.create(); fluidResults = NonNullList.create(); processingDuration = 0; - requiredHeat = HeatCondition.NONE; + requiredHeat = null; keepHeldItem = false; } diff --git a/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipeSerializer.java b/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipeSerializer.java index 8a1d910fef..750b92e11f 100644 --- a/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipeSerializer.java +++ b/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipeSerializer.java @@ -5,6 +5,8 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import com.simibubi.create.api.recipe.HeatCondition; +import com.simibubi.create.api.registry.CreateBuiltInRegistries; import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeFactory; import com.simibubi.create.foundation.fluid.FluidHelper; import com.simibubi.create.foundation.fluid.FluidIngredient; @@ -45,9 +47,9 @@ protected void writeToJson(JsonObject json, T recipe) { if (processingDuration > 0) json.addProperty("processingTime", processingDuration); - HeatCondition requiredHeat = recipe.getRequiredHeat(); - if (requiredHeat != HeatCondition.NONE) - json.addProperty("heatRequirement", requiredHeat.serialize()); + HeatCondition heatCondition = recipe.getRequiredHeat(); + if (heatCondition != null) + json.addProperty("heatRequirement", CreateBuiltInRegistries.HEAT_CONDITION.getKey(heatCondition).toString()); recipe.writeAdditional(json); } @@ -81,8 +83,14 @@ protected T readFromJson(ResourceLocation recipeId, JsonObject json) { if (GsonHelper.isValidNode(json, "processingTime")) builder.duration(GsonHelper.getAsInt(json, "processingTime")); - if (GsonHelper.isValidNode(json, "heatRequirement")) - builder.requiresHeat(HeatCondition.deserialize(GsonHelper.getAsString(json, "heatRequirement"))); + if (GsonHelper.isValidNode(json, "heatRequirement")) { + String requirement = GsonHelper.getAsString(json, "heatRequirement"); + ResourceLocation location; + if (requirement.contains(":")) location = new ResourceLocation(requirement); + else location = new ResourceLocation("create", requirement); + + builder.requiresHeat(CreateBuiltInRegistries.HEAT_CONDITION.get(location)); + } T recipe = builder.build(); recipe.readAdditional(json); @@ -106,8 +114,8 @@ protected void writeToBuffer(FriendlyByteBuf buffer, T recipe) { fluidOutputs.forEach(o -> o.writeToPacket(buffer)); buffer.writeVarInt(recipe.getProcessingDuration()); - buffer.writeVarInt(recipe.getRequiredHeat() - .ordinal()); + if(recipe.getRequiredHeat() != null) + buffer.writeVarInt(recipe.getRequiredHeat().ordinal()); recipe.writeAdditional(buffer); } @@ -139,7 +147,7 @@ protected T readFromBuffer(ResourceLocation recipeId, FriendlyByteBuf buffer) { .withFluidIngredients(fluidIngredients) .withFluidOutputs(fluidResults) .duration(buffer.readVarInt()) - .requiresHeat(HeatCondition.values()[buffer.readVarInt()]) + .requiresHeat(BlazeBurnerHeatCondition.values()[buffer.readVarInt()]) .build(); recipe.readAdditional(buffer); return recipe; diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CreateMixingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CreateMixingRecipeGen.java index 5d4bb5f9f3..c506ea6f5b 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CreateMixingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CreateMixingRecipeGen.java @@ -6,7 +6,7 @@ import com.simibubi.create.Create; import com.simibubi.create.api.data.recipe.MixingRecipeGen; -import com.simibubi.create.content.processing.recipe.HeatCondition; +import com.simibubi.create.content.processing.recipe.BlazeBurnerHeatCondition; import com.simibubi.create.foundation.recipe.BlockTagIngredient; import net.minecraft.data.PackOutput; @@ -29,27 +29,27 @@ public final class CreateMixingRecipeGen extends MixingRecipeGen { TEMP_LAVA = create("lava_from_cobble", b -> b.require(Tags.Items.COBBLESTONE) .output(Fluids.LAVA, 50) - .requiresHeat(HeatCondition.SUPERHEATED)), + .requiresHeat(BlazeBurnerHeatCondition.SUPERHEATED)), TEA = create("tea", b -> b.require(Fluids.WATER, 250) .require(Tags.Fluids.MILK, 250) .require(ItemTags.LEAVES) .output(AllFluids.TEA.get(), 500) - .requiresHeat(HeatCondition.HEATED)), + .requiresHeat(BlazeBurnerHeatCondition.HEATED)), CHOCOLATE = create("chocolate", b -> b.require(Tags.Fluids.MILK, 250) .require(Items.SUGAR) .require(Items.COCOA_BEANS) .output(AllFluids.CHOCOLATE.get(), 250) - .requiresHeat(HeatCondition.HEATED)), + .requiresHeat(BlazeBurnerHeatCondition.HEATED)), CHOCOLATE_MELTING = create("chocolate_melting", b -> b.require(AllItems.BAR_OF_CHOCOLATE.get()) .output(AllFluids.CHOCOLATE.get(), 250) - .requiresHeat(HeatCondition.HEATED)), + .requiresHeat(BlazeBurnerHeatCondition.HEATED)), HONEY = create("honey", b -> b.require(Items.HONEY_BLOCK) .output(AllFluids.HONEY.get(), 1000) - .requiresHeat(HeatCondition.HEATED)), + .requiresHeat(BlazeBurnerHeatCondition.HEATED)), DOUGH = create("dough_by_mixing", b -> b.require(CreateRecipeProvider.I.wheatFlour()) .require(Fluids.WATER, 1000) @@ -58,7 +58,7 @@ public final class CreateMixingRecipeGen extends MixingRecipeGen { BRASS_INGOT = create("brass_ingot", b -> b.require(CreateRecipeProvider.I.copper()) .require(CreateRecipeProvider.I.zinc()) .output(AllItems.BRASS_INGOT.get(), 2) - .requiresHeat(HeatCondition.HEATED)), + .requiresHeat(BlazeBurnerHeatCondition.HEATED)), ANDESITE_ALLOY = create("andesite_alloy", b -> b.require(Blocks.ANDESITE) .require(CreateRecipeProvider.I.ironNugget())