diff --git a/src/generated/resources/.cache/2d64935085b86659cb7857bad9701dbf9bab6e4c b/src/generated/resources/.cache/2d64935085b86659cb7857bad9701dbf9bab6e4c index dd7a2193a7..a3ea408bd1 100644 --- a/src/generated/resources/.cache/2d64935085b86659cb7857bad9701dbf9bab6e4c +++ b/src/generated/resources/.cache/2d64935085b86659cb7857bad9701dbf9bab6e4c @@ -1,4 +1,4 @@ -// 1.20.1 2025-03-04T17:15:03.040498065 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)] +// 1.20.1 2025-03-05T02:05:42.8043072 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 @@ -4692,7 +4692,7 @@ f675c20350ed60da4878b5d6301f02c8c05624bd data/create/tags/blocks/fan_processing_ 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 +3fc1417f4bdeca026d5030e5824aad60ddfb243c 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 @@ -4701,7 +4701,7 @@ f675c20350ed60da4878b5d6301f02c8c05624bd data/create/tags/blocks/fan_processing_ 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 +1769a5df18dd038e61521ca3f0724a86e3e3010f data/create/tags/blocks/roots.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 @@ -4709,7 +4709,7 @@ f02fc9781e8f0ae33ed3b98cf4f46ba6927c7ff8 data/create/tags/blocks/sugar_cane_vari 8a6ad3c63fb0c436ec8109f39358213930effd5a data/create/tags/blocks/table_cloths.json 5def5088f7fd31b80e6f28c1c4ea146aa9d7d15b data/create/tags/blocks/toolboxes.json 2589b135c0e96ad29076569e144528fe32ea5b39 data/create/tags/blocks/tracks.json -1b6977d9a399cf6ee042e3f8f5e64e4d3cda5489 data/create/tags/blocks/tree_attachments.json +cdff80cc11ff4640e0f4f791b0b79d1721fd6b47 data/create/tags/blocks/tree_attachments.json da739ad2160e7df4e0e5cc89587670ce5e9450c3 data/create/tags/blocks/valve_handles.json 72143286fb5cb372a0696550e2eac76ca50e6fbc data/create/tags/blocks/windmill_sails.json a109dab3eeeae64b2eb909ae1b5027716c5dd271 data/create/tags/blocks/wrench_pickup.json @@ -4732,8 +4732,8 @@ d371dfd35e49a7bef19f59c03e7f4ae20992f03d data/create/tags/items/create_ingots.js 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 -66f80bf1fc05cbee8276d730e4900a043e28f47a data/create/tags/items/modded_stripped_wood.json +9bb292f10accc9d0746ea503f0b256450b5e8777 data/create/tags/items/modded_stripped_logs.json +d9e4eb01e8ad3932c942a8404bdeda2d63b3a64c data/create/tags/items/modded_stripped_wood.json cebf5fd98eddf5c14befdd47052be678eea79542 data/create/tags/items/packages.json f400870b8dbcd14238be3ec99c419093073ba3a6 data/create/tags/items/postboxes.json 695d75b352fd190b303c724d1aaee9bb786a903b data/create/tags/items/pressurized_air_sources.json @@ -4762,7 +4762,7 @@ e22493305e0cebfb7ededae122e19ee9dd24fc9d data/create/tags/items/stone_types/scor 5def5088f7fd31b80e6f28c1c4ea146aa9d7d15b data/create/tags/items/toolboxes.json 2589b135c0e96ad29076569e144528fe32ea5b39 data/create/tags/items/tracks.json a5b5711d1798473a9b25db5b7f749570ed0a2769 data/create/tags/items/upgrade_aquatic/coral.json -c27e162cf1c428d426ff3116bf383ca4c27a54f9 data/create/tags/items/upright_on_belt.json +8eb17a7e6a7ebde860839db211b8ae88596c9162 data/create/tags/items/upright_on_belt.json da739ad2160e7df4e0e5cc89587670ce5e9450c3 data/create/tags/items/valve_handles.json c59c9fc0cdd45de659aa8023d36f9decb90f708c data/create/tags/items/vanilla_stripped_logs.json 64441ac1daa64c81601b94b82b21c0ee862b6344 data/create/tags/items/vanilla_stripped_wood.json diff --git a/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 b/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 index 9a6cccccad..9842d735af 100644 --- a/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 +++ b/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 @@ -1,4 +1,4 @@ -// 1.20.1 2025-03-03T16:11:40.9779167 Create's Processing Recipes +// 1.20.1 2025-03-05T01:51:16.451444 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 @@ -15,6 +15,7 @@ c444abdd432670f6a2b508c513302e119cb07186 data/create/recipes/crushing/asurine_re 29e7e74108755e0a07b1d3d1e8d4dcaf2b401572 data/create/recipes/crushing/coal_ore.json d9a48b3aa36cfe4f792a31fd3ee50b442c1177f9 data/create/recipes/crushing/compat/aether/ambrosium_ore.json 81bdb03461bec6f8ca1201caa93805a751d7cda6 data/create/recipes/crushing/compat/aether/zanite_ore.json +6cccceaa8bd26d39e730d91e216a256ef48f49cd data/create/recipes/crushing/compat/ancient_aether/quartz_ore.json 73914b149bbd72251c1bd9a54cf6d087f6b2ba0b data/create/recipes/crushing/compat/byg/ametrine_ore.json d468d9fbd206bd78dc3cc37ce6fcccbc3a89bc5c data/create/recipes/crushing/compat/byg/anthracite_ore.json 3481a8838049addc6d3514615fccab01a7eda830 data/create/recipes/crushing/compat/byg/blue_nether_gold_ore.json @@ -26,6 +27,7 @@ b4e8eed87747da8dfdfe2ad3ffd8534b900b38ad data/create/recipes/crushing/compat/byg 9c6b0c1f78c5027b4e781f3126a734b65cb40f46 data/create/recipes/crushing/compat/byg/lignite_ore.json 06bae2f87dfe431c1f5df9675de5ce2a6aac7802 data/create/recipes/crushing/compat/byg/pervaded_netherrack.json a7177964fe7921dbca27197c6271d6d8c5264665 data/create/recipes/crushing/compat/byg/red_rock.json +834bb7ff61aa3ca7a8c5062fae993c4e3cd27136 data/create/recipes/crushing/compat/deep_aether/skyjade_ore.json 808305f43b6a4d3fe2030ba55a86c510346ff164 data/create/recipes/crushing/compat/druidcraft/amber_ore.json ae0691d4885a8b67c1ba1f7f3b4f8fc6db9de403 data/create/recipes/crushing/compat/druidcraft/fiery_glass_ore.json 375daf4d1a5d847a253ce817b8fe99d47526cbb5 data/create/recipes/crushing/compat/druidcraft/moonstone_ore.json @@ -158,6 +160,10 @@ b135e3faf6afef4b6a5f00197997b47ff8e90568 data/create/recipes/crushing/wool.json 931a66992ccb5accdb435dca6fe6532e86250c0d data/create/recipes/crushing/zinc_ore.json cdb26cd91feeda5901f31f57c16517dda5287810 data/create/recipes/cutting/andesite_alloy.json 4ac4bb94de7b25a3eec85e8290ab5f2f6b2b4167 data/create/recipes/cutting/bamboo_planks.json +cc8b3de42fc5236db9eb51ab4f81cdc2186bb9af data/create/recipes/cutting/compat/aether/golden_oak_log.json +2857293080dabab340d0b18b36d9299d7e8cad06 data/create/recipes/cutting/compat/aether/golden_oak_wood.json +263d8bdf83a310f83ec76ec95b5177d550d842ac data/create/recipes/cutting/compat/aether_redux/sporing_blightwillow_log.json +75e4569b22ab71e45d2289451c9ef8093a7d2062 data/create/recipes/cutting/compat/aether_redux/sporing_blightwillow_wood.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 @@ -299,7 +305,11 @@ b19f74374347bb123ad32b9d1bb680763467fe1d data/create/recipes/deploying/weathered 5458bc361b6022323c7aeed19cbd4f9d278b55bb data/create/recipes/deploying/weathered_cut_copper_stairs_from_deoxidising.json 0e05f35e930aa74cc64c91f5a69615aaa0e52565 data/create/recipes/deploying/weathered_cut_copper_stairs_from_removing_wax.json 6a9fa669a5cbdc2406ecc5eaf6992e0e8fa83b88 data/create/recipes/emptying/builders_tea.json +6087155b0621d53315536cf048583545ffbb5fea data/create/recipes/emptying/compat/aether/milk_bucket.json +d0e25dd0209cf1ff9bc42d9c216e5635a2369e7d data/create/recipes/emptying/compat/aether/water_bucket.json 0b20bddac967edea53442c05c59ccf3306e9eb76 data/create/recipes/emptying/compat/alexsmobs/lava_bottle.json +0a0c27d12da11be6b77973cbf9ed0bf4a2a4427e data/create/recipes/emptying/compat/deep_aether/poison_bucket.json +d497d99fda84724250e57184de361b522b9bc7c1 data/create/recipes/emptying/compat/deep_aether/skyroot_poison_bucket.json 5fb7e705b53ed84b607858be1db6a6d2765bea9c data/create/recipes/emptying/compat/farmersdelight/milk_bottle.json 054bd7804a710c498f605b82fd7d5055a4762829 data/create/recipes/emptying/compat/neapolitan/milk_bottle.json ab35f7d885d8f2c8ccf562938ac804f6cb4c38ad data/create/recipes/emptying/honey_bottle.json @@ -307,8 +317,11 @@ b4e78bf89677ff211c9a740231836ae0598cf0d8 data/create/recipes/filling/blaze_cake. aea7837e33bfcbdd1e0b4386372b6595fd00ad1d data/create/recipes/filling/builders_tea.json 0c69ff301d149af8d36be10a1e49b0be53a21a49 data/create/recipes/filling/chocolate_glazed_berries.json 2d3b2d7c28fc0ea9f18be73d9523456b5c5946da data/create/recipes/filling/compat/aether/aether_grass_block.json +15d3592a9c442182c980b00ea4a2d1eaf62ffeea data/create/recipes/filling/compat/aether/milk_bucket.json +5fb53669c7904cd0b0f0d15098c05a0ff4ac7f4e data/create/recipes/filling/compat/aether/water_bucket.json f158f5e509b43746871722edf802984e2b9cc024 data/create/recipes/filling/compat/alexsmobs/lava_bottle.json 5770b60bd7e89f2cac74df71b463a1101601d86f data/create/recipes/filling/compat/byg/lush_grass_block.json +fa4050b344207da164d551b644c4a1198997a797 data/create/recipes/filling/compat/deep_aether/skyroot_poison_bucket.json 1280689ba81877c6583c6941ed307ca35d4f00e4 data/create/recipes/filling/compat/farmersdelight/milk_bottle.json a48a8862847dab2a75f8e2710203ed5f7d00533e data/create/recipes/filling/compat/immersiveengineering/treated_wood_in_spout.json fd578bb1e05901d0b959b1f445273619b55cde57 data/create/recipes/filling/compat/neapolitan/milk_bottle.json @@ -370,6 +383,29 @@ de5a7460348c3301381dd2635ac433a473bec04a data/create/recipes/milling/compat/ae2/ 42151b6f50df8e05a7399eaa386369474a5a618c data/create/recipes/milling/compat/ae2/ender_pearl.json b383c64d2559cd757b84fd5651f77c9ea95ebb00 data/create/recipes/milling/compat/ae2/fluix_crystal.json 880cfc22f510351e54a82242d6bc86acab4c3c92 data/create/recipes/milling/compat/ae2/sky_stone_block.json +f0001aeeb8169fb68337b845f484ef420ac1c0b2 data/create/recipes/milling/compat/aether/purple_flower.json +4a65fbbfbcbdac443993b5aeee270a12213f1083 data/create/recipes/milling/compat/aether/white_flower.json +b254a24f0035a2077675e3de2865b686eb72c63a data/create/recipes/milling/compat/aether_redux/aurum.json +6849b110f5825de0db95cae3deabeacc35493233 data/create/recipes/milling/compat/aether_redux/blightshade.json +70379b33059bfa90f8c0fc99a546790826295efd data/create/recipes/milling/compat/aether_redux/daggerbloom.json +761109c6215f030e329c8ea7988b35f85506319c data/create/recipes/milling/compat/aether_redux/fieldsproot_petals.json +e448714718d21fd7b4426a7eba6157209e3889ee data/create/recipes/milling/compat/aether_redux/flareblossom.json +9019c715b053181a9e82c900a883822f6b61da68 data/create/recipes/milling/compat/aether_redux/golden_clover.json +abcde7371f3fe4f1c6bd4006a685cef23e7cb047 data/create/recipes/milling/compat/aether_redux/infernia.json +18cb040a863d5d20320739b9fb838814d189837e data/create/recipes/milling/compat/aether_redux/iridia.json +639d5ef20c8b0b0fe60fdd2dd7e4dca1fcdac593 data/create/recipes/milling/compat/aether_redux/lumina.json +1cdc9a0be783221dacf03c6e7d7604bec1093b79 data/create/recipes/milling/compat/aether_redux/luxweed.json +2588b7c095a5483320545a9f39837aa4c028d353 data/create/recipes/milling/compat/aether_redux/skysprouts.json +645e91c1c27d0019aeb7025ddefe4c5b999d4c52 data/create/recipes/milling/compat/aether_redux/spirolyctil.json +f5d706d9031b64091e648adfa58ae523ca795cf2 data/create/recipes/milling/compat/aether_redux/theratip.json +bddb3a7e2d3cc6f1b6d3dca64e5fd3865cb20e8f data/create/recipes/milling/compat/aether_redux/wyndsprouts.json +7dd16c7ac7f0168e94b0c0d6f8a7631b3f1432ab data/create/recipes/milling/compat/aether_redux/xaelia_patch.json +c9dfdbf0ce6fd276d9be13f93a70cb7f39276764 data/create/recipes/milling/compat/aether_redux/zyatrix.json +9dfa3f5925ed86c44c7d15794701e8952aed3646 data/create/recipes/milling/compat/ancient_aether/elevetia.json +8464d55a2c378e846988bf1286b6fa85695164f2 data/create/recipes/milling/compat/ancient_aether/sky_blues.json +1ab1aede8c571d0711aa040f143c8d71caa38ab0 data/create/recipes/milling/compat/ancient_aether/sunset_rose.json +474616f5d930ddf8c11dcf7a4c2e567c50a30e90 data/create/recipes/milling/compat/ancient_aether/valkyrie_clay.json +2518f6143501374cd7c2ac1a7b978f31f699625f data/create/recipes/milling/compat/ancient_aether/wynd_thistle.json d6c091225197381abae8bdba35318aa3a8bde1ad data/create/recipes/milling/compat/atmospheric/gilia.json 9dce11179bf92dc0519fad4b41c944a25226abff data/create/recipes/milling/compat/atmospheric/hot_monkey_brush.json fd427a15577f3ea5612667e6b148ff253d2fd021 data/create/recipes/milling/compat/atmospheric/scalding_monkey_brush.json @@ -463,6 +499,21 @@ eb9606bbb2e4c6fb82b6607c8d5c23834d9e44a8 data/create/recipes/milling/compat/byg/ 1732969a11d677b825758f6c4af2cdbcdc365898 data/create/recipes/milling/compat/byg/winter_scilla.json 9266eaf6e2259fccb6e2aa57a9e19fc1faeb53fe data/create/recipes/milling/compat/byg/yellow_daffodil.json fda00f49b9a5758ee7d24f2aeab81a3cc690544a data/create/recipes/milling/compat/byg/yellow_tulip.json +de7e32322d85317ba0701164cc4060c9d47d252d data/create/recipes/milling/compat/deep_aether/aerlavender.json +7e370e6e977cb08cb6f0cee7823eb815155d7169 data/create/recipes/milling/compat/deep_aether/aether_cattails.json +f63fe4c4d47daf39f6097e9b0325fde0aee77f8a data/create/recipes/milling/compat/deep_aether/echaisy.json +3692a1676806c5ced1e62989343aef37013f9da1 data/create/recipes/milling/compat/deep_aether/enchanted_blossom.json +9c19cada7ee65801eabe578cd9eec9255c227c71 data/create/recipes/milling/compat/deep_aether/golden_aspess.json +bb5bfece9fadfd95d42fab5ff21df745cb82fb83 data/create/recipes/milling/compat/deep_aether/golden_flower.json +0a9e4d848d18badd38749a7b6bf38f81196987aa data/create/recipes/milling/compat/deep_aether/iaspove.json +a1762f0c988ffb9c4060fdbc43e9bd1ed05ac0cd data/create/recipes/milling/compat/deep_aether/medium_grass.json +9900930dea690e2521f093ed20d6f8d667e1e250 data/create/recipes/milling/compat/deep_aether/mini_grass.json +d1b1439701e35b0910e070b9528a7536134af1e0 data/create/recipes/milling/compat/deep_aether/radiant_orchid.json +fc04fb70250c4309f2b932ae5f59595afd040c17 data/create/recipes/milling/compat/deep_aether/short_grass.json +30081ff2e3a7a66e1796580fc99625fe729f8362 data/create/recipes/milling/compat/deep_aether/sky_tulips.json +cddc00587741bcf98c921d4fd1e4586531f0c1a6 data/create/recipes/milling/compat/deep_aether/tall_aerlavender.json +ea9cf26f3d537bf8dd6fd1f8819ecceba6939211 data/create/recipes/milling/compat/deep_aether/tall_aether_cattails.json +ed1c8fccf084d5697a7d095aef58bd304b322848 data/create/recipes/milling/compat/deep_aether/tall_grass.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 @@ -567,6 +618,7 @@ d06c1d0362dccc4e5f8b22f851dc8316b35c06b0 data/create/recipes/mixing/brass_ingot. 840a9008d4531425beadfcf224d21e938acc4502 data/create/recipes/mixing/chocolate.json e7b86d4ca5de2df474794424d93b447e5f9dcdc3 data/create/recipes/mixing/chocolate_melting.json 39e832016fa5e360434271505d09ced17a40e7eb data/create/recipes/mixing/compat/ae2/fluix_crystal.json +193e890056528264d70ce7c5fc2981e224bf0271 data/create/recipes/mixing/compat/deep_aether/aether_mud.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 @@ -589,6 +641,7 @@ fb6d54e0ee3c8831060a8573d16814217888ae0e data/create/recipes/pressing/compat/bet 77dbbdd01f36f1ede5018bc1feb3dff960988129 data/create/recipes/pressing/compat/betterendforge/pink_moss_path.json 200b0a7f459b4c5f5bd7d6fe46ad1959923b9cb0 data/create/recipes/pressing/compat/betterendforge/shadow_grass_path.json 8a53f6ea8dab59477d462eb929f7815f52b34095 data/create/recipes/pressing/compat/byg/lush_grass_path.json +bfed988091701a749d337c2d78e9fb820b8d9aa0 data/create/recipes/pressing/compat/deep_aether/golden_heights_dirt_path.json 4454d7dda6c2b5555227c5c147373df195adedb4 data/create/recipes/pressing/compat/environmental/mycelium_path.json ed3edcf493402051fcff435a5840295b218a078c data/create/recipes/pressing/compat/environmental/podzol_path.json 39fc8e85aad2f06ca042905b2398fde9fec13a74 data/create/recipes/pressing/compat/immersiveengineering/plate_aluminum.json diff --git a/src/generated/resources/data/create/recipes/crushing/compat/ancient_aether/quartz_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/ancient_aether/quartz_ore.json new file mode 100644 index 0000000000..4c64599060 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/ancient_aether/quartz_ore.json @@ -0,0 +1,32 @@ +{ + "type": "create:crushing", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ancient_aether" + } + ], + "ingredients": [ + { + "item": "ancient_aether:aether_quartz_ore" + } + ], + "processingTime": 150, + "results": [ + { + "item": "minecraft:quartz" + }, + { + "chance": 0.75, + "item": "minecraft:quartz" + }, + { + "chance": 0.125, + "item": "aether:holystone" + }, + { + "chance": 0.75, + "item": "create:experience_nugget" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/deep_aether/skyjade_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/deep_aether/skyjade_ore.json new file mode 100644 index 0000000000..d6db2e0d8a --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/deep_aether/skyjade_ore.json @@ -0,0 +1,32 @@ +{ + "type": "create:crushing", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "deep_aether:skyjade_ore" + } + ], + "processingTime": 150, + "results": [ + { + "item": "deep_aether:skyjade" + }, + { + "chance": 0.75, + "item": "deep_aether:skyjade" + }, + { + "chance": 0.125, + "item": "aether:holystone" + }, + { + "chance": 0.75, + "item": "create:experience_nugget" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/aether/golden_oak_log.json b/src/generated/resources/data/create/recipes/cutting/compat/aether/golden_oak_log.json new file mode 100644 index 0000000000..63e4c15089 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/aether/golden_oak_log.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether" + } + ], + "ingredients": [ + { + "item": "aether:golden_oak_log" + } + ], + "processingTime": 50, + "results": [ + { + "item": "aether:stripped_skyroot_log" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/aether/golden_oak_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/aether/golden_oak_wood.json new file mode 100644 index 0000000000..c31f2ff8b5 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/aether/golden_oak_wood.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether" + } + ], + "ingredients": [ + { + "item": "aether:golden_oak_wood" + } + ], + "processingTime": 50, + "results": [ + { + "item": "aether:stripped_skyroot_wood" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/aether_redux/sporing_blightwillow_log.json b/src/generated/resources/data/create/recipes/cutting/compat/aether_redux/sporing_blightwillow_log.json new file mode 100644 index 0000000000..5544118819 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/aether_redux/sporing_blightwillow_log.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether_redux" + } + ], + "ingredients": [ + { + "item": "aether_redux:sporing_blightwillow_log" + } + ], + "processingTime": 50, + "results": [ + { + "item": "aether_redux:stripped_blightwillow_log" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/aether_redux/sporing_blightwillow_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/aether_redux/sporing_blightwillow_wood.json new file mode 100644 index 0000000000..912fac7428 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/aether_redux/sporing_blightwillow_wood.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether_redux" + } + ], + "ingredients": [ + { + "item": "aether_redux:sporing_blightwillow_wood" + } + ], + "processingTime": 50, + "results": [ + { + "item": "aether_redux:stripped_blightwillow_wood" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/emptying/compat/aether/milk_bucket.json b/src/generated/resources/data/create/recipes/emptying/compat/aether/milk_bucket.json new file mode 100644 index 0000000000..60bd5a082a --- /dev/null +++ b/src/generated/resources/data/create/recipes/emptying/compat/aether/milk_bucket.json @@ -0,0 +1,23 @@ +{ + "type": "create:emptying", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether" + } + ], + "ingredients": [ + { + "item": "aether:skyroot_milk_bucket" + } + ], + "results": [ + { + "item": "aether:skyroot_bucket" + }, + { + "amount": 1000, + "fluid": "minecraft:milk" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/emptying/compat/aether/water_bucket.json b/src/generated/resources/data/create/recipes/emptying/compat/aether/water_bucket.json new file mode 100644 index 0000000000..1a476a18e2 --- /dev/null +++ b/src/generated/resources/data/create/recipes/emptying/compat/aether/water_bucket.json @@ -0,0 +1,23 @@ +{ + "type": "create:emptying", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether" + } + ], + "ingredients": [ + { + "item": "aether:skyroot_water_bucket" + } + ], + "results": [ + { + "item": "aether:skyroot_bucket" + }, + { + "amount": 1000, + "fluid": "minecraft:water" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/emptying/compat/deep_aether/poison_bucket.json b/src/generated/resources/data/create/recipes/emptying/compat/deep_aether/poison_bucket.json new file mode 100644 index 0000000000..245d61b1ff --- /dev/null +++ b/src/generated/resources/data/create/recipes/emptying/compat/deep_aether/poison_bucket.json @@ -0,0 +1,23 @@ +{ + "type": "create:emptying", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "deep_aether:poison_bucket" + } + ], + "results": [ + { + "item": "minecraft:bucket" + }, + { + "amount": 1000, + "fluid": "deep_aether:poison_fluid" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/emptying/compat/deep_aether/skyroot_poison_bucket.json b/src/generated/resources/data/create/recipes/emptying/compat/deep_aether/skyroot_poison_bucket.json new file mode 100644 index 0000000000..50b9e219cf --- /dev/null +++ b/src/generated/resources/data/create/recipes/emptying/compat/deep_aether/skyroot_poison_bucket.json @@ -0,0 +1,23 @@ +{ + "type": "create:emptying", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "aether:skyroot_poison_bucket" + } + ], + "results": [ + { + "item": "aether:skyroot_bucket" + }, + { + "amount": 1000, + "fluid": "deep_aether:poison_fluid" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/filling/compat/aether/milk_bucket.json b/src/generated/resources/data/create/recipes/filling/compat/aether/milk_bucket.json new file mode 100644 index 0000000000..651d1fd894 --- /dev/null +++ b/src/generated/resources/data/create/recipes/filling/compat/aether/milk_bucket.json @@ -0,0 +1,23 @@ +{ + "type": "create:filling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether" + } + ], + "ingredients": [ + { + "item": "aether:skyroot_bucket" + }, + { + "amount": 1000, + "fluidTag": "forge:milk" + } + ], + "results": [ + { + "item": "aether:skyroot_milk_bucket" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/filling/compat/aether/water_bucket.json b/src/generated/resources/data/create/recipes/filling/compat/aether/water_bucket.json new file mode 100644 index 0000000000..0a3758f6dc --- /dev/null +++ b/src/generated/resources/data/create/recipes/filling/compat/aether/water_bucket.json @@ -0,0 +1,24 @@ +{ + "type": "create:filling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether" + } + ], + "ingredients": [ + { + "item": "aether:skyroot_bucket" + }, + { + "amount": 1000, + "fluid": "minecraft:water", + "nbt": {} + } + ], + "results": [ + { + "item": "aether:skyroot_water_bucket" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/filling/compat/deep_aether/skyroot_poison_bucket.json b/src/generated/resources/data/create/recipes/filling/compat/deep_aether/skyroot_poison_bucket.json new file mode 100644 index 0000000000..b61cc3042e --- /dev/null +++ b/src/generated/resources/data/create/recipes/filling/compat/deep_aether/skyroot_poison_bucket.json @@ -0,0 +1,23 @@ +{ + "type": "create:filling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "aether:skyroot_bucket" + }, + { + "amount": 1000, + "fluid": "deep_aether:poison_fluid" + } + ], + "results": [ + { + "item": "aether:skyroot_poison_bucket" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/aether/purple_flower.json b/src/generated/resources/data/create/recipes/milling/compat/aether/purple_flower.json new file mode 100644 index 0000000000..a2f2cefb1e --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/aether/purple_flower.json @@ -0,0 +1,21 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether" + } + ], + "ingredients": [ + { + "item": "aether:purple_flower" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:purple_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/aether/white_flower.json b/src/generated/resources/data/create/recipes/milling/compat/aether/white_flower.json new file mode 100644 index 0000000000..0927f12dcd --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/aether/white_flower.json @@ -0,0 +1,21 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether" + } + ], + "ingredients": [ + { + "item": "aether:white_flower" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:white_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/aether_redux/aurum.json b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/aurum.json new file mode 100644 index 0000000000..4d9a1f5fcd --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/aurum.json @@ -0,0 +1,21 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether_redux" + } + ], + "ingredients": [ + { + "item": "aether_redux:aurum" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:yellow_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/aether_redux/blightshade.json b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/blightshade.json new file mode 100644 index 0000000000..a6dd78a390 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/blightshade.json @@ -0,0 +1,25 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether_redux" + } + ], + "ingredients": [ + { + "item": "aether_redux:blightshade" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:purple_dye" + }, + { + "chance": 0.25, + "item": "minecraft:black_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/aether_redux/daggerbloom.json b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/daggerbloom.json new file mode 100644 index 0000000000..b10a65a4cf --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/daggerbloom.json @@ -0,0 +1,25 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether_redux" + } + ], + "ingredients": [ + { + "item": "aether_redux:daggerbloom" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:white_dye" + }, + { + "chance": 0.25, + "item": "minecraft:light_blue_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/aether_redux/fieldsproot_petals.json b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/fieldsproot_petals.json new file mode 100644 index 0000000000..300910d91a --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/fieldsproot_petals.json @@ -0,0 +1,33 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether_redux" + } + ], + "ingredients": [ + { + "item": "aether_redux:fieldsproot_petals" + } + ], + "processingTime": 50, + "results": [ + { + "chance": 0.25, + "item": "minecraft:light_blue_dye" + }, + { + "chance": 0.25, + "item": "minecraft:pink_dye" + }, + { + "chance": 0.25, + "item": "minecraft:magenta_dye" + }, + { + "chance": 0.25, + "item": "minecraft:black_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/aether_redux/flareblossom.json b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/flareblossom.json new file mode 100644 index 0000000000..674a64de4a --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/flareblossom.json @@ -0,0 +1,26 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether_redux" + } + ], + "ingredients": [ + { + "item": "aether_redux:flareblossom" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:white_dye" + }, + { + "chance": 0.25, + "count": 2, + "item": "minecraft:red_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/aether_redux/golden_clover.json b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/golden_clover.json new file mode 100644 index 0000000000..20167f0c19 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/golden_clover.json @@ -0,0 +1,21 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether_redux" + } + ], + "ingredients": [ + { + "item": "aether_redux:golden_clover" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:yellow_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/aether_redux/infernia.json b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/infernia.json new file mode 100644 index 0000000000..d4d0e18765 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/infernia.json @@ -0,0 +1,29 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether_redux" + } + ], + "ingredients": [ + { + "item": "aether_redux:infernia" + } + ], + "processingTime": 50, + "results": [ + { + "item": "minecraft:blaze_powder" + }, + { + "chance": 0.5, + "item": "minecraft:blaze_powder" + }, + { + "chance": 0.25, + "count": 2, + "item": "minecraft:orange_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/aether_redux/iridia.json b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/iridia.json new file mode 100644 index 0000000000..196565af52 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/iridia.json @@ -0,0 +1,21 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether_redux" + } + ], + "ingredients": [ + { + "item": "aether_redux:iridia" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:magenta_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/aether_redux/lumina.json b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/lumina.json new file mode 100644 index 0000000000..8ae712f2e2 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/lumina.json @@ -0,0 +1,21 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether_redux" + } + ], + "ingredients": [ + { + "item": "aether_redux:lumina" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:black_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/aether_redux/luxweed.json b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/luxweed.json new file mode 100644 index 0000000000..db3464f2d4 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/luxweed.json @@ -0,0 +1,24 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether_redux" + } + ], + "ingredients": [ + { + "item": "aether_redux:luxweed" + } + ], + "processingTime": 50, + "results": [ + { + "item": "minecraft:light_blue_dye" + }, + { + "chance": 0.5, + "item": "minecraft:purple_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/aether_redux/skysprouts.json b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/skysprouts.json new file mode 100644 index 0000000000..a70196a4ad --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/skysprouts.json @@ -0,0 +1,21 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether_redux" + } + ], + "ingredients": [ + { + "item": "aether_redux:skysprouts" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:light_blue_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/aether_redux/spirolyctil.json b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/spirolyctil.json new file mode 100644 index 0000000000..3d55b4dbb7 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/spirolyctil.json @@ -0,0 +1,25 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether_redux" + } + ], + "ingredients": [ + { + "item": "aether_redux:spirolyctil" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:light_blue_dye" + }, + { + "chance": 0.25, + "item": "minecraft:purple_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/aether_redux/theratip.json b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/theratip.json new file mode 100644 index 0000000000..2b460a3cd2 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/theratip.json @@ -0,0 +1,21 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether_redux" + } + ], + "ingredients": [ + { + "item": "aether_redux:theratip" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:pink_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/aether_redux/wyndsprouts.json b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/wyndsprouts.json new file mode 100644 index 0000000000..8478a38341 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/wyndsprouts.json @@ -0,0 +1,21 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether_redux" + } + ], + "ingredients": [ + { + "item": "aether_redux:wyndsprouts" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:light_gray_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/aether_redux/xaelia_patch.json b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/xaelia_patch.json new file mode 100644 index 0000000000..17d0cd1698 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/xaelia_patch.json @@ -0,0 +1,21 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether_redux" + } + ], + "ingredients": [ + { + "item": "aether_redux:xaelia_patch" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:light_gray_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/aether_redux/zyatrix.json b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/zyatrix.json new file mode 100644 index 0000000000..62cd84125e --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/aether_redux/zyatrix.json @@ -0,0 +1,25 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether_redux" + } + ], + "ingredients": [ + { + "item": "aether_redux:zyatrix" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:purple_dye" + }, + { + "chance": 0.25, + "item": "minecraft:orange_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/ancient_aether/elevetia.json b/src/generated/resources/data/create/recipes/milling/compat/ancient_aether/elevetia.json new file mode 100644 index 0000000000..5f5d99da33 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/ancient_aether/elevetia.json @@ -0,0 +1,25 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ancient_aether" + } + ], + "ingredients": [ + { + "item": "ancient_aether:elevetia" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:purple_dye" + }, + { + "chance": 0.25, + "item": "minecraft:black_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/ancient_aether/sky_blues.json b/src/generated/resources/data/create/recipes/milling/compat/ancient_aether/sky_blues.json new file mode 100644 index 0000000000..7077c50601 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/ancient_aether/sky_blues.json @@ -0,0 +1,21 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ancient_aether" + } + ], + "ingredients": [ + { + "item": "ancient_aether:sky_blues" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:cyan_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/ancient_aether/sunset_rose.json b/src/generated/resources/data/create/recipes/milling/compat/ancient_aether/sunset_rose.json new file mode 100644 index 0000000000..53d7e5fe8a --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/ancient_aether/sunset_rose.json @@ -0,0 +1,21 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ancient_aether" + } + ], + "ingredients": [ + { + "item": "ancient_aether:sunset_rose" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:red_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/ancient_aether/valkyrie_clay.json b/src/generated/resources/data/create/recipes/milling/compat/ancient_aether/valkyrie_clay.json new file mode 100644 index 0000000000..ada6815013 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/ancient_aether/valkyrie_clay.json @@ -0,0 +1,19 @@ +{ + "type": "create:milling", + "ingredients": [ + { + "item": "ancient_aether:valkyrie_clay" + } + ], + "processingTime": 50, + "results": [ + { + "count": 3, + "item": "ancient_aether:valkyrie_clay_ball" + }, + { + "chance": 0.5, + "item": "ancient_aether:valkyrie_clay_ball" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/ancient_aether/wynd_thistle.json b/src/generated/resources/data/create/recipes/milling/compat/ancient_aether/wynd_thistle.json new file mode 100644 index 0000000000..aa00906b22 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/ancient_aether/wynd_thistle.json @@ -0,0 +1,21 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ancient_aether" + } + ], + "ingredients": [ + { + "item": "ancient_aether:wynd_thistle" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:light_blue_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/deep_aether/aerlavender.json b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/aerlavender.json new file mode 100644 index 0000000000..6783016e66 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/aerlavender.json @@ -0,0 +1,21 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "deep_aether:aerlavender" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:pink_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/deep_aether/aether_cattails.json b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/aether_cattails.json new file mode 100644 index 0000000000..e010991da4 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/aether_cattails.json @@ -0,0 +1,21 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "deep_aether:aether_cattails" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:cyan_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/deep_aether/echaisy.json b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/echaisy.json new file mode 100644 index 0000000000..d1b0d87de0 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/echaisy.json @@ -0,0 +1,21 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "deep_aether:echaisy" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:purple_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/deep_aether/enchanted_blossom.json b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/enchanted_blossom.json new file mode 100644 index 0000000000..8e737cd234 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/enchanted_blossom.json @@ -0,0 +1,25 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "deep_aether:enchanted_blossom" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:white_dye" + }, + { + "chance": 0.25, + "item": "minecraft:yellow_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/deep_aether/golden_aspess.json b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/golden_aspess.json new file mode 100644 index 0000000000..5e555a83f1 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/golden_aspess.json @@ -0,0 +1,21 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "deep_aether:golden_aspess" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:orange_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/deep_aether/golden_flower.json b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/golden_flower.json new file mode 100644 index 0000000000..773f5958db --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/golden_flower.json @@ -0,0 +1,25 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "deep_aether:golden_flower" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:orange_dye" + }, + { + "chance": 0.25, + "item": "minecraft:pink_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/deep_aether/iaspove.json b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/iaspove.json new file mode 100644 index 0000000000..92a6f98aa8 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/iaspove.json @@ -0,0 +1,21 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "deep_aether:iaspove" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:blue_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/deep_aether/medium_grass.json b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/medium_grass.json new file mode 100644 index 0000000000..44c0048eb1 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/medium_grass.json @@ -0,0 +1,29 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "deep_aether:medium_golden_grass" + } + ], + "processingTime": 50, + "results": [ + { + "chance": 0.25, + "item": "minecraft:wheat_seeds" + }, + { + "chance": 0.2, + "item": "deep_aether:golden_grass_seeds" + }, + { + "chance": 0.02, + "item": "aether:ambrosium_shard" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/deep_aether/mini_grass.json b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/mini_grass.json new file mode 100644 index 0000000000..36e326742d --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/mini_grass.json @@ -0,0 +1,29 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "deep_aether:mini_golden_grass" + } + ], + "processingTime": 50, + "results": [ + { + "chance": 0.25, + "item": "minecraft:wheat_seeds" + }, + { + "chance": 0.2, + "item": "deep_aether:golden_grass_seeds" + }, + { + "chance": 0.02, + "item": "aether:ambrosium_shard" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/deep_aether/radiant_orchid.json b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/radiant_orchid.json new file mode 100644 index 0000000000..59bc807bfa --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/radiant_orchid.json @@ -0,0 +1,21 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "deep_aether:radiant_orchid" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:purple_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/deep_aether/short_grass.json b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/short_grass.json new file mode 100644 index 0000000000..c7396ff2d7 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/short_grass.json @@ -0,0 +1,29 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "deep_aether:short_golden_grass" + } + ], + "processingTime": 50, + "results": [ + { + "chance": 0.25, + "item": "minecraft:wheat_seeds" + }, + { + "chance": 0.2, + "item": "deep_aether:golden_grass_seeds" + }, + { + "chance": 0.02, + "item": "aether:ambrosium_shard" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/deep_aether/sky_tulips.json b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/sky_tulips.json new file mode 100644 index 0000000000..7e7672ff89 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/sky_tulips.json @@ -0,0 +1,21 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "deep_aether:sky_tulips" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "minecraft:red_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/deep_aether/tall_aerlavender.json b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/tall_aerlavender.json new file mode 100644 index 0000000000..c0102fa859 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/tall_aerlavender.json @@ -0,0 +1,26 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "deep_aether:tall_aerlavender" + } + ], + "processingTime": 50, + "results": [ + { + "count": 3, + "item": "minecraft:pink_dye" + }, + { + "chance": 0.25, + "count": 2, + "item": "minecraft:pink_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/deep_aether/tall_aether_cattails.json b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/tall_aether_cattails.json new file mode 100644 index 0000000000..e4a3067705 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/tall_aether_cattails.json @@ -0,0 +1,26 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "deep_aether:tall_aether_cattails" + } + ], + "processingTime": 50, + "results": [ + { + "count": 3, + "item": "minecraft:cyan_dye" + }, + { + "chance": 0.25, + "count": 2, + "item": "minecraft:cyan_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/deep_aether/tall_grass.json b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/tall_grass.json new file mode 100644 index 0000000000..93f838e63f --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/compat/deep_aether/tall_grass.json @@ -0,0 +1,29 @@ +{ + "type": "create:milling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "deep_aether:tall_golden_grass" + } + ], + "processingTime": 50, + "results": [ + { + "chance": 0.5, + "item": "minecraft:wheat_seeds" + }, + { + "chance": 0.4, + "item": "deep_aether:golden_grass_seeds" + }, + { + "chance": 0.04, + "item": "aether:ambrosium_shard" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/mixing/compat/deep_aether/aether_mud.json b/src/generated/resources/data/create/recipes/mixing/compat/deep_aether/aether_mud.json new file mode 100644 index 0000000000..89fb8125af --- /dev/null +++ b/src/generated/resources/data/create/recipes/mixing/compat/deep_aether/aether_mud.json @@ -0,0 +1,24 @@ +{ + "type": "create:mixing", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "aether:aether_dirt" + }, + { + "amount": 250, + "fluid": "minecraft:water", + "nbt": {} + } + ], + "results": [ + { + "item": "deep_aether:aether_mud" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/pressing/compat/deep_aether/golden_heights_dirt_path.json b/src/generated/resources/data/create/recipes/pressing/compat/deep_aether/golden_heights_dirt_path.json new file mode 100644 index 0000000000..7852cbd3fb --- /dev/null +++ b/src/generated/resources/data/create/recipes/pressing/compat/deep_aether/golden_heights_dirt_path.json @@ -0,0 +1,19 @@ +{ + "type": "create:pressing", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "deep_aether" + } + ], + "ingredients": [ + { + "item": "deep_aether:golden_heights_grass_block" + } + ], + "results": [ + { + "item": "deep_aether:golden_heights_dirt_path" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/blocks/fan_transparent.json b/src/generated/resources/data/create/tags/blocks/fan_transparent.json index 6dcdc1df9f..c1ceaebc1c 100644 --- a/src/generated/resources/data/create/tags/blocks/fan_transparent.json +++ b/src/generated/resources/data/create/tags/blocks/fan_transparent.json @@ -11,6 +11,10 @@ "minecraft:mangrove_roots", "#minecraft:campfires", "#minecraft:fences", - "#minecraft:leaves" + "#minecraft:leaves", + { + "id": "deep_aether:yagroot_roots", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/blocks/roots.json b/src/generated/resources/data/create/tags/blocks/roots.json index 43400c969a..588237af79 100644 --- a/src/generated/resources/data/create/tags/blocks/roots.json +++ b/src/generated/resources/data/create/tags/blocks/roots.json @@ -12,6 +12,10 @@ { "id": "twilightforest:mangrove_root", "required": false + }, + { + "id": "deep_aether:yagroot_roots", + "required": false } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/blocks/tree_attachments.json b/src/generated/resources/data/create/tags/blocks/tree_attachments.json index ca9da984ba..29269cc949 100644 --- a/src/generated/resources/data/create/tags/blocks/tree_attachments.json +++ b/src/generated/resources/data/create/tags/blocks/tree_attachments.json @@ -5,6 +5,38 @@ "minecraft:mangrove_propagule", "minecraft:moss_carpet", "minecraft:shroomlight", - "minecraft:vine" + "minecraft:vine", + { + "id": "aether_redux:cloudcap_stem_wall", + "required": false + }, + { + "id": "aether_redux:cloudcap_spores", + "required": false + }, + { + "id": "aether_redux:blightwillow_log_wall", + "required": false + }, + { + "id": "aether_redux:golden_vines", + "required": false + }, + { + "id": "aether_redux:golden_vines_plant", + "required": false + }, + { + "id": "deep_aether:aether_moss_carpet", + "required": false + }, + { + "id": "deep_aether:yagroot_vine", + "required": false + }, + { + "id": "deep_aether:sunroot_hanger", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/items/modded_stripped_logs.json b/src/generated/resources/data/create/tags/items/modded_stripped_logs.json index 2818f0e78a..edb6234fda 100644 --- a/src/generated/resources/data/create/tags/items/modded_stripped_logs.json +++ b/src/generated/resources/data/create/tags/items/modded_stripped_logs.json @@ -412,6 +412,54 @@ "id": "ars_elemental:stripped_yellow_archwood_log", "required": false }, + { + "id": "aether:stripped_skyroot_log", + "required": false + }, + { + "id": "deep_aether:stripped_roseroot_log", + "required": false + }, + { + "id": "deep_aether:stripped_yagroot_log", + "required": false + }, + { + "id": "deep_aether:stripped_cruderoot_log", + "required": false + }, + { + "id": "deep_aether:stripped_conberry_log", + "required": false + }, + { + "id": "deep_aether:stripped_sunroot_log", + "required": false + }, + { + "id": "ancient_aether:stripped_highsproot_log", + "required": false + }, + { + "id": "ancient_aether:stripped_sakura_log", + "required": false + }, + { + "id": "aether_redux:stripped_fieldsproot_log", + "required": false + }, + { + "id": "aether_redux:stripped_blightwillow_log", + "required": false + }, + { + "id": "aether_redux:stripped_crystal_log", + "required": false + }, + { + "id": "aether_redux:stripped_glacia_log", + "required": false + }, { "id": "autumnity:maple", "required": false @@ -443,6 +491,10 @@ { "id": "regions_unexplored:brimwood_log_magma", "required": false + }, + { + "id": "aether_redux:stripped_cloudcap_stem", + "required": false } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/items/modded_stripped_wood.json b/src/generated/resources/data/create/tags/items/modded_stripped_wood.json index 96989af657..989267aa87 100644 --- a/src/generated/resources/data/create/tags/items/modded_stripped_wood.json +++ b/src/generated/resources/data/create/tags/items/modded_stripped_wood.json @@ -412,6 +412,54 @@ "id": "ars_elemental:stripped_yellow_archwood", "required": false }, + { + "id": "aether:stripped_skyroot_wood", + "required": false + }, + { + "id": "deep_aether:stripped_roseroot_wood", + "required": false + }, + { + "id": "deep_aether:stripped_yagroot_wood", + "required": false + }, + { + "id": "deep_aether:stripped_cruderoot_wood", + "required": false + }, + { + "id": "deep_aether:stripped_conberry_wood", + "required": false + }, + { + "id": "deep_aether:stripped_sunroot_wood", + "required": false + }, + { + "id": "ancient_aether:stripped_highsproot_wood", + "required": false + }, + { + "id": "ancient_aether:stripped_sakura_wood", + "required": false + }, + { + "id": "aether_redux:stripped_fieldsproot_wood", + "required": false + }, + { + "id": "aether_redux:stripped_blightwillow_wood", + "required": false + }, + { + "id": "aether_redux:stripped_crystal_wood", + "required": false + }, + { + "id": "aether_redux:stripped_glacia_wood", + "required": false + }, { "id": "infernalexp:stripped_luminous_hyphae", "required": false @@ -435,6 +483,10 @@ { "id": "regions_unexplored:stripped_yellow_bioshroom_hyphae", "required": false + }, + { + "id": "aether_redux:stripped_cloudcap_hyphae", + "required": false } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/items/upright_on_belt.json b/src/generated/resources/data/create/tags/items/upright_on_belt.json index 9ccf6fcf6c..751ea7ce6f 100644 --- a/src/generated/resources/data/create/tags/items/upright_on_belt.json +++ b/src/generated/resources/data/create/tags/items/upright_on_belt.json @@ -12,6 +12,30 @@ "minecraft:cake", "minecraft:bowl", "minecraft:mushroom_stew", - "minecraft:suspicious_stew" + "minecraft:suspicious_stew", + { + "id": "aether:skyroot_bucket", + "required": false + }, + { + "id": "aether:skyroot_water_bucket", + "required": false + }, + { + "id": "aether:skyroot_milk_bucket", + "required": false + }, + { + "id": "aether:skyroot_remedy_bucket", + "required": false + }, + { + "id": "aether:skyroot_poison_bucket", + "required": false + }, + { + "id": "deep_aether:poison_bucket", + "required": false + } ] } \ No newline at end of file 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 d9cc5cdd98..0f2cabb781 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 @@ -7,6 +7,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.simibubi.create.foundation.data.SimpleDatagenIngredient; +import com.simibubi.create.foundation.data.recipe.DatagenFluidStack; import com.simibubi.create.foundation.data.recipe.Mods; import com.simibubi.create.foundation.fluid.FluidHelper; import com.simibubi.create.foundation.fluid.FluidIngredient; @@ -130,6 +131,10 @@ public ProcessingRecipeBuilder require(ResourceLocation ingredient) { return this; } + public ProcessingRecipeBuilder require(Mods mod, String fluid, int amount) { + return require(new FluidIngredient.DatagenFluidIngredient(mod.asResource(fluid), amount)); + } + public ProcessingRecipeBuilder require(Fluid fluid, int amount) { return require(FluidIngredient.fromFluid(fluid, amount)); } @@ -188,6 +193,10 @@ public ProcessingRecipeBuilder output(ProcessingOutput output) { return this; } + public ProcessingRecipeBuilder output(Mods mod, String fluid, int amount) { + return output(new DatagenFluidStack(mod.asResource(fluid), amount)); + } + public ProcessingRecipeBuilder output(Fluid fluid, int amount) { fluid = FluidHelper.convertToStill(fluid); return output(new FluidStack(fluid, amount)); diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java index 47dfb4f6c4..69fd629011 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java @@ -405,23 +405,39 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { .output(0.125f, Mods.AET, "holystone", 1) .output(0.75f, AllItems.EXP_NUGGET.get()) .whenModLoaded(Mods.AET.getId())), - + // IE - + IE_COKE_DUST = create(Mods.IE.recipeId("coal_coke"), b -> b.duration(200) .require(Mods.IE, "coal_coke").output(Mods.IE, "dust_coke") .whenModLoaded(Mods.IE.getId())), - + IE_COKE_BLOCK = create(Mods.IE.recipeId("coke_block"), b -> b.duration(200) .require(Mods.IE, "coke").output(1, Mods.IE.asResource("dust_coke"), 9) .whenModLoaded(Mods.IE.getId())), - + IE_SLAG_GRAVEL = create(Mods.IE.recipeId("slag"), b -> b.duration(200) .require(Mods.IE, "slag").output(Mods.IE, "slag_gravel") - .whenModLoaded(Mods.IE.getId())); + .whenModLoaded(Mods.IE.getId())), + // Deep Aether + D_AET_SKYJADE = create(Mods.D_AET.recipeId("skyjade_ore"), b -> b.duration(150) + .require(Mods.D_AET, "skyjade_ore") + .output(Mods.D_AET, "skyjade") + .output(0.75f, Mods.D_AET, "skyjade", 1) + .output(0.125f, Mods.AET, "holystone", 1) + .output(0.75f, AllItems.EXP_NUGGET.get()) + .whenModLoaded(Mods.D_AET.getId())), + + // Ancient Aether - ; + A_AET_QUARTZ = create(Mods.A_AET.recipeId("quartz_ore"), b -> b.duration(150) + .require(Mods.A_AET, "aether_quartz_ore") + .output(Items.QUARTZ) + .output(0.75f, Items.QUARTZ, 1) + .output(0.125f, Mods.AET, "holystone", 1) + .output(0.75f, AllItems.EXP_NUGGET.get()) + .whenModLoaded(Mods.A_AET.getId())); protected GeneratedRecipe mineralRecycling(AllPaletteStoneTypes type, Supplier crushed, Supplier nugget, float chance) { diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java index d351886050..67676d3f5e 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java @@ -30,7 +30,6 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { ARS_E_1 = stripAndMakePlanksDiffPlanksModId(Mods.ARS_E, null, "stripped_yellow_archwood_log", Mods.ARS_N, "archwood_planks"), ARS_E_2 = stripAndMakePlanksDiffPlanksModId(Mods.ARS_E, null, "stripped_yellow_archwood", Mods.ARS_N, "archwood_planks"), - // Regions Unexplored RU_1 = stripAndMakePlanks(Mods.RU, "brimwood_log_magma", "stripped_brimwood_log", null), RU_2 = stripAndMakePlanks(Mods.RU, "ashen_log", "stripped_dead_log", null), RU_3 = stripAndMakePlanks(Mods.RU, "ashen_wood", "stripped_dead_wood", null), @@ -45,9 +44,16 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { ENDERGETIC_1 = stripAndMakePlanks(Mods.ENDER, "glowing_poise_stem", "stripped_poise_stem", null), ENDERGETIC_2 = stripAndMakePlanks(Mods.ENDER, "glowing_poise_wood", "stripped_poise_wood", null), + // Aether + AET_1 = stripAndMakePlanks(Mods.AET, "golden_oak_log", "stripped_skyroot_log", null), + AET_2 = stripAndMakePlanks(Mods.AET, "golden_oak_wood", "stripped_skyroot_wood", null), + + // Aether Redux + AET_R_1 = stripAndMakePlanks(Mods.AET_R, "sporing_blightwillow_log", "stripped_blightwillow_log", null), + AET_R_2 = stripAndMakePlanks(Mods.AET_R, "sporing_blightwillow_wood", "stripped_blightwillow_wood", null), + // IE - IE_WIRES = ieWires("copper", "electrum", "aluminum", "steel", "lead") - ; + IE_WIRES = ieWires("copper", "electrum", "aluminum", "steel", "lead"); GeneratedRecipe stripAndMakePlanks(Block wood, Block stripped, Block planks) { return stripAndMakePlanks(wood, stripped, planks, 6); diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/DatagenFluidStack.java b/src/main/java/com/simibubi/create/foundation/data/recipe/DatagenFluidStack.java new file mode 100644 index 0000000000..8d50e1cefa --- /dev/null +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/DatagenFluidStack.java @@ -0,0 +1,29 @@ +package com.simibubi.create.foundation.data.recipe; + +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.material.Fluids; +import net.minecraftforge.fluids.FluidStack; + +import org.jetbrains.annotations.ApiStatus; + +/** + * Used to represent fluid outputs in recipe datagen without needing the fluid to exist at runtime. + */ +@ApiStatus.Internal +public final class DatagenFluidStack extends FluidStack { + private final ResourceLocation actualFluid; + + public DatagenFluidStack(ResourceLocation fluid, int amount) { + // This fluid is a farce + super(Fluids.WATER, amount); + actualFluid = fluid; + } + + /** + * Supersedes the result of getFluid() for the purpose of obtaining a string representation of the fluid + * @return String value of the actual fluid's ResourceLocation + */ + public String getActualFluid(){ + return actualFluid.toString(); + } +} diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/EmptyingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/EmptyingRecipeGen.java index b499a606fc..17f7ef5290 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/EmptyingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/EmptyingRecipeGen.java @@ -38,7 +38,27 @@ public class EmptyingRecipeGen extends ProcessingRecipeGen { NEO_MILK = create(Mods.NEA.recipeId("milk_bottle"), b -> b.require(Mods.FD, "milk_bottle") .output(ForgeMod.MILK.get(), 250) .output(Items.GLASS_BOTTLE) - .whenModLoaded(Mods.NEA.getId())) + .whenModLoaded(Mods.NEA.getId())), + + AET_MILK = create(Mods.AET.recipeId("milk_bucket"), b -> b.require(Mods.AET, "skyroot_milk_bucket") + .output(ForgeMod.MILK.get(), 1000) + .output(Mods.AET, "skyroot_bucket") + .whenModLoaded(Mods.AET.getId())), + + AET_WATER = create(Mods.AET.recipeId("water_bucket"), b -> b.require(Mods.AET, "skyroot_water_bucket") + .output(Fluids.WATER, 1000) + .output(Mods.AET, "skyroot_bucket") + .whenModLoaded(Mods.AET.getId())), + + D_AET_POISON_1 = create(Mods.D_AET.recipeId("poison_bucket"), b -> b.require(Mods.D_AET, "poison_bucket") + .output(Mods.D_AET, "poison_fluid", 1000) + .output(Items.BUCKET) + .whenModLoaded(Mods.D_AET.getId())), + + D_AET_POISON_2 = create(Mods.D_AET.recipeId("skyroot_poison_bucket"), b -> b.require(Mods.AET, "skyroot_poison_bucket") + .output(Mods.D_AET, "poison_fluid", 1000) + .output(Mods.AET, "skyroot_bucket") + .whenModLoaded(Mods.D_AET.getId())) ; diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/FillingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/FillingRecipeGen.java index 4e76c97f9f..b30a720e59 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/FillingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/FillingRecipeGen.java @@ -80,6 +80,16 @@ public class FillingRecipeGen extends ProcessingRecipeGen { AET_GRASS = moddedGrass(Mods.AET, "aether"), + AET_MILK_BUCKET = create(Mods.AET.recipeId("milk_bucket"), b -> b.require(Tags.Fluids.MILK, 1000) + .require(Mods.AET, "skyroot_bucket") + .output(Mods.AET, "skyroot_milk_bucket") + .whenModLoaded(Mods.AET.getId())), + + AET_WATER_BUCKET = create(Mods.AET.recipeId("water_bucket"), b -> b.require(Fluids.WATER, 1000) + .require(Mods.AET, "skyroot_bucket") + .output(Mods.AET, "skyroot_water_bucket") + .whenModLoaded(Mods.AET.getId())), + RU_PEAT_GRAS = moddedGrass(Mods.RU, "peat"), RU_SILT_GRAS = moddedGrass(Mods.RU, "silt"), @@ -90,15 +100,21 @@ public class FillingRecipeGen extends ProcessingRecipeGen { .require(Mods.VMP, "cursed_earth") .output(Mods.VMP, "cursed_grass") .whenModLoaded(Mods.VMP.getId())), - + // IE IE_TREATED_WOOD = create(Mods.IE.recipeId("treated_wood_in_spout"), b -> b.require(AllTags.forgeFluidTag("creosote"), 125) .require(I.planks()) .output(Mods.IE, "treated_wood_horizontal") - .whenModLoaded(Mods.IE.getId())); - + .whenModLoaded(Mods.IE.getId())), + + // Filling a normal bucket with Poison is already provided via Item Capabilities. + D_AET_POISON_BUCKET = create(Mods.D_AET.recipeId("skyroot_poison_bucket"), b -> b + .require(Mods.D_AET, "poison_fluid", 1000) + .require(Mods.AET, "skyroot_bucket") + .output(Mods.AET, "skyroot_poison_bucket") + .whenModLoaded(Mods.D_AET.getId())) ; public GeneratedRecipe moddedGrass(Mods mod, String name) { 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 5dd9aa72b3..ce8073a76f 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 @@ -718,9 +718,129 @@ public class MillingRecipeGen extends ProcessingRecipeGen { List.of(Items.YELLOW_DYE), List.of(2)), RU_YELLOW_SNOWBELLE = ruFlower("yellow_snowbelle", List.of(1f), - List.of(Items.YELLOW_DYE), List.of(2)) + List.of(Items.YELLOW_DYE), List.of(2)), - ; + // Aether + AET_PURPLE_FLOWER = modFlower(Mods.AET, "purple_flower", List.of(1f), + List.of(Items.PURPLE_DYE), List.of(2)), + + AET_WHITE_FLOWER = modFlower(Mods.AET, "white_flower", List.of(1f), + List.of(Items.WHITE_DYE), List.of(2)), + + // Deep Aether + D_AET_MINI_GRASS = create(Mods.D_AET.recipeId("mini_grass"), b -> b.duration(50) + .require(Mods.D_AET, "mini_golden_grass") + .output(0.25f, Items.WHEAT_SEEDS) + .output(0.2f, Mods.D_AET, "golden_grass_seeds", 1) + .output(0.02f, Mods.AET, "ambrosium_shard", 1) + .whenModLoaded(Mods.D_AET.getId())), + + D_AET_SHORT_GRASS = create(Mods.D_AET.recipeId("short_grass"), b -> b.duration(50) + .require(Mods.D_AET, "short_golden_grass") + .output(0.25f, Items.WHEAT_SEEDS) + .output(0.2f, Mods.D_AET, "golden_grass_seeds", 1) + .output(0.02f, Mods.AET, "ambrosium_shard", 1) + .whenModLoaded(Mods.D_AET.getId())), + + D_AET_MEDIUM_GRASS = create(Mods.D_AET.recipeId("medium_grass"), b -> b.duration(50) + .require(Mods.D_AET, "medium_golden_grass") + .output(0.25f, Items.WHEAT_SEEDS) + .output(0.2f, Mods.D_AET, "golden_grass_seeds", 1) + .output(0.02f, Mods.AET, "ambrosium_shard", 1) + .whenModLoaded(Mods.D_AET.getId())), + + D_AET_TALL_GRASS = create(Mods.D_AET.recipeId("tall_grass"), b -> b.duration(50) + .require(Mods.D_AET, "tall_golden_grass") + .output(0.5f, Items.WHEAT_SEEDS) + .output(0.4f, Mods.D_AET, "golden_grass_seeds", 1) + .output(0.04f, Mods.AET, "ambrosium_shard", 1) + .whenModLoaded(Mods.D_AET.getId())), + + D_AET_RADIANT_ORCHID = modFlower(Mods.D_AET, "radiant_orchid", List.of(1f), + List.of(Items.PURPLE_DYE), List.of(2)), + + D_AET_AERLAVENDER = modFlower(Mods.D_AET, "aerlavender", List.of(1f), + List.of(Items.PINK_DYE), List.of(2)), + + D_AET_TALL_AERLAVENDER = modFlower(Mods.D_AET, "tall_aerlavender", List.of(1f, 0.25f), + List.of(Items.PINK_DYE, Items.PINK_DYE), List.of(3, 2)), + + D_AET_CATTAILS = modFlower(Mods.D_AET, "aether_cattails", List.of(1f), + List.of(Items.CYAN_DYE), List.of(2)), + + D_AET_TALL_CATTAILS = modFlower(Mods.D_AET, "tall_aether_cattails", List.of(1f, 0.25f), + List.of(Items.CYAN_DYE, Items.CYAN_DYE), List.of(3, 2)), + + D_AET_GOLDEN_FLOWER = modFlower(Mods.D_AET, "golden_flower", List.of(1f, 0.25f), + List.of(Items.ORANGE_DYE, Items.PINK_DYE), List.of(2, 1)), + + D_AET_ENCHANTED_BLOSSOM = modFlower(Mods.D_AET, "enchanted_blossom", List.of(1f, 0.25f), + List.of(Items.WHITE_DYE, Items.YELLOW_DYE), List.of(2, 1)), + + D_AET_SKY_TULIPS = modFlower(Mods.D_AET, "sky_tulips", List.of(1f), + List.of(Items.RED_DYE), List.of(2)), + + D_AET_IASPOVE = modFlower(Mods.D_AET, "iaspove", List.of(1f), + List.of(Items.BLUE_DYE), List.of(2)), + + D_AET_GOLDEN_ASPESS = modFlower(Mods.D_AET, "golden_aspess", List.of(1f), + List.of(Items.ORANGE_DYE), List.of(2)), + + D_AET_ECHAISY = modFlower(Mods.D_AET, "echaisy", List.of(1f), + List.of(Items.PURPLE_DYE), List.of(2)), + + // Ancient Aether + A_AET_CLAY = create(Mods.A_AET.recipeId("valkyrie_clay"), b -> b.duration(50) + .require(Mods.A_AET, "valkyrie_clay") + .output(1, Mods.A_AET, "valkyrie_clay_ball", 3) + .output(.5f, Mods.A_AET, "valkyrie_clay_ball", 1)), + + A_AET_SUNSET_ROSE = modFlower(Mods.A_AET, "sunset_rose", List.of(1f), + List.of(Items.RED_DYE), List.of(2)), + + A_AET_SKY_BLUES = modFlower(Mods.A_AET, "sky_blues", List.of(1f), + List.of(Items.CYAN_DYE), List.of(2)), + + A_AET_WYND_THISTLE = modFlower(Mods.A_AET, "wynd_thistle", List.of(1f), + List.of(Items.LIGHT_BLUE_DYE), List.of(2)), + + A_AET_ELEVETIA = modFlower(Mods.A_AET, "elevetia", List.of(1f, 0.25f), + List.of(Items.PURPLE_DYE, Items.BLACK_DYE), List.of(2, 1)), + + // Aether Redux + AET_R_WYNDSPROUTS = modFlower(Mods.AET_R, "wyndsprouts", List.of(1f), + List.of(Items.LIGHT_GRAY_DYE), List.of(2)), + AET_R_SKYSPROUTS = modFlower(Mods.AET_R, "skysprouts", List.of(1f), + List.of(Items.LIGHT_BLUE_DYE), List.of(2)), + AET_R_FIELDSPROOT_PETALS = modFlower(Mods.AET_R, "fieldsproot_petals", List.of(0.25f, 0.25f, 0.25f, 0.25f), + List.of(Items.LIGHT_BLUE_DYE, Items.PINK_DYE, Items.MAGENTA_DYE, Items.BLACK_DYE), List.of(1, 1, 1, 1)), + AET_R_IRIDIA = modFlower(Mods.AET_R, "iridia", List.of(1f), + List.of(Items.MAGENTA_DYE), List.of(2)), + AET_R_XAELIA_PATCH = modFlower(Mods.AET_R, "xaelia_patch", List.of(1f), + List.of(Items.LIGHT_GRAY_DYE), List.of(2)), + AET_R_AURUM = modFlower(Mods.AET_R, "aurum", List.of(1f), + List.of(Items.YELLOW_DYE), List.of(2)), + AET_R_GOLDEN_CLOVER = modFlower(Mods.AET_R, "golden_clover", List.of(1f), + List.of(Items.YELLOW_DYE), List.of(2)), + AET_R_ZYATRIX = modFlower(Mods.AET_R, "zyatrix", List.of(1f, 0.25f), + List.of(Items.PURPLE_DYE, Items.ORANGE_DYE), List.of(2, 1)), + AET_R_LUXWEED = modFlower(Mods.AET_R, "luxweed", List.of(1f, 0.5f), + List.of(Items.LIGHT_BLUE_DYE, Items.PURPLE_DYE), List.of(1, 1)), + AET_R_SPIROLYCTIL = modFlower(Mods.AET_R, "spirolyctil", List.of(1f, 0.25f), + List.of(Items.LIGHT_BLUE_DYE, Items.PURPLE_DYE), List.of(2, 1)), + AET_R_BLIGHTSHADE = modFlower(Mods.AET_R, "blightshade", List.of(1f, 0.25f), + List.of(Items.PURPLE_DYE, Items.BLACK_DYE), List.of(2, 1)), + AET_R_LUMINA = modFlower(Mods.AET_R, "lumina", List.of(1f), + List.of(Items.BLACK_DYE), List.of(2)), + AET_R_DAGGERBLOOM = modFlower(Mods.AET_R, "daggerbloom", List.of(1f, 0.25f), + List.of(Items.WHITE_DYE, Items.LIGHT_BLUE_DYE), List.of(2, 1)), + AET_R_THERATIP = modFlower(Mods.AET_R, "theratip", List.of(1f), + List.of(Items.PINK_DYE), List.of(2)), + AET_R_FLAREBLOSSOM = modFlower(Mods.AET_R, "flareblossom", List.of(1f, 0.25f), + List.of(Items.WHITE_DYE, Items.RED_DYE), List.of(2, 2)), + AET_R_INFERNIA = modFlower(Mods.AET_R, "infernia", List.of(1f, 0.5f, 0.25f), + List.of(Items.BLAZE_POWDER, Items.BLAZE_POWDER, Items.ORANGE_DYE), List.of(1, 1, 2)) + ; protected GeneratedRecipe metalOre(String name, ItemEntry crushed, int duration) { return create(name + "_ore", b -> b.duration(duration) @@ -847,6 +967,36 @@ protected GeneratedRecipe ruFlower(String input, List chances, } } + protected GeneratedRecipe modFlower(Mods mod, String input, List chances, + List dyes, List amounts){ + return switch (chances.size()) { + // Milling recipe has a max of 4 outputs + case 1 -> create(mod.recipeId(input), b -> b.duration(50) + .require(mod, input) + .output(chances.get(0), dyes.get(0), amounts.get(0)) + .whenModLoaded(mod.getId())); + case 2 -> create(mod.recipeId(input), b -> b.duration(50) + .require(mod, input) + .output(chances.get(0), dyes.get(0), amounts.get(0)) + .output(chances.get(1), dyes.get(1), amounts.get(1)) + .whenModLoaded(mod.getId())); + case 3 -> create(mod.recipeId(input), b -> b.duration(50) + .require(mod, input) + .output(chances.get(0), dyes.get(0), amounts.get(0)) + .output(chances.get(1), dyes.get(1), amounts.get(1)) + .output(chances.get(2), dyes.get(2), amounts.get(2)) + .whenModLoaded(mod.getId())); + case 4 -> create(mod.recipeId(input), b -> b.duration(50) + .require(mod, input) + .output(chances.get(0), dyes.get(0), amounts.get(0)) + .output(chances.get(1), dyes.get(1), amounts.get(1)) + .output(chances.get(2), dyes.get(2), amounts.get(2)) + .output(chances.get(3), dyes.get(3), amounts.get(3)) + .whenModLoaded(mod.getId())); + default -> null; + }; + } + public MillingRecipeGen(PackOutput output) { super(output); } diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java index 5a55108ee0..fe80810cbc 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java @@ -84,7 +84,13 @@ public class MixingRecipeGen extends ProcessingRecipeGen { // Regions Unexplored RU_PEAT_MUD = moddedMud(Mods.RU, "peat"), - RU_SILT_MUD = moddedMud(Mods.RU, "silt") + RU_SILT_MUD = moddedMud(Mods.RU, "silt"), + + // Deep Aether + D_AET_MUD = create(Mods.D_AET.recipeId("aether_mud"), b -> b.require(Fluids.WATER, 250) + .require(Mods.AET, "aether_dirt") + .output(Mods.D_AET, "aether_mud") + .whenModLoaded(Mods.D_AET.getId())) ; diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/PressingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/PressingRecipeGen.java index 1766b28529..5ecd7615f9 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/PressingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/PressingRecipeGen.java @@ -100,7 +100,10 @@ public class PressingRecipeGen extends ProcessingRecipeGen { VMP_CURSED_PATH_GRASS = create("cursed_earth_path_from_grass", b -> b.require(Mods.VMP, "cursed_grass") .output(Mods.VMP, "cursed_earth_path") - .whenModLoaded(Mods.VMP.getId())) + .whenModLoaded(Mods.VMP.getId())), + + // Deep Aether + D_AET_GOLDEN_DIRT_PATH = moddedCompacting(Mods.D_AET, "golden_heights_grass_block", "golden_heights_dirt_path"); ; diff --git a/src/main/java/com/simibubi/create/foundation/fluid/FluidHelper.java b/src/main/java/com/simibubi/create/foundation/fluid/FluidHelper.java index 6eb95f42f4..210a411c81 100644 --- a/src/main/java/com/simibubi/create/foundation/fluid/FluidHelper.java +++ b/src/main/java/com/simibubi/create/foundation/fluid/FluidHelper.java @@ -11,7 +11,7 @@ import com.simibubi.create.content.fluids.transfer.GenericItemEmptying; import com.simibubi.create.content.fluids.transfer.GenericItemFilling; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; - +import com.simibubi.create.foundation.data.recipe.DatagenFluidStack; import net.createmod.catnip.platform.CatnipServices; import net.createmod.catnip.data.Pair; import net.minecraft.nbt.TagParser; @@ -133,7 +133,8 @@ public static Fluid convertToStill(Fluid fluid) { public static JsonElement serializeFluidStack(FluidStack stack) { JsonObject json = new JsonObject(); - json.addProperty("fluid", CatnipServices.REGISTRIES.getKeyOrThrow(stack.getFluid()) + json.addProperty("fluid", stack instanceof DatagenFluidStack datagenFluidStack ? + datagenFluidStack.getActualFluid() : CatnipServices.REGISTRIES.getKeyOrThrow(stack.getFluid()) .toString()); json.addProperty("amount", stack.getAmount()); if (stack.hasTag()) diff --git a/src/main/java/com/simibubi/create/foundation/fluid/FluidIngredient.java b/src/main/java/com/simibubi/create/foundation/fluid/FluidIngredient.java index e2d86eac92..1376abfd32 100644 --- a/src/main/java/com/simibubi/create/foundation/fluid/FluidIngredient.java +++ b/src/main/java/com/simibubi/create/foundation/fluid/FluidIngredient.java @@ -26,6 +26,8 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.registries.ForgeRegistries; +import org.jetbrains.annotations.ApiStatus; + public abstract class FluidIngredient implements Predicate { public static final FluidIngredient EMPTY = new FluidStackIngredient(); @@ -256,4 +258,55 @@ protected List determineMatchingFluidStacks() { } + /** + * Used to represent fluid inputs in recipe datagen without needing the fluid to exist at runtime. + */ + @ApiStatus.Internal + public static final class DatagenFluidIngredient extends FluidIngredient{ + + private final ResourceLocation fluid; + + public DatagenFluidIngredient(ResourceLocation fluid, int amountRequired) { + this.fluid = fluid; + this.amountRequired = amountRequired; + } + + @Override + protected boolean testInternal(FluidStack t) { + return false; + } + + @Override + protected void readInternal(FriendlyByteBuf buffer) { + + } + + @Override + protected void writeInternal(FriendlyByteBuf buffer) { + + } + + @Override + protected void readInternal(JsonObject json) { + + } + + @Override + protected void writeInternal(JsonObject json) { + + } + + @Override + protected List determineMatchingFluidStacks() { + return null; + } + + @Override + public JsonObject serialize() { + JsonObject json = super.serialize(); + json.addProperty("fluid", fluid.toString()); + return json; + } + } + } diff --git a/src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java b/src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java index ac0a9ec8c4..86a4631bc2 100644 --- a/src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java +++ b/src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java @@ -156,6 +156,17 @@ private static void genBlockTags(RegistrateTagsProvider provIn) { TagGen.addOptional(prov.tag(AllBlockTags.ROOTS.tag), Mods.TF, List.of("root", "liveroot_block", "mangrove_root")); + TagGen.addOptional(prov.tag(AllBlockTags.ROOTS.tag), Mods.D_AET, + List.of("yagroot_roots")); + + TagGen.addOptional(prov.tag(AllBlockTags.FAN_TRANSPARENT.tag), Mods.D_AET, + List.of("yagroot_roots")); + + TagGen.addOptional(prov.tag(AllBlockTags.TREE_ATTACHMENTS.tag), Mods.AET_R, + List.of("cloudcap_stem_wall", "cloudcap_spores", "blightwillow_log_wall", "golden_vines", "golden_vines_plant")); + TagGen.addOptional(prov.tag(AllBlockTags.TREE_ATTACHMENTS.tag), Mods.D_AET, + List.of("aether_moss_carpet", "yagroot_vine", "sunroot_hanger")); + // VALIDATE for (AllBlockTags tag : AllBlockTags.values()) { @@ -231,6 +242,11 @@ private static void genItemTags(RegistrateTagsProvider provIn) { "finger_coral", "star_coral", "moss_coral", "petal_coral", "branch_coral", "rock_coral", "pillow_coral", "chrome_coral", "silk_coral")); + TagGen.addOptional(prov.tag(AllItemTags.UPRIGHT_ON_BELT.tag), Mods.AET, List.of("skyroot_bucket", + "skyroot_water_bucket", "skyroot_milk_bucket", "skyroot_remedy_bucket", "skyroot_poison_bucket")); + + TagGen.addOptional(prov.tag(AllItemTags.UPRIGHT_ON_BELT.tag), Mods.D_AET, List.of("poison_bucket")); + // VALIDATE for (AllItemTags tag : AllItemTags.values()) { @@ -287,6 +303,10 @@ private static void genStrippedWoodItemTags(CreateTagsProvider prov) { helper.add(Mods.RU, "alpha", "ashen", "baobab", "blackwood", "brimwood", "cobalt", "cypress", "dead", "eucalyptus", "joshua", "kapok", "larch", "magnolia", "maple", "mauve", "palm", "pine", "redwood", "socotra", "willow"); helper.add(Mods.ARS_E, "yellow_archwood"); + helper.add(Mods.AET, "skyroot"); + helper.add(Mods.D_AET, "roseroot", "yagroot", "cruderoot", "conberry", "sunroot"); + helper.add(Mods.A_AET, "highsproot", "sakura"); + helper.add(Mods.AET_R, "fieldsproot", "blightwillow", "crystal", "glacia"); TagGen.addOptional(logAppender, Mods.AUTUM, "maple"); @@ -304,6 +324,9 @@ private static void genStrippedWoodItemTags(CreateTagsProvider prov) { TagGen.addOptional(logAppender, Mods.RU, "stripped_yellow_bioshroom_stem"); TagGen.addOptional(woodAppender, Mods.RU, "stripped_yellow_bioshroom_hyphae"); TagGen.addOptional(logAppender, Mods.RU, "brimwood_log_magma"); + + TagGen.addOptional(logAppender, Mods.AET_R, "stripped_cloudcap_stem"); + TagGen.addOptional(woodAppender, Mods.AET_R, "stripped_cloudcap_hyphae"); } private static void genFluidTags(RegistrateTagsProvider provIn) {