diff --git a/gradle.properties b/gradle.properties index 995613f53b..69e716b7d8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,9 +25,9 @@ registrate_version = MC1.21-1.3.0+62 # Dependency Versions flywheel_minecraft_version = 1.21.1 -flywheel_version = 1.0.0-beta-1 +flywheel_version = 1.0.0-beta-4 flywheel_version_range = [1.0.0-alpha,2.0) -ponder_version = 1.0.31 +ponder_version = 1.0.32 jei_minecraft_version = 1.21.1 jei_version = 19.21.0.247 curios_minecraft_version = 1.21.1 diff --git a/src/generated/resources/.cache/059f70d822f3fe46a7addb0bb70dc58ad8353903 b/src/generated/resources/.cache/059f70d822f3fe46a7addb0bb70dc58ad8353903 index df3a824e1c..0ffc6cf894 100644 --- a/src/generated/resources/.cache/059f70d822f3fe46a7addb0bb70dc58ad8353903 +++ b/src/generated/resources/.cache/059f70d822f3fe46a7addb0bb70dc58ad8353903 @@ -1,2 +1,2 @@ -// 1.21.1 2025-02-02T12:32:00.8366482 Curios for create +// 1.21.1 2025-02-05T22:51:51.1762789 Curios for create 4346f33a498b3b430f1c4d978e8121dd6bb996c3 data/create/curios/entities/players.json diff --git a/src/generated/resources/.cache/12afe0d97856fb2040b8407470e6d13529994eaa b/src/generated/resources/.cache/12afe0d97856fb2040b8407470e6d13529994eaa index 0e2cc9f1aa..5165ce8282 100644 --- a/src/generated/resources/.cache/12afe0d97856fb2040b8407470e6d13529994eaa +++ b/src/generated/resources/.cache/12afe0d97856fb2040b8407470e6d13529994eaa @@ -1,4 +1,4 @@ -// 1.21.1 2025-02-02T12:32:00.8411485 Create's Sequenced Assembly Recipes +// 1.21.1 2025-02-05T22:51:51.1797794 Create's Sequenced Assembly Recipes 6acf60d5a4765260756a6ca3bfe09661ae8badef data/create/recipe/sequenced_assembly/precision_mechanism.json 651fc851e0162789e8f4c28fbe617dcca8431453 data/create/recipe/sequenced_assembly/sturdy_sheet.json 443bf1a2df3f99c164c4f83f8db16a45a8d9d624 data/create/recipe/sequenced_assembly/track.json diff --git a/src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba b/src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba index 7660ed6439..aa70fca5de 100644 --- a/src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba +++ b/src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba @@ -1,4 +1,4 @@ -// 1.21.1 2025-02-02T12:32:00.9109615 Create's Advancements +// 1.21.1 2025-02-05T22:51:51.324899 Create's Advancements 5876d95160eca4e05f94dbc9c4ff44ce83cbbb2b data/create/advancement/andesite_alloy.json b124cd0229367b711f4e9650115a5579825e44e2 data/create/advancement/andesite_casing.json ee674ceca35306b53838dde10ed55d8f506650f8 data/create/advancement/anvil_plough.json diff --git a/src/generated/resources/.cache/499d9d953ee69b539ff4dd4c95a6cbd849f63f67 b/src/generated/resources/.cache/499d9d953ee69b539ff4dd4c95a6cbd849f63f67 index ccf7d910fa..c480854c7f 100644 --- a/src/generated/resources/.cache/499d9d953ee69b539ff4dd4c95a6cbd849f63f67 +++ b/src/generated/resources/.cache/499d9d953ee69b539ff4dd4c95a6cbd849f63f67 @@ -1,4 +1,4 @@ -// 1.21.1 2025-02-02T12:32:00.8206905 Create Train Hat Information +// 1.21.1 2025-02-05T22:51:51.164311 Create Train Hat Information be16d47aa64e673b1107a36ce06475016e316fca assets/minecraft/train_hat_info/axolotl.json b8ae6d9c8014439f4049622e0d6e79b9d6716260 assets/minecraft/train_hat_info/bat.json 5053a6c9fb412dfac1bf17eb0f57f9fd314198e4 assets/minecraft/train_hat_info/bee.json diff --git a/src/generated/resources/.cache/6ec3b5a261c9ae3df674f7595dc66530ce54feb9 b/src/generated/resources/.cache/6ec3b5a261c9ae3df674f7595dc66530ce54feb9 index eef02158f9..d5df706a17 100644 --- a/src/generated/resources/.cache/6ec3b5a261c9ae3df674f7595dc66530ce54feb9 +++ b/src/generated/resources/.cache/6ec3b5a261c9ae3df674f7595dc66530ce54feb9 @@ -1,4 +1,4 @@ -// 1.21.1 2025-02-02T12:32:00.9199378 Create's Mechanical Crafting Recipes +// 1.21.1 2025-02-05T22:51:51.3343844 Create's Mechanical Crafting Recipes d5d008e80899b20f1c7d76ff52af0183bb57d9d0 data/create/recipe/mechanical_crafting/crushing_wheel.json d9ca4ced8302f3f8baeddd7fd68210eb91f4631f data/create/recipe/mechanical_crafting/extendo_grip.json 42d4b73c0e74daa18e97889d11919b8701a45aa2 data/create/recipe/mechanical_crafting/potato_cannon.json diff --git a/src/generated/resources/.cache/7fbec16def6919d7023cd104d800477d6f3414bc b/src/generated/resources/.cache/7fbec16def6919d7023cd104d800477d6f3414bc index 2c911b2ffb..f1d41355bc 100644 --- a/src/generated/resources/.cache/7fbec16def6919d7023cd104d800477d6f3414bc +++ b/src/generated/resources/.cache/7fbec16def6919d7023cd104d800477d6f3414bc @@ -1,3 +1,3 @@ -// 1.21.1 2025-02-02T12:32:00.8391558 Tags for minecraft:enchantment mod id create +// 1.21.1 2025-02-05T22:51:51.177786 Tags for minecraft:enchantment mod id create 7a2f1612bcbf260055ae80377f4e5761f8367a2e data/minecraft/tags/enchantment/in_enchanting_table.json 7a2f1612bcbf260055ae80377f4e5761f8367a2e data/minecraft/tags/enchantment/non_treasure.json diff --git a/src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9 b/src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9 index 01f397b8f5..3e11c30ef1 100644 --- a/src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9 +++ b/src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9 @@ -1,4 +1,4 @@ -// 1.21.1 2025-02-02T12:32:00.915949 Create's Standard Recipes +// 1.21.1 2025-02-05T22:51:51.328399 Create's Standard Recipes 489f0a3e3d8571c4897f49eada95a23290a472dc data/create/advancement/recipes/combat/crafting/appliances/netherite_backtank.json b024ae44179c47b9be8fa35acc763c22b7b01b2e data/create/advancement/recipes/combat/crafting/appliances/netherite_backtank_from_netherite.json 41d2909fcf45f9098c0ee306810c16168d4e8ae4 data/create/advancement/recipes/combat/crafting/appliances/netherite_diving_boots.json diff --git a/src/generated/resources/.cache/ad9bf59631726a3f24738ebf1a6cd44c7f88ba0f b/src/generated/resources/.cache/ad9bf59631726a3f24738ebf1a6cd44c7f88ba0f index e7091936a1..888331083b 100644 --- a/src/generated/resources/.cache/ad9bf59631726a3f24738ebf1a6cd44c7f88ba0f +++ b/src/generated/resources/.cache/ad9bf59631726a3f24738ebf1a6cd44c7f88ba0f @@ -1,4 +1,4 @@ -// 1.21.1 2025-02-02T12:32:00.8401521 Create's Damage Type Tags +// 1.21.1 2025-02-05T22:51:51.1797794 Create's Damage Type Tags 7884716b2f4bb1330ff215366bb4bab06e4728c2 data/minecraft/tags/damage_type/bypasses_armor.json 1fcad1f89265fba8bdb05b03a1dfcc88d7b7a550 data/minecraft/tags/damage_type/is_explosion.json 08324c61115b72bb8a6370d7f34d84d9a31afd16 data/minecraft/tags/damage_type/is_fire.json diff --git a/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 b/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 index 67d4f08fa5..efe50b466a 100644 --- a/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 +++ b/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 @@ -1,4 +1,4 @@ -// 1.21.1 2025-02-02T12:32:00.8246808 Create's Processing Recipes +// 1.21.1 2025-02-06T09:54:29.0966625 Create's Processing Recipes f3b53b8fd8eaccb466d28f0b801e4046758782d7 data/create/recipe/compacting/andesite_from_flint.json 8addd735263ee2d36941da9655d6c305e2b7e5ee data/create/recipe/compacting/blaze_cake.json 50229c8ccff8b3420456dfb007236dce812b8145 data/create/recipe/compacting/chocolate.json @@ -172,51 +172,181 @@ d5c01d60cc06c8ea5cd05127a38ad83737d5c445 data/create/recipe/cutting/compat/ars_n a230c02d817aaec7e5116618bbcff9dc2ab7824f data/create/recipe/cutting/compat/ars_nouveau/stripped_purple_archwood_wood.json 975193613f0442e55916d6e23e8c7dde6ef21be8 data/create/recipe/cutting/compat/ars_nouveau/stripped_red_archwood_log.json 5e74379882a1bc30ccc5ec53a8bf44cef04b71d8 data/create/recipe/cutting/compat/ars_nouveau/stripped_red_archwood_wood.json +033cb588a3f730112b8a11ba6287b19ca5403c53 data/create/recipe/cutting/compat/immersiveengineering/wire_aluminum.json +a7733848a7bfe296599c77ccd20c380b33d3fa42 data/create/recipe/cutting/compat/immersiveengineering/wire_copper.json +b1529b76e96b632de9207cfdb59105282813543f data/create/recipe/cutting/compat/immersiveengineering/wire_electrum.json +80a447e78be31d98319b40655c2b2d659a316fbe data/create/recipe/cutting/compat/immersiveengineering/wire_lead.json +dfec91c7487a4ba0e46946625406f5b6c15971ab data/create/recipe/cutting/compat/immersiveengineering/wire_steel.json 55911633cf3545a31159cc36c59d428b975c7b55 data/create/recipe/cutting/compat/regions_unexplored/silver_birch_log.json df820cfc0ebc1cbd510e9847b36345314320ecf7 data/create/recipe/cutting/compat/regions_unexplored/silver_birch_wood.json 558e81291da72b7f042b3b3270744b2c05ddc6fa data/create/recipe/cutting/stripped_bamboo_block.json +ae568b2b28b8f2bda248687be30a3fd7a5138646 data/create/recipe/deploying/chiseled_copper_from_deoxidising.json +f2f912f415daa85ab6a4ebef5fe71382bef40153 data/create/recipe/deploying/chiseled_copper_from_removing_wax.json 7a01147d3c7d8fb9acb870b33e5a792328f88c3c data/create/recipe/deploying/cogwheel.json +71823595ba3f587a0940125d87f2d33a99d317d8 data/create/recipe/deploying/copper_block_from_deoxidising.json +2e94155860aae80bc3c66e92cb0815cf259dfff4 data/create/recipe/deploying/copper_block_from_removing_wax.json +461d89cad1007cddf1a8d3366c5c3da900162cb2 data/create/recipe/deploying/copper_bulb_from_deoxidising.json +8b7c6d8a5b7d7a391fad19718327f817ffeb46bc data/create/recipe/deploying/copper_bulb_from_removing_wax.json +8fac0b7b4ad490e87298f4f5ef04db90ed536e7f data/create/recipe/deploying/copper_door_from_deoxidising.json +bdf17aefbd34ae2c82eaede06126d06c736c1b70 data/create/recipe/deploying/copper_door_from_removing_wax.json +3b46f8b01ff7cf5812069ea8442d374752e2a942 data/create/recipe/deploying/copper_grate_from_deoxidising.json +b41f7c02b813dae72c4a57b68f008eb25dc1709b data/create/recipe/deploying/copper_grate_from_removing_wax.json +05053abe2e15cc6eb885c220e7c4fcac983611eb data/create/recipe/deploying/copper_shingles_from_deoxidising.json +aec726a5c61af90cd67bf30b8f3db07253fd42d0 data/create/recipe/deploying/copper_shingles_from_removing_wax.json +728e234e700be32ee721e245e274eb050ef4f606 data/create/recipe/deploying/copper_shingle_slab_from_deoxidising.json +e46c329904515063d9fc58c3006b432248d84ebe data/create/recipe/deploying/copper_shingle_slab_from_removing_wax.json +a44bf77f812215cdb6bb24f2bbf97667ce7db990 data/create/recipe/deploying/copper_shingle_stairs_from_deoxidising.json +7e1fddd9635b98e778eb122f5a000618d16b11c2 data/create/recipe/deploying/copper_shingle_stairs_from_removing_wax.json +c0960ea4e0379f56b653262052fb2de3c4b0bce7 data/create/recipe/deploying/copper_tiles_from_deoxidising.json +4920419c9bd94d05c237b6b8b12c4d2e4795bf42 data/create/recipe/deploying/copper_tiles_from_removing_wax.json +67dc0704987c703fd49183994e6470e104858a95 data/create/recipe/deploying/copper_tile_slab_from_deoxidising.json +7e7f8c3decba1506b22b72b644a2025318fc8822 data/create/recipe/deploying/copper_tile_slab_from_removing_wax.json +a6eaa28d82bda3f6b24b408f7c67aab88c93829e data/create/recipe/deploying/copper_tile_stairs_from_deoxidising.json +4066d8d646a9ce873cac5177beb2fa107b290956 data/create/recipe/deploying/copper_tile_stairs_from_removing_wax.json +270c6979d6ecd786c8dbe302a305e7e1fc3824dd data/create/recipe/deploying/copper_trapdoor_from_deoxidising.json +56327955a328c63fef57b88402463f9d7936b7f2 data/create/recipe/deploying/copper_trapdoor_from_removing_wax.json +a45a2f53e770e9f7435b0159e2a6ffe13d91d82d data/create/recipe/deploying/cut_copper_from_deoxidising.json +a0f38792e9b993a793e6c35a4e0e0c68906218c9 data/create/recipe/deploying/cut_copper_from_removing_wax.json +45db539abee9c99e5683f993b003bfe4e27afa67 data/create/recipe/deploying/cut_copper_slab_from_deoxidising.json +7cf609fef56ed53becf7a55e134aaa2d1093ab40 data/create/recipe/deploying/cut_copper_slab_from_removing_wax.json +cffe8fdd5375773b8d91cd375c3d47e03774675f data/create/recipe/deploying/cut_copper_stairs_from_deoxidising.json +4fb27e34f4315be61b0708c53800ee72bf6809a1 data/create/recipe/deploying/cut_copper_stairs_from_removing_wax.json +55cd484ea3f2741d409d78642d46d04e1b6494c2 data/create/recipe/deploying/exposed_chiseled_copper_from_deoxidising.json +0de9402d4deaf48794ca02530db05ceb033f8069 data/create/recipe/deploying/exposed_chiseled_copper_from_removing_wax.json +da8ff7aeb7f6873dfc538674280ee4154a3a6017 data/create/recipe/deploying/exposed_copper_bulb_from_deoxidising.json +42a74d979b975123020a4d633226e47cfd6d8004 data/create/recipe/deploying/exposed_copper_bulb_from_removing_wax.json +9db28df6d84ca82a62cf8c611ec482b4af1afd19 data/create/recipe/deploying/exposed_copper_door_from_deoxidising.json +20919232510c0d66cf688a6a7979c44ca7f221e6 data/create/recipe/deploying/exposed_copper_door_from_removing_wax.json +13bf7a638b279a2b84d68bbcde2ef2a0e6957f97 data/create/recipe/deploying/exposed_copper_from_deoxidising.json +faaa8eab8175bb55c7ade06491d0be3419a2258d data/create/recipe/deploying/exposed_copper_from_removing_wax.json +43ce2c8ae5e0d06d6a2028c1c178384e82e322ff data/create/recipe/deploying/exposed_copper_grate_from_deoxidising.json +266ead870e51ed8ea8073b908a3b9e011098953a data/create/recipe/deploying/exposed_copper_grate_from_removing_wax.json +09353cbd6cd87e622668303cc83d5cf6c96d14f4 data/create/recipe/deploying/exposed_copper_shingles_from_deoxidising.json +e5f64c97b09c9609f2bfb1c7e9a931f016144961 data/create/recipe/deploying/exposed_copper_shingles_from_removing_wax.json +9bac720038284c15807b1af46fb737061fc408e1 data/create/recipe/deploying/exposed_copper_shingle_slab_from_deoxidising.json +ff63016d6a4e3d3fabc233e1c343524b0cd3eec6 data/create/recipe/deploying/exposed_copper_shingle_slab_from_removing_wax.json +cb0dff707a1ce997c60475397e694087d235288d data/create/recipe/deploying/exposed_copper_shingle_stairs_from_deoxidising.json +ff93d9667bc252c5f7323d6613756ad884499eac data/create/recipe/deploying/exposed_copper_shingle_stairs_from_removing_wax.json +9c5491e571dbd52a758bacc77fd193d3f435d19f data/create/recipe/deploying/exposed_copper_tiles_from_deoxidising.json +72359d16366ce29ba88f2536c2af82e7ba33af92 data/create/recipe/deploying/exposed_copper_tiles_from_removing_wax.json +6ec863a95f4bdd0917f9cacec5c02e09ef843b34 data/create/recipe/deploying/exposed_copper_tile_slab_from_deoxidising.json +68777658e9ecac0653cd22a154edd7af06b36138 data/create/recipe/deploying/exposed_copper_tile_slab_from_removing_wax.json +fc936eb34042c2fdb751a4f5b53c7bd283aa8f82 data/create/recipe/deploying/exposed_copper_tile_stairs_from_deoxidising.json +ea381bc5a0adcb7f1b74e7dac02e988b5e93f056 data/create/recipe/deploying/exposed_copper_tile_stairs_from_removing_wax.json +e643ba29006fde9c73897b8c812c342719a41cd1 data/create/recipe/deploying/exposed_copper_trapdoor_from_deoxidising.json +0b958018c2e775d3a9d11d717d4b9cd535192747 data/create/recipe/deploying/exposed_copper_trapdoor_from_removing_wax.json +1612bd37a109f7876ac03c5988dc7d6ddfad0ff8 data/create/recipe/deploying/exposed_cut_copper_from_deoxidising.json +6151c9f5925ead0056d338fdfd673500902e417d data/create/recipe/deploying/exposed_cut_copper_from_removing_wax.json +a44eaf00ef5e746c62aa72552a37447676fcd385 data/create/recipe/deploying/exposed_cut_copper_slab_from_deoxidising.json +3ae4559c67d0a390c2dd4deb3a17df8aab66bb64 data/create/recipe/deploying/exposed_cut_copper_slab_from_removing_wax.json +5ecc9b889c9012616454d3ddeff1608fe87a0f93 data/create/recipe/deploying/exposed_cut_copper_stairs_from_deoxidising.json +98ac326a1e2c80fd0f3cb73c7ad80b86ba7cf980 data/create/recipe/deploying/exposed_cut_copper_stairs_from_removing_wax.json 1230f449873262e79585752d3430e5f7f383bcb2 data/create/recipe/deploying/large_cogwheel.json +cdb4974bec2beb1ce56527e658ca5eaccd17f741 data/create/recipe/deploying/oxidized_chiseled_copper_from_removing_wax.json +6a590ddaa8d4a27ec7a10a7ffd8e8c11ce74135e data/create/recipe/deploying/oxidized_copper_bulb_from_removing_wax.json +c17362d4760acb311fc00bde41b443f1a1def64a data/create/recipe/deploying/oxidized_copper_door_from_removing_wax.json +051faceb93f5cba4be8632198272500bcf461334 data/create/recipe/deploying/oxidized_copper_from_removing_wax.json +93e0ac0a9d59dfff80d24c8506430732edf00109 data/create/recipe/deploying/oxidized_copper_grate_from_removing_wax.json +00cad77046b42466fb40798f11480d7370cab579 data/create/recipe/deploying/oxidized_copper_shingles_from_removing_wax.json +deecff3e485442af83fb01d16b0a46d98e5214bb data/create/recipe/deploying/oxidized_copper_shingle_slab_from_removing_wax.json +162ddbeb10da4eec0709813d3f55465a658e76d1 data/create/recipe/deploying/oxidized_copper_shingle_stairs_from_removing_wax.json +6f4ad2120309481203e1ac839263099bb7e36ea0 data/create/recipe/deploying/oxidized_copper_tiles_from_removing_wax.json +dff292537e007aabdffdf997509838c6168799b4 data/create/recipe/deploying/oxidized_copper_tile_slab_from_removing_wax.json +42cc953f2f2cf2b2af7d3d1480abf6d7d363abec data/create/recipe/deploying/oxidized_copper_tile_stairs_from_removing_wax.json +e58b27fa3c64f6fb646e63d9b7c569ddac4b7842 data/create/recipe/deploying/oxidized_copper_trapdoor_from_removing_wax.json +58e6abf60ee8d830143fa6a48830c3d20acfc8c0 data/create/recipe/deploying/oxidized_cut_copper_from_removing_wax.json +52eb357d1d13edc250726f70c7b3639cb902a933 data/create/recipe/deploying/oxidized_cut_copper_slab_from_removing_wax.json +5daf82089854fda3a264b26303fe02764539a87e data/create/recipe/deploying/oxidized_cut_copper_stairs_from_removing_wax.json +028377bb3e5947a9e740b8f90a6deba4afe0a68b data/create/recipe/deploying/waxed_chiseled_copper_from_adding_wax.json dc35369da8514a5650704fd39e84861cce084b5d data/create/recipe/deploying/waxed_copper_block_from_adding_wax.json +99883a2b414c89d69970eb823c4936c427ab14ef data/create/recipe/deploying/waxed_copper_bulb_from_adding_wax.json +0a1fa71a4bcf095bb54ad18193623061ceb1adb5 data/create/recipe/deploying/waxed_copper_door_from_adding_wax.json +c6246f059c40552f9c4f4841be4d4a85e2a481bc data/create/recipe/deploying/waxed_copper_grate_from_adding_wax.json 7b7d596cdaa4000222177b405c04c6e8906561b4 data/create/recipe/deploying/waxed_copper_shingles_from_adding_wax.json afbe0c612651ee90651ee7b39683c8baac2a115e data/create/recipe/deploying/waxed_copper_shingle_slab_from_adding_wax.json 66cd83c15d46692f27deaac280ef782bb2bd7909 data/create/recipe/deploying/waxed_copper_shingle_stairs_from_adding_wax.json bcb9750b7c3504996d6177d5980128af018942a8 data/create/recipe/deploying/waxed_copper_tiles_from_adding_wax.json eecd6194b0efc2bee321ba7fac7348cd3f5911ab data/create/recipe/deploying/waxed_copper_tile_slab_from_adding_wax.json dfc1f8f6b0d1b6d23c9125c97eba31dadc370904 data/create/recipe/deploying/waxed_copper_tile_stairs_from_adding_wax.json +be8550d27ee9fd45d476a501a80637fbad058d24 data/create/recipe/deploying/waxed_copper_trapdoor_from_adding_wax.json e260cded2b746bd79afaaa1e086cf2f0faffde76 data/create/recipe/deploying/waxed_cut_copper_from_adding_wax.json 33e338242aff64f9d52169392d2eb8e617b8da5c data/create/recipe/deploying/waxed_cut_copper_slab_from_adding_wax.json 5f4671548b18634ae440d7c64c4c97e5e533601b data/create/recipe/deploying/waxed_cut_copper_stairs_from_adding_wax.json +213df481c5da2099ac71c37eb36a78dbcc9a94bb data/create/recipe/deploying/waxed_exposed_chiseled_copper_from_adding_wax.json +4f82ab400aa9658daadcf30e24096eede9de47a6 data/create/recipe/deploying/waxed_exposed_copper_bulb_from_adding_wax.json +2d56a54f80735bbc7b0983c04cd1ea68618a9b67 data/create/recipe/deploying/waxed_exposed_copper_door_from_adding_wax.json ff182d5c0c4b832ff566691d9b680c9039c55c16 data/create/recipe/deploying/waxed_exposed_copper_from_adding_wax.json +98c8682010aac1ea4870542b15da4946e81bb769 data/create/recipe/deploying/waxed_exposed_copper_grate_from_adding_wax.json eff2e77f004873e695e419afc71a7011328d3de8 data/create/recipe/deploying/waxed_exposed_copper_shingles_from_adding_wax.json 5a7a622d5b340f83ba2d32fe53620744c5193a32 data/create/recipe/deploying/waxed_exposed_copper_shingle_slab_from_adding_wax.json b895ef423e64936b5d94ee54a6527316ed48d9d6 data/create/recipe/deploying/waxed_exposed_copper_shingle_stairs_from_adding_wax.json 9d566e599cc05aefde637faab1957813a5b6f3f7 data/create/recipe/deploying/waxed_exposed_copper_tiles_from_adding_wax.json 582083e0fed8760cde2c53aa2b02237eb59a3df0 data/create/recipe/deploying/waxed_exposed_copper_tile_slab_from_adding_wax.json fec9d744770bfc517a72a2be45701aab6f3040b2 data/create/recipe/deploying/waxed_exposed_copper_tile_stairs_from_adding_wax.json +07303100aec1e789b884553224018ecc08419e79 data/create/recipe/deploying/waxed_exposed_copper_trapdoor_from_adding_wax.json 0f18c91f36e3abae99a7dca72f3d80e59f03cf7d data/create/recipe/deploying/waxed_exposed_cut_copper_from_adding_wax.json 7ed36f4f3abfd37aec13a273b87d97c8ccc36cb4 data/create/recipe/deploying/waxed_exposed_cut_copper_slab_from_adding_wax.json 9cd5a6c71b5102ef2660e8a5c650cbd2c2327580 data/create/recipe/deploying/waxed_exposed_cut_copper_stairs_from_adding_wax.json +5895a6fdfbcebc5416e53591c31d99ceab44fc71 data/create/recipe/deploying/waxed_oxidized_chiseled_copper_from_adding_wax.json +a61253b47c244b44c59b70d8fdc4f9f4d734dec5 data/create/recipe/deploying/waxed_oxidized_copper_bulb_from_adding_wax.json +0d0c44152716a75a8fb63328e5432d9a1428eb83 data/create/recipe/deploying/waxed_oxidized_copper_door_from_adding_wax.json 97b7b3f65807328d0a036cb66ee53d898504da77 data/create/recipe/deploying/waxed_oxidized_copper_from_adding_wax.json +7174d27f6e0a64828dcc5480de28cdc9c9e05527 data/create/recipe/deploying/waxed_oxidized_copper_grate_from_adding_wax.json bd37d658666b2912c07b6daa6adaff99a479223a data/create/recipe/deploying/waxed_oxidized_copper_shingles_from_adding_wax.json 07c82e555617f9d9166f2d2c9068ac421eb0b37a data/create/recipe/deploying/waxed_oxidized_copper_shingle_slab_from_adding_wax.json d0c7805681e3ed6a6bc5775d42c702af924e8785 data/create/recipe/deploying/waxed_oxidized_copper_shingle_stairs_from_adding_wax.json 41c879946a24ff330466476bdee9148859398842 data/create/recipe/deploying/waxed_oxidized_copper_tiles_from_adding_wax.json af72234311a9abf5c57c767c05274c466dceac53 data/create/recipe/deploying/waxed_oxidized_copper_tile_slab_from_adding_wax.json b35d22f891d1c9cab4340399e3426c96132b3fc7 data/create/recipe/deploying/waxed_oxidized_copper_tile_stairs_from_adding_wax.json +2886bb09f2c6eb9287a8048827711b80f8130fdc data/create/recipe/deploying/waxed_oxidized_copper_trapdoor_from_adding_wax.json 9d78f4d16273015d181be586f91e77f3b82ee18f data/create/recipe/deploying/waxed_oxidized_cut_copper_from_adding_wax.json 2a9c57a8ca9b013b7bc11d2588d4ba00b402f97f data/create/recipe/deploying/waxed_oxidized_cut_copper_slab_from_adding_wax.json 5670c074c0f1961a5e499953a49c7e3f1f617ebf data/create/recipe/deploying/waxed_oxidized_cut_copper_stairs_from_adding_wax.json +d1d7efd53e4469ead011b2fa9864f2e21b3de5cd data/create/recipe/deploying/waxed_weathered_chiseled_copper_from_adding_wax.json +2087860f166ae182fbe5241f35928435f24e3352 data/create/recipe/deploying/waxed_weathered_copper_bulb_from_adding_wax.json +51058d2ddaeb8b8d1ce155b7784e221b4982f6cf data/create/recipe/deploying/waxed_weathered_copper_door_from_adding_wax.json 58679c5c37eaa5a52ef9e0f4f7cc695c58ddee96 data/create/recipe/deploying/waxed_weathered_copper_from_adding_wax.json +18cb9d8c2f13014ec0bc2622560ca6792d94c6b9 data/create/recipe/deploying/waxed_weathered_copper_grate_from_adding_wax.json 5817055c1cf3ae572ffbe2765f3e519fda4c3342 data/create/recipe/deploying/waxed_weathered_copper_shingles_from_adding_wax.json e962429c48ed12bb2d7b299719513c23a2088879 data/create/recipe/deploying/waxed_weathered_copper_shingle_slab_from_adding_wax.json 2321ea4ed39d09b12a80be8df2c7c1dc4c6d2c18 data/create/recipe/deploying/waxed_weathered_copper_shingle_stairs_from_adding_wax.json b635490492a22f88e24003bffb09c4d5e3fa2d61 data/create/recipe/deploying/waxed_weathered_copper_tiles_from_adding_wax.json d0fc937a3e7ae42fb1891b7b87adb2b57292e01d data/create/recipe/deploying/waxed_weathered_copper_tile_slab_from_adding_wax.json 6852ea4c7f27520fb3388ec641be4cb94d907199 data/create/recipe/deploying/waxed_weathered_copper_tile_stairs_from_adding_wax.json +b0cd28e59270df4a029346cca234fb372fbe8f4e data/create/recipe/deploying/waxed_weathered_copper_trapdoor_from_adding_wax.json 9ab3ba5847c3abbc17c476436978141f2c039ce9 data/create/recipe/deploying/waxed_weathered_cut_copper_from_adding_wax.json 733dd94b46186c19fdecced5d8231e46ea612cf2 data/create/recipe/deploying/waxed_weathered_cut_copper_slab_from_adding_wax.json cd4c050e6ad9227bf293768f2d8b965c0ecafeab data/create/recipe/deploying/waxed_weathered_cut_copper_stairs_from_adding_wax.json +f1cb1c4865ef1e021b582c676b31f14aa0f013bf data/create/recipe/deploying/weathered_chiseled_copper_from_deoxidising.json +a13e375ca0f0226341446c5adfb3c899fca325d0 data/create/recipe/deploying/weathered_chiseled_copper_from_removing_wax.json +336f10d9f846aa79b91641361d686f200d3dad1e data/create/recipe/deploying/weathered_copper_bulb_from_deoxidising.json +c5b6f4e0e2bb4fa03108f5f1d316a46b4b6baec0 data/create/recipe/deploying/weathered_copper_bulb_from_removing_wax.json +ce34e821d4e2f6120920392b2b860bf070615c55 data/create/recipe/deploying/weathered_copper_door_from_deoxidising.json +3946bcf44705f2c9ed53a226ae3a57eec9d7befe data/create/recipe/deploying/weathered_copper_door_from_removing_wax.json +20c2fefb17fcdde2b817b1634d805dececf8b0e5 data/create/recipe/deploying/weathered_copper_from_deoxidising.json +ba026a1c407eca2f8acc66a10a1fcc97cb318b1e data/create/recipe/deploying/weathered_copper_from_removing_wax.json +0da33300f1dfff2ee350e167a885116531e57090 data/create/recipe/deploying/weathered_copper_grate_from_deoxidising.json +eecbaaf62c563f173d7959d80225c4938c94cb0f data/create/recipe/deploying/weathered_copper_grate_from_removing_wax.json +5e01f5da2ad67a939a7630bf2607a0159d1dd177 data/create/recipe/deploying/weathered_copper_shingles_from_deoxidising.json +7f962473189c296c02f5e97fa3e920cc7e26f112 data/create/recipe/deploying/weathered_copper_shingles_from_removing_wax.json +4c903ea6449f7ef494c66e20671a323b6703fa05 data/create/recipe/deploying/weathered_copper_shingle_slab_from_deoxidising.json +231350a2d36a11b5848052fe20e11f32b0cd7838 data/create/recipe/deploying/weathered_copper_shingle_slab_from_removing_wax.json +94cb495f52ca2b88b8680a6bcd2d326a91357e0c data/create/recipe/deploying/weathered_copper_shingle_stairs_from_deoxidising.json +0160f12204d05b0f094a7b7d189692501aa90ed0 data/create/recipe/deploying/weathered_copper_shingle_stairs_from_removing_wax.json +6210a2a41161ff2d0ceca8ca209954af4c63002a data/create/recipe/deploying/weathered_copper_tiles_from_deoxidising.json +03ad0e1d06b1197fa45db23d73eb9f76a45944f8 data/create/recipe/deploying/weathered_copper_tiles_from_removing_wax.json +3f218e4ab4a52d0df55725088c4128582c9b6918 data/create/recipe/deploying/weathered_copper_tile_slab_from_deoxidising.json +18bbbcdbf4e57e6fe567b3494f492332745cd6fc data/create/recipe/deploying/weathered_copper_tile_slab_from_removing_wax.json +a24e82558aa7aee7840f6310531cec46b626cee4 data/create/recipe/deploying/weathered_copper_tile_stairs_from_deoxidising.json +6b8b807ebd14158d2d14c5210d5c60c781d112db data/create/recipe/deploying/weathered_copper_tile_stairs_from_removing_wax.json +f8b3feffe9a7d1b81e71bb3d92e13314bcbfa019 data/create/recipe/deploying/weathered_copper_trapdoor_from_deoxidising.json +dc4787ba1f311f9e3cb73ce25c04aebdd685dcb0 data/create/recipe/deploying/weathered_copper_trapdoor_from_removing_wax.json +45dfc86b09a4b777974026697bfd444063920374 data/create/recipe/deploying/weathered_cut_copper_from_deoxidising.json +b19f74374347bb123ad32b9d1bb680763467fe1d data/create/recipe/deploying/weathered_cut_copper_from_removing_wax.json +58cf0f39fd70e58a97a8458907ea6af393efe5b8 data/create/recipe/deploying/weathered_cut_copper_slab_from_deoxidising.json +5c63c7500f25ca09c348b24c077f79f315d958b3 data/create/recipe/deploying/weathered_cut_copper_slab_from_removing_wax.json +5458bc361b6022323c7aeed19cbd4f9d278b55bb data/create/recipe/deploying/weathered_cut_copper_stairs_from_deoxidising.json +0e05f35e930aa74cc64c91f5a69615aaa0e52565 data/create/recipe/deploying/weathered_cut_copper_stairs_from_removing_wax.json e31cef39cecef9abedf5f30884073b1fcf6f0a1f data/create/recipe/emptying/builders_tea.json 5a8927d6c95a07d0b441f69150e133a5ad26554d data/create/recipe/emptying/compat/alexsmobs/lava_bottle.json c56724a95aa8f948f7e45953477788aa09beccd6 data/create/recipe/emptying/compat/farmersdelight/milk_bottle.json @@ -229,6 +359,7 @@ df7b555ad65f7e76ce750ce8daef7eb72141732b data/create/recipe/filling/builders_tea b3ede5f0ec978fd395a8d7f81243685a697fe268 data/create/recipe/filling/compat/alexsmobs/lava_bottle.json 3da234beaef3f1cf1a07b9314cf0a472e32fba97 data/create/recipe/filling/compat/byg/lush_grass_block.json 0e19d68524f3eb11232f97744efcf5fa116e8c56 data/create/recipe/filling/compat/farmersdelight/milk_bottle.json +12649869fb69e7d83cf26f3c51d5c1046cd9f3eb data/create/recipe/filling/compat/immersiveengineering/treated_wood_in_spout.json d2a2c0e90e8c3e919f6e9f18f17e297c0fb30913 data/create/recipe/filling/compat/neapolitan/milk_bottle.json cc26d65a649bb015f6a40ef4dff76d83b91f42a2 data/create/recipe/filling/compat/regions_unexplored/peat_grass_block.json 346c5b5b52fd6fcbeb42befd1c9a7b269143f2f9 data/create/recipe/filling/compat/regions_unexplored/silt_grass_block.json @@ -509,6 +640,14 @@ f981621265820687762ffc192bc3fdf68011d68e data/create/recipe/pressing/compat/bett 78c67fb1528194c0cc4d9a175dcf303814d70b14 data/create/recipe/pressing/compat/byg/lush_grass_path.json fbfc0fa989e6d54be2fbf34d0c6ca8e42632ca1f data/create/recipe/pressing/compat/environmental/mycelium_path.json 380edd33cba0861fc78ce67bd2b4bc844f3a7210 data/create/recipe/pressing/compat/environmental/podzol_path.json +414b8dfa9289498214d9af90129aee5f24fcc47d data/create/recipe/pressing/compat/immersiveengineering/plate_aluminum.json +5c3de0a58fa6bca9ff2418df85c49bd246c2851c data/create/recipe/pressing/compat/immersiveengineering/plate_constantan.json +4aa1dfff6003354db0d356b34412ebb846169260 data/create/recipe/pressing/compat/immersiveengineering/plate_electrum.json +17a126ae43243c45f7cd2eb10a7f09cf9a3fd6a0 data/create/recipe/pressing/compat/immersiveengineering/plate_lead.json +881c2e6934075a4a7277a51cfecc8215b11309cd data/create/recipe/pressing/compat/immersiveengineering/plate_nickel.json +755c23072daf00e22b4567fd63f7c026dd1776ed data/create/recipe/pressing/compat/immersiveengineering/plate_silver.json +e2cabf16dedb13415234a0d5f2a1e27889c7a101 data/create/recipe/pressing/compat/immersiveengineering/plate_steel.json +30fe1b16d31143a5782c79a1cfe4fd57b54b54bc data/create/recipe/pressing/compat/immersiveengineering/plate_uranium.json 5ad101fc6328cbfdaa4f65d270fdc99b4f71fe2e data/create/recipe/pressing/compat/infernalexp/crimson_nylium_path.json 9ae1bdc58ba83cd1ffa09feeb22bc6ecdb371e67 data/create/recipe/pressing/compat/infernalexp/soul_soil_path.json 5204ef0e4ad10007dab02251ce90920fbdc7e099 data/create/recipe/pressing/compat/infernalexp/warped_nylium_path.json diff --git a/src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139 b/src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139 index 62823e2de0..8ccf449f42 100644 --- a/src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139 +++ b/src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139 @@ -1,2 +1,2 @@ -// 1.21.1 2025-02-02T12:32:00.912957 Create's Custom Sounds +// 1.21.1 2025-02-05T22:51:51.3274025 Create's Custom Sounds 0bca17432111ff732e5188cd3098201330e386bc assets/create/sounds.json diff --git a/src/generated/resources/.cache/e0a39a97205b7149114f15de91b614248d05fd95 b/src/generated/resources/.cache/e0a39a97205b7149114f15de91b614248d05fd95 index 8b4000ffc9..3b553a87ab 100644 --- a/src/generated/resources/.cache/e0a39a97205b7149114f15de91b614248d05fd95 +++ b/src/generated/resources/.cache/e0a39a97205b7149114f15de91b614248d05fd95 @@ -1,2 +1,2 @@ -// 1.21.1 2025-02-02T12:32:00.8401521 Create's Recipe Serializer Tags +// 1.21.1 2025-02-05T22:51:51.1787822 Create's Recipe Serializer Tags 0d8718f7383761bc5d7bc45306ed266ebf25dc1d data/create/tags/recipe_serializer/automation_ignore.json diff --git a/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f b/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f index bbddf9cee8..c555ab550d 100644 --- a/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f +++ b/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f @@ -1,3 +1,3 @@ -// 1.21.1 2025-02-02T12:32:00.9119595 Data Maps +// 1.21.1 2025-02-05T22:51:51.326414 Data Maps 037a93758a98377e8b7bb36cc140d4ab3842b181 data/neoforge/data_maps/block/oxidizables.json 3e7e7659355104c0bafb76c3e7617eecc42d8ff4 data/neoforge/data_maps/block/waxables.json diff --git a/src/generated/resources/.cache/eaed56ca9d9781c7626be345dd9f2c9a1fad638e b/src/generated/resources/.cache/eaed56ca9d9781c7626be345dd9f2c9a1fad638e index a9467fa196..e13e8b2a80 100644 --- a/src/generated/resources/.cache/eaed56ca9d9781c7626be345dd9f2c9a1fad638e +++ b/src/generated/resources/.cache/eaed56ca9d9781c7626be345dd9f2c9a1fad638e @@ -1,4 +1,4 @@ -// 1.21.1 2025-02-02T12:32:00.9139541 Create's Generated Registry Entries +// 1.21.1 2025-02-05T22:51:51.328399 Create's Generated Registry Entries 030ede1044384c4117ac1e491bf5c78bbd2842f5 data/create/damage_type/crush.json 92b0416950ffeb3ba68811e587177c2f8811c2c5 data/create/damage_type/cuckoo_surprise.json d2a4fdb64f4ba817e13a7b20c73fd1ca34b825fc data/create/damage_type/fan_fire.json diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index c9f79e60bd..fdb7ea4cb7 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -2344,7 +2344,7 @@ "create.ponder.shaft.text_1": "˙ǝuıן ʇɥbıɐɹʇs ɐ uı uoıʇɐʇoɹ ʎɐןǝɹ ןןıʍ sʇɟɐɥS", "create.ponder.shaft_casing.header": "sʇɟɐɥS buısɐɔuƎ", "create.ponder.shaft_casing.text_1": "sʇɟɐɥS ǝʇɐɹoɔǝp oʇ pǝsn ǝq uɐɔ buısɐƆ ǝʇısǝpuⱯ ɹo ssɐɹᗺ", - "create.ponder.shared.behaviour_modify_wrench": "ɥɔuǝɹM ɐ buısn pǝıɟıpoɯ ǝq uɐɔ ɹnoıʌɐɥǝq sıɥ⟘", + "create.ponder.shared.behaviour_modify_value_panel": "ןǝuɐd ǝnןɐʌ ǝɥʇ buısn pǝıɟıpoɯ ǝq uɐɔ ɹnoıʌɐɥǝq sıɥ⟘", "create.ponder.shared.movement_anchors": "˙pǝʌoɯ ǝq uɐɔ sǝɹnʇɔnɹʇs ɹǝbɹɐן 'ǝnן⅁ ɹǝdnS ɟo dןǝɥ ǝɥʇ ɥʇıM", "create.ponder.shared.rpm16": "WԀᴚ 9Ɩ", "create.ponder.shared.rpm16_source": "WԀᴚ 9Ɩ :ǝɔɹnoS", @@ -3090,7 +3090,7 @@ "create.train_assembly.no_controls": ")¿ǝnן⅁ ɹǝdnS buıssıɯ noʎ ǝɹⱯ( ʞɔoןq sןoɹʇuoƆ uıɐɹ⟘ buıɔɐɟ-pɹɐʍɹoɟ ǝuo ʇsɐǝן ʇɐ ɥɔɐʇʇⱯ", "create.train_assembly.not_connected_in_order": "ɹǝpɹo uı pǝʇɔǝuuoɔ ʇou ǝɹɐ sʎǝboᗺ", "create.train_assembly.nothing_attached": "%1$s ʎǝboᗺ oʇ pǝɥɔɐʇʇɐ ǝɹnʇɔnɹʇs oN", - "create.train_assembly.requires_casing": "sʞɔɐɹʇ uo sʎǝboq ǝʇɐǝɹɔ oʇ buısɐƆ ʎɐʍןıɐᴚ ǝs∩", + "create.train_assembly.requires_casing": "sʞɔɐɹʇ uo sʎǝboq ǝʇɐǝɹɔ oʇ buısɐƆ uıɐɹ⟘ ǝs∩", "create.train_assembly.sideways_controls": "sʎɐʍǝpıs ǝɔɐɟ ʇouuɐɔ sןoɹʇuoƆ uıɐɹ⟘", "create.train_assembly.single_bogey_carriage": "uʍo sʇı uo ǝbɐıɹɹɐɔ ɐ ʇɹoddns ʇouuɐɔ ǝdʎʇ ʎǝboᗺ sıɥ⟘", "create.train_assembly.too_many_bogeys": "%1$s :pǝɥɔɐʇʇɐ sʎǝboᗺ ʎuɐɯ oo⟘", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index cc2dcc7c89..96db58c185 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -2344,7 +2344,7 @@ "create.ponder.shaft.text_1": "Shafts will relay rotation in a straight line.", "create.ponder.shaft_casing.header": "Encasing Shafts", "create.ponder.shaft_casing.text_1": "Brass or Andesite Casing can be used to decorate Shafts", - "create.ponder.shared.behaviour_modify_wrench": "This behaviour can be modified using a Wrench", + "create.ponder.shared.behaviour_modify_value_panel": "This behaviour can be modified using the value panel", "create.ponder.shared.movement_anchors": "With the help of Super Glue, larger structures can be moved.", "create.ponder.shared.rpm16": "16 RPM", "create.ponder.shared.rpm16_source": "Source: 16 RPM", @@ -3090,7 +3090,7 @@ "create.train_assembly.no_controls": "Attach at least one forward-facing Train Controls block (Are you missing Super Glue?)", "create.train_assembly.not_connected_in_order": "Bogeys are not connected in order", "create.train_assembly.nothing_attached": "No structure attached to Bogey %1$s", - "create.train_assembly.requires_casing": "Use Railway Casing to create bogeys on tracks", + "create.train_assembly.requires_casing": "Use Train Casing to create bogeys on tracks", "create.train_assembly.sideways_controls": "Train Controls cannot face sideways", "create.train_assembly.single_bogey_carriage": "This Bogey type cannot support a carriage on its own", "create.train_assembly.too_many_bogeys": "Too many Bogeys attached: %1$s", diff --git a/src/generated/resources/data/create/recipe/cutting/compat/immersiveengineering/wire_aluminum.json b/src/generated/resources/data/create/recipe/cutting/compat/immersiveengineering/wire_aluminum.json new file mode 100644 index 0000000000..fe973b4be5 --- /dev/null +++ b/src/generated/resources/data/create/recipe/cutting/compat/immersiveengineering/wire_aluminum.json @@ -0,0 +1,21 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "type": "create:cutting", + "ingredients": [ + { + "tag": "c:plates/aluminum" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "immersiveengineering:wire_aluminum" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/cutting/compat/immersiveengineering/wire_copper.json b/src/generated/resources/data/create/recipe/cutting/compat/immersiveengineering/wire_copper.json new file mode 100644 index 0000000000..641b1f688f --- /dev/null +++ b/src/generated/resources/data/create/recipe/cutting/compat/immersiveengineering/wire_copper.json @@ -0,0 +1,21 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "type": "create:cutting", + "ingredients": [ + { + "tag": "c:plates/copper" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "immersiveengineering:wire_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/cutting/compat/immersiveengineering/wire_electrum.json b/src/generated/resources/data/create/recipe/cutting/compat/immersiveengineering/wire_electrum.json new file mode 100644 index 0000000000..7004eadfbf --- /dev/null +++ b/src/generated/resources/data/create/recipe/cutting/compat/immersiveengineering/wire_electrum.json @@ -0,0 +1,21 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "type": "create:cutting", + "ingredients": [ + { + "tag": "c:plates/electrum" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "immersiveengineering:wire_electrum" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/cutting/compat/immersiveengineering/wire_lead.json b/src/generated/resources/data/create/recipe/cutting/compat/immersiveengineering/wire_lead.json new file mode 100644 index 0000000000..0f03de4269 --- /dev/null +++ b/src/generated/resources/data/create/recipe/cutting/compat/immersiveengineering/wire_lead.json @@ -0,0 +1,21 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "type": "create:cutting", + "ingredients": [ + { + "tag": "c:plates/lead" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "immersiveengineering:wire_lead" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/cutting/compat/immersiveengineering/wire_steel.json b/src/generated/resources/data/create/recipe/cutting/compat/immersiveengineering/wire_steel.json new file mode 100644 index 0000000000..6d0b26b42b --- /dev/null +++ b/src/generated/resources/data/create/recipe/cutting/compat/immersiveengineering/wire_steel.json @@ -0,0 +1,21 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "type": "create:cutting", + "ingredients": [ + { + "tag": "c:plates/steel" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "immersiveengineering:wire_steel" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/chiseled_copper_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/chiseled_copper_from_deoxidising.json new file mode 100644 index 0000000000..7b2a075227 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/chiseled_copper_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:exposed_chiseled_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:chiseled_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/chiseled_copper_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/chiseled_copper_from_removing_wax.json new file mode 100644 index 0000000000..38225c43f0 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/chiseled_copper_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_chiseled_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:chiseled_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_block_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/copper_block_from_deoxidising.json new file mode 100644 index 0000000000..b98c2df616 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_block_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:exposed_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:copper_block" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_block_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/copper_block_from_removing_wax.json new file mode 100644 index 0000000000..d7acf9128e --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_block_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_copper_block" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:copper_block" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_bulb_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/copper_bulb_from_deoxidising.json new file mode 100644 index 0000000000..ec33debd82 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_bulb_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:exposed_copper_bulb" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:copper_bulb" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_bulb_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/copper_bulb_from_removing_wax.json new file mode 100644 index 0000000000..2203e87b9c --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_bulb_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_copper_bulb" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:copper_bulb" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_door_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/copper_door_from_deoxidising.json new file mode 100644 index 0000000000..c9d5dd9986 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_door_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:exposed_copper_door" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:copper_door" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_door_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/copper_door_from_removing_wax.json new file mode 100644 index 0000000000..476a9d18a2 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_door_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_copper_door" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:copper_door" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_grate_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/copper_grate_from_deoxidising.json new file mode 100644 index 0000000000..09a7a67001 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_grate_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:exposed_copper_grate" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:copper_grate" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_grate_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/copper_grate_from_removing_wax.json new file mode 100644 index 0000000000..d7f514b673 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_grate_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_copper_grate" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:copper_grate" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_shingle_slab_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/copper_shingle_slab_from_deoxidising.json new file mode 100644 index 0000000000..a78a939684 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_shingle_slab_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:exposed_copper_shingle_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_shingle_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_shingle_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/copper_shingle_slab_from_removing_wax.json new file mode 100644 index 0000000000..d60b47feb9 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_shingle_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_copper_shingle_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_shingle_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_shingle_stairs_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/copper_shingle_stairs_from_deoxidising.json new file mode 100644 index 0000000000..671245227b --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_shingle_stairs_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:exposed_copper_shingle_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_shingle_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_shingle_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/copper_shingle_stairs_from_removing_wax.json new file mode 100644 index 0000000000..06cafdc1a6 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_shingle_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_copper_shingle_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_shingle_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_shingles_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/copper_shingles_from_deoxidising.json new file mode 100644 index 0000000000..f945478c7c --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_shingles_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:exposed_copper_shingles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_shingles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_shingles_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/copper_shingles_from_removing_wax.json new file mode 100644 index 0000000000..ee276f8771 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_shingles_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_copper_shingles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_shingles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_tile_slab_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/copper_tile_slab_from_deoxidising.json new file mode 100644 index 0000000000..eb01726735 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_tile_slab_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:exposed_copper_tile_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_tile_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_tile_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/copper_tile_slab_from_removing_wax.json new file mode 100644 index 0000000000..24260a76b8 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_tile_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_copper_tile_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_tile_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_tile_stairs_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/copper_tile_stairs_from_deoxidising.json new file mode 100644 index 0000000000..2b7164a368 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_tile_stairs_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:exposed_copper_tile_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_tile_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_tile_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/copper_tile_stairs_from_removing_wax.json new file mode 100644 index 0000000000..640cc6d18d --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_tile_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_copper_tile_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_tile_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_tiles_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/copper_tiles_from_deoxidising.json new file mode 100644 index 0000000000..b98e016345 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_tiles_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:exposed_copper_tiles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_tiles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_tiles_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/copper_tiles_from_removing_wax.json new file mode 100644 index 0000000000..a19edbd111 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_tiles_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_copper_tiles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_tiles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_trapdoor_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/copper_trapdoor_from_deoxidising.json new file mode 100644 index 0000000000..2c3f1191e2 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_trapdoor_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:exposed_copper_trapdoor" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:copper_trapdoor" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_trapdoor_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/copper_trapdoor_from_removing_wax.json new file mode 100644 index 0000000000..08a3f90d37 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_trapdoor_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_copper_trapdoor" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:copper_trapdoor" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/cut_copper_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/cut_copper_from_deoxidising.json new file mode 100644 index 0000000000..30d6a00b11 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/cut_copper_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:exposed_cut_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:cut_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/cut_copper_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/cut_copper_from_removing_wax.json new file mode 100644 index 0000000000..55d3b26076 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/cut_copper_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_cut_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:cut_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/cut_copper_slab_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/cut_copper_slab_from_deoxidising.json new file mode 100644 index 0000000000..6ee7a38231 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/cut_copper_slab_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:exposed_cut_copper_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:cut_copper_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/cut_copper_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/cut_copper_slab_from_removing_wax.json new file mode 100644 index 0000000000..5de927285f --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/cut_copper_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_cut_copper_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:cut_copper_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/cut_copper_stairs_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/cut_copper_stairs_from_deoxidising.json new file mode 100644 index 0000000000..10a16d0afd --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/cut_copper_stairs_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:exposed_cut_copper_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:cut_copper_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/cut_copper_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/cut_copper_stairs_from_removing_wax.json new file mode 100644 index 0000000000..ba1393e4b8 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/cut_copper_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_cut_copper_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:cut_copper_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_chiseled_copper_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_chiseled_copper_from_deoxidising.json new file mode 100644 index 0000000000..ef1a7ad1d4 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_chiseled_copper_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:weathered_chiseled_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_chiseled_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_chiseled_copper_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_chiseled_copper_from_removing_wax.json new file mode 100644 index 0000000000..d11935c661 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_chiseled_copper_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_exposed_chiseled_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_chiseled_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_bulb_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_bulb_from_deoxidising.json new file mode 100644 index 0000000000..c72113c205 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_bulb_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:weathered_copper_bulb" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_copper_bulb" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_bulb_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_bulb_from_removing_wax.json new file mode 100644 index 0000000000..048ee17233 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_bulb_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_exposed_copper_bulb" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_copper_bulb" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_door_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_door_from_deoxidising.json new file mode 100644 index 0000000000..f11eb96f0a --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_door_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:weathered_copper_door" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_copper_door" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_door_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_door_from_removing_wax.json new file mode 100644 index 0000000000..545e23fed0 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_door_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_exposed_copper_door" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_copper_door" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_from_deoxidising.json new file mode 100644 index 0000000000..310fac2ff2 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:weathered_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_from_removing_wax.json new file mode 100644 index 0000000000..5f9f6e0090 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_exposed_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_grate_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_grate_from_deoxidising.json new file mode 100644 index 0000000000..6e68f5ffde --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_grate_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:weathered_copper_grate" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_copper_grate" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_grate_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_grate_from_removing_wax.json new file mode 100644 index 0000000000..3c6f90b3fe --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_grate_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_exposed_copper_grate" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_copper_grate" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_slab_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_slab_from_deoxidising.json new file mode 100644 index 0000000000..4b5c26fc4d --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_slab_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:weathered_copper_shingle_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_shingle_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_slab_from_removing_wax.json new file mode 100644 index 0000000000..1aefcef554 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_exposed_copper_shingle_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_shingle_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_stairs_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_stairs_from_deoxidising.json new file mode 100644 index 0000000000..ffb2f84ef7 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_stairs_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:weathered_copper_shingle_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_shingle_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_stairs_from_removing_wax.json new file mode 100644 index 0000000000..578666b0c9 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_exposed_copper_shingle_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_shingle_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingles_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingles_from_deoxidising.json new file mode 100644 index 0000000000..787f694610 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingles_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:weathered_copper_shingles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_shingles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingles_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingles_from_removing_wax.json new file mode 100644 index 0000000000..c9b9d0fa80 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingles_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_exposed_copper_shingles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_shingles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_slab_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_slab_from_deoxidising.json new file mode 100644 index 0000000000..aa09f58dc7 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_slab_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:weathered_copper_tile_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_tile_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_slab_from_removing_wax.json new file mode 100644 index 0000000000..fafb438bc4 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_exposed_copper_tile_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_tile_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_stairs_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_stairs_from_deoxidising.json new file mode 100644 index 0000000000..73e1ea72c5 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_stairs_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:weathered_copper_tile_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_tile_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_stairs_from_removing_wax.json new file mode 100644 index 0000000000..6e3efe241b --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_exposed_copper_tile_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_tile_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_tiles_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tiles_from_deoxidising.json new file mode 100644 index 0000000000..d393fad7f1 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tiles_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:weathered_copper_tiles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_tiles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_tiles_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tiles_from_removing_wax.json new file mode 100644 index 0000000000..54effad934 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tiles_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_exposed_copper_tiles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_tiles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_trapdoor_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_trapdoor_from_deoxidising.json new file mode 100644 index 0000000000..07679e08ce --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_trapdoor_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:weathered_copper_trapdoor" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_copper_trapdoor" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_trapdoor_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_trapdoor_from_removing_wax.json new file mode 100644 index 0000000000..eccb966f8d --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_trapdoor_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_exposed_copper_trapdoor" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_copper_trapdoor" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_from_deoxidising.json new file mode 100644 index 0000000000..623604a53f --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:weathered_cut_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_cut_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_from_removing_wax.json new file mode 100644 index 0000000000..6a07ad1f62 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_exposed_cut_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_cut_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_slab_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_slab_from_deoxidising.json new file mode 100644 index 0000000000..918a15fbc3 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_slab_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:weathered_cut_copper_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_cut_copper_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_slab_from_removing_wax.json new file mode 100644 index 0000000000..cbe8c6a27e --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_exposed_cut_copper_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_cut_copper_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_stairs_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_stairs_from_deoxidising.json new file mode 100644 index 0000000000..90302f445f --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_stairs_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:weathered_cut_copper_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_cut_copper_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_stairs_from_removing_wax.json new file mode 100644 index 0000000000..5b3fca39c0 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_exposed_cut_copper_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_cut_copper_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_chiseled_copper_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_chiseled_copper_from_removing_wax.json new file mode 100644 index 0000000000..4f3eaa7ef3 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_chiseled_copper_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_oxidized_chiseled_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:oxidized_chiseled_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_copper_bulb_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_bulb_from_removing_wax.json new file mode 100644 index 0000000000..dc6c023a85 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_bulb_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_oxidized_copper_bulb" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:oxidized_copper_bulb" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_copper_door_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_door_from_removing_wax.json new file mode 100644 index 0000000000..dbe06e9e8a --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_door_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_oxidized_copper_door" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:oxidized_copper_door" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_copper_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_from_removing_wax.json new file mode 100644 index 0000000000..8c227c104b --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_oxidized_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:oxidized_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_copper_grate_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_grate_from_removing_wax.json new file mode 100644 index 0000000000..cd80938b9b --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_grate_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_oxidized_copper_grate" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:oxidized_copper_grate" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_copper_shingle_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_shingle_slab_from_removing_wax.json new file mode 100644 index 0000000000..b26fc86a0e --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_shingle_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_oxidized_copper_shingle_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:oxidized_copper_shingle_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_copper_shingle_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_shingle_stairs_from_removing_wax.json new file mode 100644 index 0000000000..57e210ed0b --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_shingle_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_oxidized_copper_shingle_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:oxidized_copper_shingle_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_copper_shingles_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_shingles_from_removing_wax.json new file mode 100644 index 0000000000..b2beffc051 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_shingles_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_oxidized_copper_shingles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:oxidized_copper_shingles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_copper_tile_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_tile_slab_from_removing_wax.json new file mode 100644 index 0000000000..94f14510e0 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_tile_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_oxidized_copper_tile_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:oxidized_copper_tile_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_copper_tile_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_tile_stairs_from_removing_wax.json new file mode 100644 index 0000000000..921f7c7a4f --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_tile_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_oxidized_copper_tile_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:oxidized_copper_tile_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_copper_tiles_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_tiles_from_removing_wax.json new file mode 100644 index 0000000000..9faa5ac27c --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_tiles_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_oxidized_copper_tiles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:oxidized_copper_tiles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_copper_trapdoor_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_trapdoor_from_removing_wax.json new file mode 100644 index 0000000000..3c7dd42ea6 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_trapdoor_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_oxidized_copper_trapdoor" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:oxidized_copper_trapdoor" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_cut_copper_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_cut_copper_from_removing_wax.json new file mode 100644 index 0000000000..53159d4731 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_cut_copper_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_oxidized_cut_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:oxidized_cut_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_cut_copper_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_cut_copper_slab_from_removing_wax.json new file mode 100644 index 0000000000..dbe01a3623 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_cut_copper_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_oxidized_cut_copper_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:oxidized_cut_copper_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_cut_copper_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_cut_copper_stairs_from_removing_wax.json new file mode 100644 index 0000000000..578c8eba0b --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_cut_copper_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_oxidized_cut_copper_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:oxidized_cut_copper_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/waxed_chiseled_copper_from_adding_wax.json b/src/generated/resources/data/create/recipe/deploying/waxed_chiseled_copper_from_adding_wax.json new file mode 100644 index 0000000000..9cd5131d30 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/waxed_chiseled_copper_from_adding_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:chiseled_copper" + }, + { + "item": "minecraft:honeycomb_block" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:waxed_chiseled_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/waxed_copper_bulb_from_adding_wax.json b/src/generated/resources/data/create/recipe/deploying/waxed_copper_bulb_from_adding_wax.json new file mode 100644 index 0000000000..5f82f890ed --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/waxed_copper_bulb_from_adding_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:copper_bulb" + }, + { + "item": "minecraft:honeycomb_block" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:waxed_copper_bulb" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/waxed_copper_door_from_adding_wax.json b/src/generated/resources/data/create/recipe/deploying/waxed_copper_door_from_adding_wax.json new file mode 100644 index 0000000000..f69bf29fe5 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/waxed_copper_door_from_adding_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:copper_door" + }, + { + "item": "minecraft:honeycomb_block" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:waxed_copper_door" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/waxed_copper_grate_from_adding_wax.json b/src/generated/resources/data/create/recipe/deploying/waxed_copper_grate_from_adding_wax.json new file mode 100644 index 0000000000..73c640a269 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/waxed_copper_grate_from_adding_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:copper_grate" + }, + { + "item": "minecraft:honeycomb_block" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:waxed_copper_grate" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/waxed_copper_trapdoor_from_adding_wax.json b/src/generated/resources/data/create/recipe/deploying/waxed_copper_trapdoor_from_adding_wax.json new file mode 100644 index 0000000000..db7c56a1d9 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/waxed_copper_trapdoor_from_adding_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:copper_trapdoor" + }, + { + "item": "minecraft:honeycomb_block" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:waxed_copper_trapdoor" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/waxed_exposed_chiseled_copper_from_adding_wax.json b/src/generated/resources/data/create/recipe/deploying/waxed_exposed_chiseled_copper_from_adding_wax.json new file mode 100644 index 0000000000..f9f1b3d138 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/waxed_exposed_chiseled_copper_from_adding_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:exposed_chiseled_copper" + }, + { + "item": "minecraft:honeycomb_block" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:waxed_exposed_chiseled_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/waxed_exposed_copper_bulb_from_adding_wax.json b/src/generated/resources/data/create/recipe/deploying/waxed_exposed_copper_bulb_from_adding_wax.json new file mode 100644 index 0000000000..e29b1fd9d9 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/waxed_exposed_copper_bulb_from_adding_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:exposed_copper_bulb" + }, + { + "item": "minecraft:honeycomb_block" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:waxed_exposed_copper_bulb" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/waxed_exposed_copper_door_from_adding_wax.json b/src/generated/resources/data/create/recipe/deploying/waxed_exposed_copper_door_from_adding_wax.json new file mode 100644 index 0000000000..8c23e2d905 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/waxed_exposed_copper_door_from_adding_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:exposed_copper_door" + }, + { + "item": "minecraft:honeycomb_block" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:waxed_exposed_copper_door" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/waxed_exposed_copper_grate_from_adding_wax.json b/src/generated/resources/data/create/recipe/deploying/waxed_exposed_copper_grate_from_adding_wax.json new file mode 100644 index 0000000000..1b360c87bb --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/waxed_exposed_copper_grate_from_adding_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:exposed_copper_grate" + }, + { + "item": "minecraft:honeycomb_block" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:waxed_exposed_copper_grate" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/waxed_exposed_copper_trapdoor_from_adding_wax.json b/src/generated/resources/data/create/recipe/deploying/waxed_exposed_copper_trapdoor_from_adding_wax.json new file mode 100644 index 0000000000..965b8b145e --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/waxed_exposed_copper_trapdoor_from_adding_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:exposed_copper_trapdoor" + }, + { + "item": "minecraft:honeycomb_block" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:waxed_exposed_copper_trapdoor" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/waxed_oxidized_chiseled_copper_from_adding_wax.json b/src/generated/resources/data/create/recipe/deploying/waxed_oxidized_chiseled_copper_from_adding_wax.json new file mode 100644 index 0000000000..b5a62081b7 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/waxed_oxidized_chiseled_copper_from_adding_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:oxidized_chiseled_copper" + }, + { + "item": "minecraft:honeycomb_block" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:waxed_oxidized_chiseled_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/waxed_oxidized_copper_bulb_from_adding_wax.json b/src/generated/resources/data/create/recipe/deploying/waxed_oxidized_copper_bulb_from_adding_wax.json new file mode 100644 index 0000000000..fc3600ec84 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/waxed_oxidized_copper_bulb_from_adding_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:oxidized_copper_bulb" + }, + { + "item": "minecraft:honeycomb_block" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:waxed_oxidized_copper_bulb" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/waxed_oxidized_copper_door_from_adding_wax.json b/src/generated/resources/data/create/recipe/deploying/waxed_oxidized_copper_door_from_adding_wax.json new file mode 100644 index 0000000000..a09473205a --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/waxed_oxidized_copper_door_from_adding_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:oxidized_copper_door" + }, + { + "item": "minecraft:honeycomb_block" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:waxed_oxidized_copper_door" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/waxed_oxidized_copper_grate_from_adding_wax.json b/src/generated/resources/data/create/recipe/deploying/waxed_oxidized_copper_grate_from_adding_wax.json new file mode 100644 index 0000000000..5ed8f4a8d5 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/waxed_oxidized_copper_grate_from_adding_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:oxidized_copper_grate" + }, + { + "item": "minecraft:honeycomb_block" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:waxed_oxidized_copper_grate" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/waxed_oxidized_copper_trapdoor_from_adding_wax.json b/src/generated/resources/data/create/recipe/deploying/waxed_oxidized_copper_trapdoor_from_adding_wax.json new file mode 100644 index 0000000000..d7b0b14aa0 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/waxed_oxidized_copper_trapdoor_from_adding_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:oxidized_copper_trapdoor" + }, + { + "item": "minecraft:honeycomb_block" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:waxed_oxidized_copper_trapdoor" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/waxed_weathered_chiseled_copper_from_adding_wax.json b/src/generated/resources/data/create/recipe/deploying/waxed_weathered_chiseled_copper_from_adding_wax.json new file mode 100644 index 0000000000..723743befe --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/waxed_weathered_chiseled_copper_from_adding_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:weathered_chiseled_copper" + }, + { + "item": "minecraft:honeycomb_block" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:waxed_weathered_chiseled_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/waxed_weathered_copper_bulb_from_adding_wax.json b/src/generated/resources/data/create/recipe/deploying/waxed_weathered_copper_bulb_from_adding_wax.json new file mode 100644 index 0000000000..12a6742505 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/waxed_weathered_copper_bulb_from_adding_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:weathered_copper_bulb" + }, + { + "item": "minecraft:honeycomb_block" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:waxed_weathered_copper_bulb" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/waxed_weathered_copper_door_from_adding_wax.json b/src/generated/resources/data/create/recipe/deploying/waxed_weathered_copper_door_from_adding_wax.json new file mode 100644 index 0000000000..a8539c03f3 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/waxed_weathered_copper_door_from_adding_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:weathered_copper_door" + }, + { + "item": "minecraft:honeycomb_block" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:waxed_weathered_copper_door" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/waxed_weathered_copper_grate_from_adding_wax.json b/src/generated/resources/data/create/recipe/deploying/waxed_weathered_copper_grate_from_adding_wax.json new file mode 100644 index 0000000000..b83f46dc8e --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/waxed_weathered_copper_grate_from_adding_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:weathered_copper_grate" + }, + { + "item": "minecraft:honeycomb_block" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:waxed_weathered_copper_grate" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/waxed_weathered_copper_trapdoor_from_adding_wax.json b/src/generated/resources/data/create/recipe/deploying/waxed_weathered_copper_trapdoor_from_adding_wax.json new file mode 100644 index 0000000000..c1cca41f53 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/waxed_weathered_copper_trapdoor_from_adding_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:weathered_copper_trapdoor" + }, + { + "item": "minecraft:honeycomb_block" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:waxed_weathered_copper_trapdoor" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_chiseled_copper_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_chiseled_copper_from_deoxidising.json new file mode 100644 index 0000000000..a331e5c246 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_chiseled_copper_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:oxidized_chiseled_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_chiseled_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_chiseled_copper_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_chiseled_copper_from_removing_wax.json new file mode 100644 index 0000000000..06ecee2025 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_chiseled_copper_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_weathered_chiseled_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_chiseled_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_bulb_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_bulb_from_deoxidising.json new file mode 100644 index 0000000000..7bf5302547 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_bulb_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:oxidized_copper_bulb" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_copper_bulb" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_bulb_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_bulb_from_removing_wax.json new file mode 100644 index 0000000000..d825c6fa35 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_bulb_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_weathered_copper_bulb" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_copper_bulb" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_door_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_door_from_deoxidising.json new file mode 100644 index 0000000000..037fc7d5d7 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_door_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:oxidized_copper_door" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_copper_door" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_door_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_door_from_removing_wax.json new file mode 100644 index 0000000000..f4d873b8f9 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_door_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_weathered_copper_door" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_copper_door" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_from_deoxidising.json new file mode 100644 index 0000000000..d43be8aa7b --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:oxidized_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_from_removing_wax.json new file mode 100644 index 0000000000..8b6614f98c --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_weathered_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_grate_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_grate_from_deoxidising.json new file mode 100644 index 0000000000..915f8b0d7b --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_grate_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:oxidized_copper_grate" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_copper_grate" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_grate_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_grate_from_removing_wax.json new file mode 100644 index 0000000000..b5fcba2aca --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_grate_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_weathered_copper_grate" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_copper_grate" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_slab_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_slab_from_deoxidising.json new file mode 100644 index 0000000000..4789309de2 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_slab_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:oxidized_copper_shingle_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_shingle_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_slab_from_removing_wax.json new file mode 100644 index 0000000000..d9c74b8822 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_weathered_copper_shingle_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_shingle_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_stairs_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_stairs_from_deoxidising.json new file mode 100644 index 0000000000..403a03f899 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_stairs_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:oxidized_copper_shingle_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_shingle_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_stairs_from_removing_wax.json new file mode 100644 index 0000000000..0473633323 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_weathered_copper_shingle_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_shingle_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingles_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingles_from_deoxidising.json new file mode 100644 index 0000000000..aeeb95322a --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingles_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:oxidized_copper_shingles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_shingles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingles_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingles_from_removing_wax.json new file mode 100644 index 0000000000..1f8d8ddebe --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingles_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_weathered_copper_shingles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_shingles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_slab_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_slab_from_deoxidising.json new file mode 100644 index 0000000000..0b1c722735 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_slab_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:oxidized_copper_tile_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_tile_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_slab_from_removing_wax.json new file mode 100644 index 0000000000..7cdc9e39ff --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_weathered_copper_tile_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_tile_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_stairs_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_stairs_from_deoxidising.json new file mode 100644 index 0000000000..0cc6b887c3 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_stairs_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:oxidized_copper_tile_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_tile_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_stairs_from_removing_wax.json new file mode 100644 index 0000000000..4a30a19137 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_weathered_copper_tile_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_tile_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_tiles_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tiles_from_deoxidising.json new file mode 100644 index 0000000000..1d6d8992a6 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tiles_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:oxidized_copper_tiles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_tiles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_tiles_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tiles_from_removing_wax.json new file mode 100644 index 0000000000..059590fb82 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tiles_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_weathered_copper_tiles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_tiles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_trapdoor_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_trapdoor_from_deoxidising.json new file mode 100644 index 0000000000..0b7c3bd970 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_trapdoor_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:oxidized_copper_trapdoor" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_copper_trapdoor" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_trapdoor_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_trapdoor_from_removing_wax.json new file mode 100644 index 0000000000..a76cbeff1c --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_trapdoor_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_weathered_copper_trapdoor" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_copper_trapdoor" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_from_deoxidising.json new file mode 100644 index 0000000000..386e68cbec --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:oxidized_cut_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_cut_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_from_removing_wax.json new file mode 100644 index 0000000000..c4523d63ec --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_weathered_cut_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_cut_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_slab_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_slab_from_deoxidising.json new file mode 100644 index 0000000000..1cadb4594f --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_slab_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:oxidized_cut_copper_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_cut_copper_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_slab_from_removing_wax.json new file mode 100644 index 0000000000..9d7ade1662 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_weathered_cut_copper_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_cut_copper_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_stairs_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_stairs_from_deoxidising.json new file mode 100644 index 0000000000..fbb33f17c1 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_stairs_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:oxidized_cut_copper_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_cut_copper_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_stairs_from_removing_wax.json new file mode 100644 index 0000000000..09a7a29ff8 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_weathered_cut_copper_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_cut_copper_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/filling/compat/immersiveengineering/treated_wood_in_spout.json b/src/generated/resources/data/create/recipe/filling/compat/immersiveengineering/treated_wood_in_spout.json new file mode 100644 index 0000000000..6f3dbcd783 --- /dev/null +++ b/src/generated/resources/data/create/recipe/filling/compat/immersiveengineering/treated_wood_in_spout.json @@ -0,0 +1,24 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "type": "create:filling", + "ingredients": [ + { + "tag": "minecraft:planks" + }, + { + "type": "fluid_tag", + "amount": 125, + "fluidTag": "c:creosote" + } + ], + "results": [ + { + "item": "immersiveengineering:treated_wood_horizontal" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_aluminum.json b/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_aluminum.json new file mode 100644 index 0000000000..74acb35c73 --- /dev/null +++ b/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_aluminum.json @@ -0,0 +1,19 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "type": "create:pressing", + "ingredients": [ + { + "tag": "c:ingots/aluminum" + } + ], + "results": [ + { + "item": "immersiveengineering:plate_aluminum" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_constantan.json b/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_constantan.json new file mode 100644 index 0000000000..82ea3157c0 --- /dev/null +++ b/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_constantan.json @@ -0,0 +1,19 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "type": "create:pressing", + "ingredients": [ + { + "tag": "c:ingots/constantan" + } + ], + "results": [ + { + "item": "immersiveengineering:plate_constantan" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_electrum.json b/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_electrum.json new file mode 100644 index 0000000000..d15ab77257 --- /dev/null +++ b/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_electrum.json @@ -0,0 +1,19 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "type": "create:pressing", + "ingredients": [ + { + "tag": "c:ingots/electrum" + } + ], + "results": [ + { + "item": "immersiveengineering:plate_electrum" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_lead.json b/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_lead.json new file mode 100644 index 0000000000..43aa125f59 --- /dev/null +++ b/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_lead.json @@ -0,0 +1,19 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "type": "create:pressing", + "ingredients": [ + { + "tag": "c:ingots/lead" + } + ], + "results": [ + { + "item": "immersiveengineering:plate_lead" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_nickel.json b/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_nickel.json new file mode 100644 index 0000000000..25a9e85f13 --- /dev/null +++ b/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_nickel.json @@ -0,0 +1,19 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "type": "create:pressing", + "ingredients": [ + { + "tag": "c:ingots/nickel" + } + ], + "results": [ + { + "item": "immersiveengineering:plate_nickel" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_silver.json b/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_silver.json new file mode 100644 index 0000000000..e113be2c2e --- /dev/null +++ b/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_silver.json @@ -0,0 +1,19 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "type": "create:pressing", + "ingredients": [ + { + "tag": "c:ingots/silver" + } + ], + "results": [ + { + "item": "immersiveengineering:plate_silver" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_steel.json b/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_steel.json new file mode 100644 index 0000000000..4f14507d69 --- /dev/null +++ b/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_steel.json @@ -0,0 +1,19 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "type": "create:pressing", + "ingredients": [ + { + "tag": "c:ingots/steel" + } + ], + "results": [ + { + "item": "immersiveengineering:plate_steel" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_uranium.json b/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_uranium.json new file mode 100644 index 0000000000..d8507fb3a2 --- /dev/null +++ b/src/generated/resources/data/create/recipe/pressing/compat/immersiveengineering/plate_uranium.json @@ -0,0 +1,19 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "type": "create:pressing", + "ingredients": [ + { + "tag": "c:ingots/uranium" + } + ], + "results": [ + { + "item": "immersiveengineering:plate_uranium" + } + ] +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java index 26f381a992..15e7b0d6fb 100644 --- a/src/main/java/com/simibubi/create/AllItems.java +++ b/src/main/java/com/simibubi/create/AllItems.java @@ -109,7 +109,7 @@ public class AllItems { public static final ItemEntry - INCOMPLETE_PRECISION_MECHANISM = sequencedIngredient("incomplete_precision_mechanism"), + INCOMPLETE_PRECISION_MECHANISM = sequencedIngredient("incomplete_precision_mechanism"), INCOMPLETE_REINFORCED_SHEET = sequencedIngredient("unprocessed_obsidian_sheet"), INCOMPLETE_TRACK = sequencedIngredient("incomplete_track"); @@ -219,7 +219,7 @@ public class AllItems { IRON_SHEET = taggedIngredient("iron_sheet", commonItemTag("plates/iron"), PLATES.tag), GOLDEN_SHEET = taggedIngredient("golden_sheet", commonItemTag("plates/gold"), PLATES.tag, ItemTags.PIGLIN_LOVED), - CRUSHED_IRON = taggedIngredient("crushed_raw_iron", CRUSHED_RAW_MATERIALS.tag), + CRUSHED_IRON = taggedIngredient("crushed_raw_iron", CRUSHED_RAW_MATERIALS.tag), CRUSHED_GOLD = taggedIngredient("crushed_raw_gold", CRUSHED_RAW_MATERIALS.tag, ItemTags.PIGLIN_LOVED), CRUSHED_COPPER = taggedIngredient("crushed_raw_copper", CRUSHED_RAW_MATERIALS.tag), CRUSHED_ZINC = taggedIngredient("crushed_raw_zinc", CRUSHED_RAW_MATERIALS.tag); @@ -284,7 +284,7 @@ public class AllItems { public static final ItemEntry - COPPER_BACKTANK = + COPPER_BACKTANK = REGISTRATE .item("copper_backtank", p -> new BacktankItem(AllArmorMaterials.COPPER, p, Create.asResource("copper_diving"), @@ -306,7 +306,7 @@ public class AllItems { public static final ItemEntry - COPPER_DIVING_HELMET = + COPPER_DIVING_HELMET = REGISTRATE .item("copper_diving_helmet", p -> new DivingHelmetItem(AllArmorMaterials.COPPER, p, Create.asResource("copper_diving"))) @@ -323,7 +323,7 @@ public class AllItems { public static final ItemEntry - COPPER_DIVING_BOOTS = + COPPER_DIVING_BOOTS = REGISTRATE .item("copper_diving_boots", p -> new DivingBootsItem(AllArmorMaterials.COPPER, p, Create.asResource("copper_diving"))) @@ -340,13 +340,13 @@ public class AllItems { public static final ItemEntry - CARDBOARD_HELMET = REGISTRATE.item("cardboard_helmet", p -> new CardboardArmorItem(ArmorItem.Type.HELMET, p)) - .properties(p -> p.durability(Type.HELMET.getDurability(4))) - .tag(ItemTags.HEAD_ARMOR, ItemTags.TRIMMABLE_ARMOR) - .onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "item.create.cardboard_armor")) - .model(TrimmableArmorModelGenerator::generate) - .clientExtension(() -> () -> new CardboardArmorStealthOverlay()) - .register(), + CARDBOARD_HELMET = REGISTRATE.item("cardboard_helmet", p -> new CardboardArmorItem(ArmorItem.Type.HELMET, p)) + .properties(p -> p.durability(Type.HELMET.getDurability(4))) + .tag(ItemTags.HEAD_ARMOR, ItemTags.TRIMMABLE_ARMOR) + .onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "item.create.cardboard_armor")) + .model(TrimmableArmorModelGenerator::generate) + .clientExtension(() -> () -> new CardboardArmorStealthOverlay()) + .register(), CARDBOARD_CHESTPLATE = REGISTRATE.item("cardboard_chestplate", p -> new CardboardArmorItem(ArmorItem.Type.CHESTPLATE, p)) @@ -456,11 +456,11 @@ public class AllItems { .lang("List Filter") .register(), - ATTRIBUTE_FILTER = REGISTRATE.item("attribute_filter", FilterItem::attribute) - .register(), + ATTRIBUTE_FILTER = REGISTRATE.item("attribute_filter", FilterItem::attribute) + .register(), - PACKAGE_FILTER = REGISTRATE.item("package_filter", FilterItem::address) - .register(); + PACKAGE_FILTER = REGISTRATE.item("package_filter", FilterItem::address) + .register(); public static final ItemEntry SCHEDULE = REGISTRATE.item("schedule", ScheduleItem::new) .lang("Train Schedule") @@ -521,6 +521,7 @@ public class AllItems { // Load this class - public static void register() {} + public static void register() { + } } diff --git a/src/main/java/com/simibubi/create/AllPartialModels.java b/src/main/java/com/simibubi/create/AllPartialModels.java index 0c060abd0e..ac4b66cdda 100644 --- a/src/main/java/com/simibubi/create/AllPartialModels.java +++ b/src/main/java/com/simibubi/create/AllPartialModels.java @@ -238,6 +238,7 @@ public class AllPartialModels { public static final Map METAL_GIRDER_BRACKETS = new EnumMap<>(Direction.class); public static final Map TOOLBOX_LIDS = new EnumMap<>(DyeColor.class); + public static final Map DYED_VALVE_HANDLES = new EnumMap<>(DyeColor.class); public static final Map> FOLDING_DOORS = new HashMap<>(); public static final List CONTRAPTION_CONTROLS_INDICATOR = new ArrayList<>(); @@ -257,8 +258,10 @@ public class AllPartialModels { } PIPE_ATTACHMENTS.put(type, map); } - for (DyeColor color : DyeColor.values()) + for (DyeColor color : DyeColor.values()) { TOOLBOX_LIDS.put(color, block("toolbox/lid/" + Lang.asId(color.name()))); + DYED_VALVE_HANDLES.put(color, block(Lang.asId(color.name()) + "_valve_handle")); + } for (Direction d : Iterate.horizontalDirections) { METAL_GIRDER_BRACKETS.put(d, block("metal_girder/bracket_" + Lang.asId(d.name()))); FACTORY_PANEL_ARROWS.put(d, block("factory_gauge/connections/arrow_" + Lang.asId(d.name()))); diff --git a/src/main/java/com/simibubi/create/content/contraptions/ContraptionCollider.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionCollider.java index 29a5ba7f6e..231b4c58c1 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/ContraptionCollider.java +++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionCollider.java @@ -139,6 +139,10 @@ public class ContraptionCollider { float yawOffset = rotation.getYawOffset(); Vec3 position = getWorldToLocalTranslation(entity, anchorVec, rotationMatrix, yawOffset); + // Make player 'shorter' to make it less likely to become stuck + if (playerType == PlayerType.CLIENT && entityBounds.getYsize() > 1) + entityBounds = entityBounds.contract(0, 2 / 16f, 0); + motion = motion.subtract(contraptionMotion); motion = rotationMatrix.transform(motion); diff --git a/src/main/java/com/simibubi/create/content/contraptions/ContraptionHandlerClient.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionHandlerClient.java index 25fc0a7171..6c787a15ae 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/ContraptionHandlerClient.java +++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionHandlerClient.java @@ -90,6 +90,10 @@ public class ContraptionHandlerClient { Collection> contraptions = ContraptionHandler.loadedContraptions.get(mc.level) .values(); + + double bestDistance = Double.MAX_VALUE; + BlockHitResult bestResult = null; + AbstractContraptionEntity bestEntity = null; for (WeakReference ref : contraptions) { AbstractContraptionEntity contraptionEntity = ref.get(); @@ -102,20 +106,30 @@ public class ContraptionHandlerClient { BlockHitResult rayTraceResult = rayTraceContraption(origin, target, contraptionEntity); if (rayTraceResult == null) continue; - - InteractionHand hand = event.getHand(); - Direction face = rayTraceResult.getDirection(); - BlockPos pos = rayTraceResult.getBlockPos(); - - if (contraptionEntity.handlePlayerInteraction(player, pos, face, hand)) { - CatnipServices.NETWORK.sendToServer(new ContraptionInteractionPacket(contraptionEntity, hand, pos, face)); - } else if (handleSpecialInteractions(contraptionEntity, player, pos, face, hand)) { - } else + + double distance = contraptionEntity.toGlobalVector(rayTraceResult.getLocation(), 1).distanceTo(origin); + if (distance > bestDistance) continue; - - event.setCanceled(true); - event.setSwingHand(false); + + bestResult = rayTraceResult; + bestDistance = distance; + bestEntity = contraptionEntity; } + + if (bestResult == null) + return; + + InteractionHand hand = event.getHand(); + Direction face = bestResult.getDirection(); + BlockPos pos = bestResult.getBlockPos(); + + if (bestEntity.handlePlayerInteraction(player, pos, face, hand)) { + CatnipServices.NETWORK.sendToServer(new ContraptionInteractionPacket(bestEntity, hand, pos, face)); + } else + handleSpecialInteractions(bestEntity, player, pos, face, hand); + + event.setCanceled(true); + event.setSwingHand(false); } private static boolean handleSpecialInteractions(AbstractContraptionEntity contraptionEntity, Player player, diff --git a/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionVisual.java b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionVisual.java index 9be4ec1ea7..163033e4ed 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionVisual.java +++ b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionVisual.java @@ -15,6 +15,7 @@ import com.simibubi.create.content.contraptions.behaviour.MovementContext; import com.simibubi.create.foundation.utility.worldWrappers.WrappedBlockAndTintGetter; import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld; +import dev.engine_room.flywheel.api.material.CardinalLightingMode; import dev.engine_room.flywheel.api.model.Model; import dev.engine_room.flywheel.api.task.Plan; import dev.engine_room.flywheel.api.visual.BlockEntityVisual; @@ -28,6 +29,8 @@ import dev.engine_room.flywheel.api.visualization.VisualizationContext; import dev.engine_room.flywheel.api.visualization.VisualizerRegistry; import dev.engine_room.flywheel.lib.instance.InstanceTypes; import dev.engine_room.flywheel.lib.instance.TransformedInstance; +import dev.engine_room.flywheel.lib.material.SimpleMaterial; +import dev.engine_room.flywheel.lib.model.ModelUtil; import dev.engine_room.flywheel.lib.model.baked.MultiBlockModelBuilder; import dev.engine_room.flywheel.lib.task.ForEachPlan; import dev.engine_room.flywheel.lib.task.NestedPlan; @@ -99,6 +102,8 @@ public class ContraptionVisual extends Abst }; model = new MultiBlockModelBuilder(modelWorld, blocks.positions()) + .materialFunc((renderType, aBoolean) -> SimpleMaterial.builderOf(ModelUtil.getMaterial(renderType, aBoolean)) + .cardinalLightingMode(CardinalLightingMode.CHUNK)) .build(); var instancer = embedding.instancerProvider() diff --git a/src/main/java/com/simibubi/create/content/equipment/armor/BacktankUtil.java b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankUtil.java index be0150b025..488e67521a 100644 --- a/src/main/java/com/simibubi/create/content/equipment/armor/BacktankUtil.java +++ b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankUtil.java @@ -134,7 +134,7 @@ public class BacktankUtil { List backtanks = getAllWithAir(entity); if (backtanks.isEmpty()) return false; - int cost = maxAirWithoutEnchants() / usesPerTank; + int cost = Math.max(maxAirWithoutEnchants() / usesPerTank, 1); consumeAir(entity, backtanks.getFirst(), cost); return true; } diff --git a/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardBlock.java b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardBlock.java index 61005999f7..43d36a0bf7 100644 --- a/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardBlock.java +++ b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardBlock.java @@ -123,9 +123,9 @@ public class ClipboardBlock extends FaceAttachedHorizontalDirectionalBlock pPlayer.getInventory() .placeItemBackInInventory(cloneItemStack); } - + @Override - public ItemStack getCloneItemStack(BlockState state, HitResult target, LevelReader level, BlockPos pos, Player player) { + public ItemStack getCloneItemStack(LevelReader level, BlockPos pos, BlockState state) { if (level.getBlockEntity(pos) instanceof ClipboardBlockEntity cbe) return cbe.dataContainer; return new ItemStack(this); diff --git a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java index f82a62eca2..b6a11abc1f 100644 --- a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java +++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java @@ -125,7 +125,7 @@ public class PotatoCannonItem extends ProjectileWeaponItem implements CustomArmP @Override public InteractionResultHolder use(Level world, Player player, InteractionHand hand) { ItemStack stack = player.getItemInHand(hand); - return findAmmoInInventory(world, player, stack).map(itemStack -> { + return findAmmoInInventory(world, player, stack).map(ammoIn -> { if (ShootableGadgetItemMethods.shouldSwap(player, stack, hand, this::isCannon)) return InteractionResultHolder.fail(stack); @@ -142,6 +142,7 @@ public class PotatoCannonItem extends ProjectileWeaponItem implements CustomArmP .subtract(player.position() .add(0, player.getEyeHeight(), 0)); + ItemStack itemStack = ammoIn.copy(); PotatoCannonProjectileType projectileType = PotatoProjectileTypeManager.getTypeForStack(itemStack) .orElse(BuiltinPotatoProjectileTypes.FALLBACK); Vec3 lookVec = player.getLookAngle(); @@ -178,9 +179,9 @@ public class PotatoCannonItem extends ProjectileWeaponItem implements CustomArmP } if (!player.isCreative()) { - itemStack.shrink(1); - if (itemStack.isEmpty()) - player.getInventory().removeItem(itemStack); + ammoIn.shrink(1); + if (ammoIn.isEmpty()) + player.getInventory().removeItem(ammoIn); } if (!BacktankUtil.canAbsorbDamage(player, maxUses())) diff --git a/src/main/java/com/simibubi/create/content/equipment/tool/AllToolMaterials.java b/src/main/java/com/simibubi/create/content/equipment/tool/AllToolMaterials.java index 5c218b8b45..c870a4754f 100644 --- a/src/main/java/com/simibubi/create/content/equipment/tool/AllToolMaterials.java +++ b/src/main/java/com/simibubi/create/content/equipment/tool/AllToolMaterials.java @@ -15,7 +15,7 @@ import net.minecraft.world.level.block.Block; public enum AllToolMaterials implements Tier { CARDBOARD(Create.asResource("cardboard") - .toString(), 200, 1, 2, 1, () -> Ingredient.of(AllItems.CARDBOARD.asItem())) + .toString(), 0, 1, 2, 1, () -> Ingredient.of(AllItems.CARDBOARD.asItem())) ; public final String name; @@ -26,7 +26,7 @@ public enum AllToolMaterials implements Tier { private final int enchantValue; private final Supplier repairMaterial; - AllToolMaterials(String name, int uses, float speed, float damageBonus, int enchantValue, + private AllToolMaterials(String name, int uses, float speed, float damageBonus, int enchantValue, Supplier repairMaterial) { this.name = name; this.uses = uses; diff --git a/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorInteractionHandler.java b/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorInteractionHandler.java index b38046cdb5..2934f8bc48 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorInteractionHandler.java +++ b/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorInteractionHandler.java @@ -139,7 +139,7 @@ public class ChainConveyorInteractionHandler { if (AllBlocks.PACKAGE_FROGPORT.isIn(mainHandItem)) { PackagePortTargetSelectionHandler.exactPositionOfTarget = selectedBakedPosition; PackagePortTargetSelectionHandler.activePackageTarget = - new PackagePortTarget.ChainConveyorFrogportTarget(selectedLift, selectedChainPosition, selectedConnection); + new PackagePortTarget.ChainConveyorFrogportTarget(selectedLift, selectedChainPosition, selectedConnection, false); return true; } diff --git a/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlock.java b/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlock.java index 4d509c1168..0231d90f14 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlock.java +++ b/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlock.java @@ -32,8 +32,8 @@ import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; @EventBusSubscriber public class ValveHandleBlock extends HandCrankBlock { - private final DyeColor color; - + public final DyeColor color; + public static ValveHandleBlock copper(Properties properties) { return new ValveHandleBlock(properties, null); } diff --git a/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleVisual.java b/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleVisual.java index 37f2e315f1..5b46b98b9c 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleVisual.java +++ b/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleVisual.java @@ -6,17 +6,16 @@ import org.joml.Quaternionf; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.KineticBlockEntityVisual; -import com.simibubi.create.content.kinetics.base.RotatingInstance; -import com.simibubi.create.foundation.render.AllInstanceTypes; import dev.engine_room.flywheel.api.instance.Instance; -import dev.engine_room.flywheel.api.model.Model; import dev.engine_room.flywheel.api.visualization.VisualizationContext; import dev.engine_room.flywheel.lib.instance.InstanceTypes; import dev.engine_room.flywheel.lib.instance.TransformedInstance; import dev.engine_room.flywheel.lib.model.Models; import dev.engine_room.flywheel.lib.visual.SimpleDynamicVisual; import net.minecraft.core.Direction; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; public class ValveHandleVisual extends KineticBlockEntityVisual implements SimpleDynamicVisual { @@ -25,8 +24,16 @@ public class ValveHandleVisual extends KineticBlockEntityVisual { - if (t.equals(prevValue)) + if (!t.equals(prevValue)) destinationSuggestions.updateCommandInfo(); prevValue = t; }; diff --git a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java index fd890f816f..8a5a12ae4b 100644 --- a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java +++ b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java @@ -841,6 +841,8 @@ public class FactoryPanelBehaviour extends FilteringBehaviour { blockEntity.setChanged(); blockEntity.sendData(); playFeedbackSound(this); + if (!getWorld().isClientSide) + notifyRedstoneOutputs(); } @Override diff --git a/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterScreen.java b/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterScreen.java index 9067182361..dfdab4be10 100644 --- a/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterScreen.java @@ -15,6 +15,7 @@ import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.gui.widget.IconButton; import com.simibubi.create.foundation.gui.widget.Label; +import com.simibubi.create.foundation.gui.widget.ScrollInput; import com.simibubi.create.foundation.gui.widget.SelectionScrollInput; import com.simibubi.create.foundation.utility.CreateLang; @@ -145,9 +146,10 @@ public class AttributeFilterScreen extends AbstractFilterScreen, ItemAttributeType> entrySet : AllRegistries.ITEM_ATTRIBUTE_TYPES.entrySet()) attributesOfItem.addAll(entrySet.getValue().getAllAttributes(stack, minecraft.level)); diff --git a/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortTarget.java b/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortTarget.java index 3b96a84998..bade98b3d8 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortTarget.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortTarget.java @@ -73,13 +73,15 @@ public abstract class PackagePortTarget { public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group( BlockPos.CODEC.fieldOf("relative_pos").forGetter(i -> i.relativePos), Codec.FLOAT.fieldOf("chain_pos").forGetter(i -> i.chainPos), - BlockPos.CODEC.optionalFieldOf("connection").forGetter(i -> Optional.ofNullable(i.connection)) + BlockPos.CODEC.optionalFieldOf("connection").forGetter(i -> Optional.ofNullable(i.connection)), + Codec.BOOL.fieldOf("flipped").forGetter(i -> i.flipped) ).apply(instance, ChainConveyorFrogportTarget::new)); public static final StreamCodec STREAM_CODEC = StreamCodec.composite( BlockPos.STREAM_CODEC, i -> i.relativePos, ByteBufCodecs.FLOAT, i -> i.chainPos, CatnipStreamCodecBuilders.nullable(BlockPos.STREAM_CODEC), i -> i.connection, + ByteBufCodecs.BOOL, i -> i.flipped, ChainConveyorFrogportTarget::new ); @@ -88,14 +90,15 @@ public abstract class PackagePortTarget { public BlockPos connection; public boolean flipped; - public ChainConveyorFrogportTarget(BlockPos relativePos, float chainPos, Optional connection) { - this(relativePos, chainPos, connection.orElse(null)); + public ChainConveyorFrogportTarget(BlockPos relativePos, float chainPos, Optional connection, boolean flipped) { + this(relativePos, chainPos, connection.orElse(null), flipped); } - public ChainConveyorFrogportTarget(BlockPos relativePos, float chainPos, @Nullable BlockPos connection) { + public ChainConveyorFrogportTarget(BlockPos relativePos, float chainPos, @Nullable BlockPos connection, boolean flipped) { super(relativePos); this.chainPos = chainPos; this.connection = connection; + this.flipped = flipped; } @Override diff --git a/src/main/java/com/simibubi/create/content/logistics/packager/PackageDefragmenter.java b/src/main/java/com/simibubi/create/content/logistics/packager/PackageDefragmenter.java index afdd8543c0..f1b1c8b9f3 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packager/PackageDefragmenter.java +++ b/src/main/java/com/simibubi/create/content/logistics/packager/PackageDefragmenter.java @@ -54,8 +54,11 @@ public class PackageDefragmenter { for (ItemStack box : collectedPackages.get(orderId)) { address = PackageItem.getAddress(box); - if (box.has(AllDataComponents.PACKAGE_ORDER_DATA)) - orderContext = box.get(AllDataComponents.PACKAGE_ORDER_DATA).orderContext(); + if (box.has(AllDataComponents.PACKAGE_ORDER_DATA)) { + PackageOrder context = box.get(AllDataComponents.PACKAGE_ORDER_DATA).orderContext(); + if (context != null && !context.isEmpty()) + orderContext = context; + } ItemStackHandler contents = PackageItem.getContents(box); Slots: for (int slot = 0; slot < contents.getSlots(); slot++) { ItemStack stackInSlot = contents.getStackInSlot(slot); diff --git a/src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlock.java b/src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlock.java index 5bb06a28ed..317603e0d4 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlock.java @@ -83,6 +83,8 @@ public class PackagerBlock extends WrenchableDirectionalBlock implements IBE { if (be.heldBox.isEmpty()) { @@ -101,10 +103,10 @@ public class PackagerBlock extends WrenchableDirectionalBlock implements IBE 0) - return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + return ItemInteractionResult.SUCCESS; if (!level.isClientSide()) { player.getInventory() .placeItemBackInInventory(be.heldBox.copy()); @@ -116,7 +118,7 @@ public class PackagerBlock extends WrenchableDirectionalBlock implements IBE 0 && lmb && pMouseX > barX && pMouseX <= barX + 8 && pMouseY > getGuiTop() + 15 @@ -1046,15 +1055,6 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen hoveredSlot = getHoveredSlot((int) mouseX, (int) mouseY); boolean noHover = hoveredSlot == noneHovered; diff --git a/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyVisual.java b/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyVisual.java index ca555c5ba0..80f2ce24d5 100644 --- a/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyVisual.java +++ b/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyVisual.java @@ -24,8 +24,8 @@ public class StandardBogeyVisual implements BogeyVisual { var shaftInstancer = ctx.instancerProvider() .instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.SHAFT)); - shaft1 = shaftInstancer.createInstance().rotateToFace(Direction.SOUTH); - shaft2 = shaftInstancer.createInstance().rotateToFace(Direction.SOUTH); + shaft1 = shaftInstancer.createInstance(); + shaft2 = shaftInstancer.createInstance(); } @Override @@ -33,13 +33,15 @@ public class StandardBogeyVisual implements BogeyVisual { shaft1.setTransform(poseStack) .translate(-.5f, .25f, 0) .center() - .rotateZDegrees(wheelAngle) + .rotateTo(Direction.UP, Direction.SOUTH) + .rotateYDegrees(wheelAngle) .uncenter() .setChanged(); shaft2.setTransform(poseStack) .translate(-.5f, .25f, -1) .center() - .rotateZDegrees(wheelAngle) + .rotateTo(Direction.UP, Direction.SOUTH) + .rotateYDegrees(wheelAngle) .uncenter() .setChanged(); } @@ -145,8 +147,8 @@ public class StandardBogeyVisual implements BogeyVisual { super(ctx, partialTick, inContraption); var secondaryShaftInstancer = ctx.instancerProvider() .instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.SHAFT)); - secondaryShaft1 = secondaryShaftInstancer.createInstance().rotateToFace(Direction.EAST); - secondaryShaft2 = secondaryShaftInstancer.createInstance().rotateToFace(Direction.EAST); + secondaryShaft1 = secondaryShaftInstancer.createInstance(); + secondaryShaft2 = secondaryShaftInstancer.createInstance(); drive = ctx.instancerProvider() .instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.BOGEY_DRIVE)) .createInstance(); @@ -167,13 +169,15 @@ public class StandardBogeyVisual implements BogeyVisual { secondaryShaft1.setTransform(poseStack) .translate(-.5f, .25f, .5f) .center() - .rotateXDegrees(wheelAngle) + .rotateTo(Direction.UP, Direction.EAST) + .rotateYDegrees(wheelAngle) .uncenter() .setChanged(); secondaryShaft2.setTransform(poseStack) .translate(-.5f, .25f, -1.5f) .center() - .rotateXDegrees(wheelAngle) + .rotateTo(Direction.UP, Direction.EAST) + .rotateYDegrees(wheelAngle) .uncenter() .setChanged(); drive.setTransform(poseStack) diff --git a/src/main/java/com/simibubi/create/content/trains/entity/Train.java b/src/main/java/com/simibubi/create/content/trains/entity/Train.java index 94fe080f40..851489aaca 100644 --- a/src/main/java/com/simibubi/create/content/trains/entity/Train.java +++ b/src/main/java/com/simibubi/create/content/trains/entity/Train.java @@ -457,7 +457,7 @@ public class Train { } else if (speed != 0) status.trackOK(); - updateNavigationTarget(distance); + updateNavigationTarget(level, distance); } public IEdgePointListener frontSignalListener() { @@ -544,7 +544,7 @@ public class Train { }; } - private void updateNavigationTarget(double distance) { + private void updateNavigationTarget(Level level, double distance) { if (navigation.destination == null) return; @@ -578,7 +578,7 @@ public class Train { return; if (!navigatingManually && fullRefresh) { - DiscoveredPath preferredPath = runtime.startCurrentInstruction(); + DiscoveredPath preferredPath = runtime.startCurrentInstruction(level); if (preferredPath != null){ navigation.startNavigation(preferredPath); } @@ -798,8 +798,10 @@ public class Train { if (currentStation != null) { currentStation.cancelReservation(this); BlockPos blockEntityPos = currentStation.getBlockEntityPos(); - if (level.getBlockEntity(blockEntityPos) instanceof StationBlockEntity sbe) + if (level.getBlockEntity(blockEntityPos) instanceof StationBlockEntity sbe) { sbe.lastDisassembledTrainName = name.copy(); + sbe.lastDisassembledMapColorIndex = mapColorIndex; + } } Create.RAILWAYS.removeTrain(id); diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java index a4170b4d2b..1e461dc03a 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java @@ -130,7 +130,7 @@ public class ScheduleRuntime { return; } - DiscoveredPath nextPath = startCurrentInstruction(); + DiscoveredPath nextPath = startCurrentInstruction(level); if (nextPath == null) return; @@ -183,10 +183,10 @@ public class ScheduleRuntime { carriage.storage.tickIdleCargoTracker(); } - public DiscoveredPath startCurrentInstruction() { + public DiscoveredPath startCurrentInstruction(Level level) { ScheduleEntry entry = schedule.entries.get(currentEntry); ScheduleInstruction instruction = entry.instruction; - return instruction.start(this); + return instruction.start(this, level); } public void setSchedule(Schedule schedule, boolean auto) { diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeThrottleInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeThrottleInstruction.java index 7f56549f0f..c7dc62ae94 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeThrottleInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeThrottleInstruction.java @@ -19,6 +19,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; @@ -89,7 +90,7 @@ public class ChangeThrottleInstruction extends ScheduleInstruction { @Override @Nullable - public DiscoveredPath start(ScheduleRuntime runtime) { + public DiscoveredPath start(ScheduleRuntime runtime, Level level) { runtime.train.throttle = getThrottle(); runtime.state = State.PRE_TRANSIT; runtime.currentEntry++; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeTitleInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeTitleInstruction.java index 369db3419e..a281648ca2 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeTitleInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeTitleInstruction.java @@ -17,6 +17,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import net.minecraft.world.level.Level; public class ChangeTitleInstruction extends TextScheduleInstruction { @@ -59,7 +60,7 @@ public class ChangeTitleInstruction extends TextScheduleInstruction { @Override @Nullable - public DiscoveredPath start(ScheduleRuntime runtime) { + public DiscoveredPath start(ScheduleRuntime runtime, Level level) { runtime.currentTitle = getScheduleTitle(); runtime.state = State.PRE_TRANSIT; runtime.currentEntry++; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/DeliverPackagesInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/DeliverPackagesInstruction.java index 0dfea2dda5..0fd404c276 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/DeliverPackagesInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/DeliverPackagesInstruction.java @@ -27,7 +27,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.ItemStack; - +import net.minecraft.world.level.Level; import net.neoforged.neoforge.items.IItemHandlerModifiable; public class DeliverPackagesInstruction extends ScheduleInstruction { @@ -66,7 +66,7 @@ public class DeliverPackagesInstruction extends ScheduleInstruction { @Override @Nullable - public DiscoveredPath start(ScheduleRuntime runtime) { + public DiscoveredPath start(ScheduleRuntime runtime, Level level) { boolean anyMatch = false; String firstPackage = null; ArrayList validStations = new ArrayList<>(); diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/DestinationInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/DestinationInstruction.java index 8053478540..7e6db5229d 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/DestinationInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/DestinationInstruction.java @@ -6,8 +6,6 @@ import java.util.regex.PatternSyntaxException; import javax.annotation.Nullable; -import net.createmod.catnip.data.Glob; - import org.apache.commons.lang3.StringUtils; import com.google.common.collect.ImmutableList; @@ -20,12 +18,14 @@ import com.simibubi.create.content.trains.schedule.ScheduleRuntime; import com.simibubi.create.content.trains.station.GlobalStation; import com.simibubi.create.foundation.utility.CreateLang; +import net.createmod.catnip.data.Glob; import net.createmod.catnip.data.Pair; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.components.EditBox; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; @@ -78,7 +78,7 @@ public class DestinationInstruction extends TextScheduleInstruction { @Override @Nullable - public DiscoveredPath start(ScheduleRuntime runtime) { + public DiscoveredPath start(ScheduleRuntime runtime, Level level) { String regex = getFilterForRegex(); boolean anyMatch = false; ArrayList validStations = new ArrayList<>(); diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/FetchPackagesInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/FetchPackagesInstruction.java index b3c4e5f698..005488a3c0 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/FetchPackagesInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/FetchPackagesInstruction.java @@ -5,8 +5,6 @@ import java.util.List; import java.util.Map.Entry; import java.util.regex.PatternSyntaxException; -import net.createmod.catnip.data.Glob; - import org.apache.commons.lang3.StringUtils; import com.google.common.collect.ImmutableList; @@ -14,8 +12,6 @@ import com.simibubi.create.Create; import com.simibubi.create.content.logistics.box.PackageItem; import com.simibubi.create.content.logistics.box.PackageStyles; import com.simibubi.create.content.logistics.packagePort.postbox.PostboxBlockEntity; -import com.simibubi.create.content.trains.entity.Carriage; -import com.simibubi.create.content.trains.entity.CarriageContraptionEntity; import com.simibubi.create.content.trains.entity.Train; import com.simibubi.create.content.trains.graph.DiscoveredPath; import com.simibubi.create.content.trains.graph.EdgePointType; @@ -25,12 +21,14 @@ import com.simibubi.create.content.trains.station.GlobalStation; import com.simibubi.create.content.trains.station.GlobalStation.GlobalPackagePort; import com.simibubi.create.foundation.utility.CreateLang; +import net.createmod.catnip.data.Glob; import net.createmod.catnip.data.Pair; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.components.EditBox; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; @@ -67,6 +65,8 @@ public class FetchPackagesInstruction extends TextScheduleInstruction { } public String getFilterForRegex() { + if (getFilter().isBlank()) + return Glob.toRegexPattern("*", ""); return Glob.toRegexPattern(getFilter(), ""); } @@ -98,7 +98,11 @@ public class FetchPackagesInstruction extends TextScheduleInstruction { } @Override - public DiscoveredPath start(ScheduleRuntime runtime) { + public DiscoveredPath start(ScheduleRuntime runtime, Level level) { + MinecraftServer server = level.getServer(); + if (server == null) + return null; + String regex = getFilterForRegex(); boolean anyMatch = false; ArrayList validStations = new ArrayList<>(); @@ -110,25 +114,18 @@ public class FetchPackagesInstruction extends TextScheduleInstruction { return null; } - Level level = null; - for (Carriage carriage : train.carriages) { - if (level == null) { - CarriageContraptionEntity entity = carriage.anyAvailableEntity(); - if (entity != null && entity.level() instanceof ServerLevel sl) - level = sl; - } - } - for (GlobalStation globalStation : train.graph.getPoints(EdgePointType.STATION)) { + ServerLevel dimLevel = server.getLevel(globalStation.blockEntityDimension); + if (dimLevel == null) + continue; + for (Entry entry : globalStation.connectedPorts.entrySet()) { GlobalPackagePort port = entry.getValue(); BlockPos pos = entry.getKey(); IItemHandlerModifiable postboxInventory = port.offlineBuffer; - if (level != null && level.isLoaded(pos) - && level.getBlockEntity(pos) instanceof PostboxBlockEntity ppbe) { + if (dimLevel.isLoaded(pos) && dimLevel.getBlockEntity(pos) instanceof PostboxBlockEntity ppbe) postboxInventory = ppbe.inventory; - } for (int slot = 0; slot < postboxInventory.getSlots(); slot++) { ItemStack stack = postboxInventory.getStackInSlot(slot); diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ScheduleInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ScheduleInstruction.java index 0a6f1675f6..d827721a15 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ScheduleInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ScheduleInstruction.java @@ -16,6 +16,7 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.Level; import javax.annotation.Nullable; @@ -27,7 +28,7 @@ public abstract class ScheduleInstruction extends ScheduleDataEntry { public abstract boolean supportsConditions(); @Nullable - public abstract DiscoveredPath start(ScheduleRuntime runtime); + public abstract DiscoveredPath start(ScheduleRuntime runtime, Level level); public final CompoundTag write(HolderLookup.Provider registries) { CompoundTag tag = new CompoundTag(); diff --git a/src/main/java/com/simibubi/create/content/trains/station/StationBlockEntity.java b/src/main/java/com/simibubi/create/content/trains/station/StationBlockEntity.java index a2f61fa731..31473cefc1 100644 --- a/src/main/java/com/simibubi/create/content/trains/station/StationBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/trains/station/StationBlockEntity.java @@ -120,6 +120,7 @@ public class StationBlockEntity extends SmartBlockEntity implements ITransformab boolean flagFlipped; public Component lastDisassembledTrainName; + public int lastDisassembledMapColorIndex; public StationBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { super(type, pos, state); @@ -169,6 +170,7 @@ public class StationBlockEntity extends SmartBlockEntity implements ITransformab trainPresent = tag.getBoolean("ForceFlag"); if (tag.contains("PrevTrainName")) lastDisassembledTrainName = Component.Serializer.fromJson(tag.getString("PrevTrainName"), registries); + lastDisassembledMapColorIndex = tag.getInt("PrevTrainColor"); if (!clientPacket) return; @@ -195,6 +197,7 @@ public class StationBlockEntity extends SmartBlockEntity implements ITransformab if (lastDisassembledTrainName != null) tag.putString("PrevTrainName", Component.Serializer.toJson(lastDisassembledTrainName, registries)); + tag.putInt("PrevTrainColor", lastDisassembledMapColorIndex); super.write(tag, registries, clientPacket); @@ -405,7 +408,7 @@ public class StationBlockEntity extends SmartBlockEntity implements ITransformab if (train.navigation.destination != station) continue; - DiscoveredPath preferredPath = train.runtime.startCurrentInstruction(); + DiscoveredPath preferredPath = train.runtime.startCurrentInstruction(level); train.navigation.startNavigation( preferredPath != null ? preferredPath : train.navigation.findPathTo(station, Double.MAX_VALUE)); } @@ -850,7 +853,9 @@ public class StationBlockEntity extends SmartBlockEntity implements ITransformab if (lastDisassembledTrainName != null) { train.name = lastDisassembledTrainName; + train.mapColorIndex = lastDisassembledMapColorIndex; lastDisassembledTrainName = null; + lastDisassembledMapColorIndex = 0; } for (int i = 0; i < contraptions.size(); i++) { 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 df50f66dd0..0929c0ac58 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 @@ -5,6 +5,8 @@ import java.util.concurrent.CompletableFuture; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllRecipeTypes; +import com.simibubi.create.AllTags; +import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.GeneratedRecipe; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; @@ -31,7 +33,10 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { // Regions Unexplored RU_14 = stripOnlyDiffModId(Mods.RU, "silver_birch_log", Mods.MC, "stripped_birch_log"), - RU_15 = stripOnlyDiffModId(Mods.RU, "silver_birch_wood", Mods.MC, "stripped_birch_wood") + RU_15 = stripOnlyDiffModId(Mods.RU, "silver_birch_wood", Mods.MC, "stripped_birch_wood"), + + // IE + IE_WIRES = ieWires("copper", "electrum", "aluminum", "steel", "lead") ; GeneratedRecipe stripAndMakePlanks(Block wood, Block stripped, Block planks) { @@ -104,6 +109,15 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { public CuttingRecipeGen(PackOutput output, CompletableFuture registries) { super(output, registries); } + + GeneratedRecipe ieWires(String... metals) { + for (String metal : metals) + create(Mods.IE.recipeId("wire_" + metal), b -> b.duration(50) + .require(AllTags.commonItemTag("plates/" + metal)) + .output(1, Mods.IE, "wire_" + metal, 2) + .whenModLoaded(Mods.IE.getId())); + return null; + } @Override protected AllRecipeTypes getRecipeType() { diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/DeployingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/DeployingRecipeGen.java index 2e15d24b02..fe102cca1d 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/DeployingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/DeployingRecipeGen.java @@ -1,5 +1,7 @@ package com.simibubi.create.foundation.data.recipe; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.function.Supplier; @@ -10,6 +12,7 @@ import com.simibubi.create.foundation.block.CopperBlockSet.Variant; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; +import net.minecraft.tags.ItemTags; import net.minecraft.world.item.Items; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Blocks; @@ -22,44 +25,91 @@ public class DeployingRecipeGen extends ProcessingRecipeGen { GeneratedRecipe - COGWHEEL = create("cogwheel", b -> b.require(I.shaft()) - .require(I.planks()) - .output(I.cog())), + COGWHEEL = create("cogwheel", b -> b.require(I.shaft()) + .require(I.planks()) + .output(I.cog())), LARGE_COGWHEEL = create("large_cogwheel", b -> b.require(I.cog()) .require(I.planks()) .output(I.largeCog())); GeneratedRecipe - - CB1 = addWax(() -> Blocks.WAXED_COPPER_BLOCK, () -> Blocks.COPPER_BLOCK), - CB2 = addWax(() -> Blocks.WAXED_EXPOSED_COPPER, () -> Blocks.EXPOSED_COPPER), - CB3 = addWax(() -> Blocks.WAXED_WEATHERED_COPPER, () -> Blocks.WEATHERED_COPPER), - CB4 = addWax(() -> Blocks.WAXED_OXIDIZED_COPPER, () -> Blocks.OXIDIZED_COPPER), - - CCB1 = addWax(() -> Blocks.WAXED_CUT_COPPER, () -> Blocks.CUT_COPPER), - CCB2 = addWax(() -> Blocks.WAXED_EXPOSED_CUT_COPPER, () -> Blocks.EXPOSED_CUT_COPPER), - CCB3 = addWax(() -> Blocks.WAXED_WEATHERED_CUT_COPPER, () -> Blocks.WEATHERED_CUT_COPPER), - CCB4 = addWax(() -> Blocks.WAXED_OXIDIZED_CUT_COPPER, () -> Blocks.OXIDIZED_CUT_COPPER), - - CCST1 = addWax(() -> Blocks.WAXED_CUT_COPPER_STAIRS, () -> Blocks.CUT_COPPER_STAIRS), - CCST2 = addWax(() -> Blocks.WAXED_EXPOSED_CUT_COPPER_STAIRS, () -> Blocks.EXPOSED_CUT_COPPER_STAIRS), - CCST3 = addWax(() -> Blocks.WAXED_WEATHERED_CUT_COPPER_STAIRS, () -> Blocks.WEATHERED_CUT_COPPER_STAIRS), - CCST4 = addWax(() -> Blocks.WAXED_OXIDIZED_CUT_COPPER_STAIRS, () -> Blocks.OXIDIZED_CUT_COPPER_STAIRS), - - CCS1 = addWax(() -> Blocks.WAXED_CUT_COPPER_SLAB, () -> Blocks.CUT_COPPER_SLAB), - CCS2 = addWax(() -> Blocks.WAXED_EXPOSED_CUT_COPPER_SLAB, () -> Blocks.EXPOSED_CUT_COPPER_SLAB), - CCS3 = addWax(() -> Blocks.WAXED_WEATHERED_CUT_COPPER_SLAB, () -> Blocks.WEATHERED_CUT_COPPER_SLAB), - CCS4 = addWax(() -> Blocks.WAXED_OXIDIZED_CUT_COPPER_SLAB, () -> Blocks.OXIDIZED_CUT_COPPER_SLAB); - + + COPPER_BLOCK = oxidizationChain( + List.of(() -> Blocks.COPPER_BLOCK, () -> Blocks.EXPOSED_COPPER, () -> Blocks.WEATHERED_COPPER, () -> Blocks.OXIDIZED_COPPER), + List.of(() -> Blocks.WAXED_COPPER_BLOCK, () -> Blocks.WAXED_EXPOSED_COPPER, () -> Blocks.WAXED_WEATHERED_COPPER, () -> Blocks.WAXED_OXIDIZED_COPPER)), + + COPPER_BULB = oxidizationChain( + List.of(() -> Blocks.COPPER_BULB, () -> Blocks.EXPOSED_COPPER_BULB, () -> Blocks.WEATHERED_COPPER_BULB, () -> Blocks.OXIDIZED_COPPER_BULB), + List.of(() -> Blocks.WAXED_COPPER_BULB, () -> Blocks.WAXED_EXPOSED_COPPER_BULB, () -> Blocks.WAXED_WEATHERED_COPPER_BULB, () -> Blocks.WAXED_OXIDIZED_COPPER_BULB)), + + CHISELED_COPPER = oxidizationChain( + List.of(() -> Blocks.CHISELED_COPPER, () -> Blocks.EXPOSED_CHISELED_COPPER, () -> Blocks.WEATHERED_CHISELED_COPPER, () -> Blocks.OXIDIZED_CHISELED_COPPER), + List.of(() -> Blocks.WAXED_CHISELED_COPPER, () -> Blocks.WAXED_EXPOSED_CHISELED_COPPER, () -> Blocks.WAXED_WEATHERED_CHISELED_COPPER, () -> Blocks.WAXED_OXIDIZED_CHISELED_COPPER)), + + COPPER_GRATE = oxidizationChain( + List.of(() -> Blocks.COPPER_GRATE, () -> Blocks.EXPOSED_COPPER_GRATE, () -> Blocks.WEATHERED_COPPER_GRATE, () -> Blocks.OXIDIZED_COPPER_GRATE), + List.of(() -> Blocks.WAXED_COPPER_GRATE, () -> Blocks.WAXED_EXPOSED_COPPER_GRATE, () -> Blocks.WAXED_WEATHERED_COPPER_GRATE, () -> Blocks.WAXED_OXIDIZED_COPPER_GRATE)), + + COPPER_DOOR = oxidizationChain( + List.of(() -> Blocks.COPPER_DOOR, () -> Blocks.EXPOSED_COPPER_DOOR, () -> Blocks.WEATHERED_COPPER_DOOR, () -> Blocks.OXIDIZED_COPPER_DOOR), + List.of(() -> Blocks.WAXED_COPPER_DOOR, () -> Blocks.WAXED_EXPOSED_COPPER_DOOR, () -> Blocks.WAXED_WEATHERED_COPPER_DOOR, () -> Blocks.WAXED_OXIDIZED_COPPER_DOOR)), + + COPPER_TRAPDOOR = oxidizationChain( + List.of(() -> Blocks.COPPER_TRAPDOOR, () -> Blocks.EXPOSED_COPPER_TRAPDOOR, () -> Blocks.WEATHERED_COPPER_TRAPDOOR, () -> Blocks.OXIDIZED_COPPER_TRAPDOOR), + List.of(() -> Blocks.WAXED_COPPER_TRAPDOOR, () -> Blocks.WAXED_EXPOSED_COPPER_TRAPDOOR, () -> Blocks.WAXED_WEATHERED_COPPER_TRAPDOOR, () -> Blocks.WAXED_OXIDIZED_COPPER_TRAPDOOR)), + + CUT_COPPER = oxidizationChain( + List.of(() -> Blocks.CUT_COPPER, () -> Blocks.EXPOSED_CUT_COPPER, () -> Blocks.WEATHERED_CUT_COPPER, () -> Blocks.OXIDIZED_CUT_COPPER), + List.of(() -> Blocks.WAXED_CUT_COPPER, () -> Blocks.WAXED_EXPOSED_CUT_COPPER, () -> Blocks.WAXED_WEATHERED_CUT_COPPER, () -> Blocks.WAXED_OXIDIZED_CUT_COPPER)), + + CUT_COPPER_STAIRS = oxidizationChain( + List.of(() -> Blocks.CUT_COPPER_STAIRS, () -> Blocks.EXPOSED_CUT_COPPER_STAIRS, () -> Blocks.WEATHERED_CUT_COPPER_STAIRS, () -> Blocks.OXIDIZED_CUT_COPPER_STAIRS), + List.of(() -> Blocks.WAXED_CUT_COPPER_STAIRS, () -> Blocks.WAXED_EXPOSED_CUT_COPPER_STAIRS, () -> Blocks.WAXED_WEATHERED_CUT_COPPER_STAIRS, () -> Blocks.WAXED_OXIDIZED_CUT_COPPER_STAIRS)), + + CUT_COPPER_SLAB = oxidizationChain( + List.of(() -> Blocks.CUT_COPPER_SLAB, () -> Blocks.EXPOSED_CUT_COPPER_SLAB, () -> Blocks.WEATHERED_CUT_COPPER_SLAB, () -> Blocks.OXIDIZED_CUT_COPPER_SLAB), + List.of(() -> Blocks.WAXED_CUT_COPPER_SLAB, () -> Blocks.WAXED_EXPOSED_CUT_COPPER_SLAB, () -> Blocks.WAXED_WEATHERED_CUT_COPPER_SLAB, () -> Blocks.WAXED_OXIDIZED_CUT_COPPER_SLAB)) + + ; + public GeneratedRecipe copperChain(CopperBlockSet set) { - for (Variant variant : set.getVariants()) - for (WeatherState state : WeatherState.values()) - addWax(set.get(variant, state, true)::get, set.get(variant, state, false)::get); + for (Variant variant : set.getVariants()) { + List> chain = new ArrayList<>(4); + List> waxedChain = new ArrayList<>(4); + + for (WeatherState state : WeatherState.values()) { + waxedChain.add(set.get(variant, state, true)::get); + chain.add(set.get(variant, state, false)::get); + } + + oxidizationChain(chain, waxedChain); + } + return null; + } + + public GeneratedRecipe oxidizationChain(List> chain, List> waxedChain) { + for (int i = 0; i < chain.size() - 1; i++) { + Supplier to = chain.get(i); + Supplier from = chain.get(i + 1); + createWithDeferredId(idWithSuffix(to, "_from_deoxidising"), b -> b.require(from.get()) + .require(ItemTags.AXES) + .toolNotConsumed() + .output(to.get())); + } + + for (int i = 0; i < chain.size(); i++) + addWax(waxedChain.get(i), chain.get(i)); + return null; } public GeneratedRecipe addWax(Supplier waxed, Supplier nonWaxed) { + createWithDeferredId(idWithSuffix(nonWaxed, "_from_removing_wax"), b -> b.require(waxed.get()) + .require(ItemTags.AXES) + .toolNotConsumed() + .output(nonWaxed.get())); + return createWithDeferredId(idWithSuffix(waxed, "_from_adding_wax"), b -> b.require(nonWaxed.get()) .require(Items.HONEYCOMB_BLOCK) .toolNotConsumed() 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 f393bf072e..2d26efa72c 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 @@ -5,6 +5,7 @@ import java.util.concurrent.CompletableFuture; import com.simibubi.create.AllFluids; import com.simibubi.create.AllItems; import com.simibubi.create.AllRecipeTypes; +import com.simibubi.create.AllTags; import com.simibubi.create.content.fluids.potion.PotionFluidHandler; import net.minecraft.core.HolderLookup; @@ -90,7 +91,15 @@ public class FillingRecipeGen extends ProcessingRecipeGen { VMP_CURSED_GRASS = create(Mods.VMP.recipeId("cursed_grass"), b -> b.require(Fluids.WATER, 500) .require(Mods.VMP, "cursed_earth") .output(Mods.VMP, "cursed_grass") - .whenModLoaded(Mods.VMP.getId())); + .whenModLoaded(Mods.VMP.getId())), + + // IE + + IE_TREATED_WOOD = create(Mods.IE.recipeId("treated_wood_in_spout"), + b -> b.require(AllTags.commonFluidTag("creosote"), 125) + .require(I.planks()) + .output(Mods.IE, "treated_wood_horizontal") + .whenModLoaded(Mods.IE.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 ce702126d2..fe99756f14 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 @@ -2,6 +2,7 @@ package com.simibubi.create.foundation.data.recipe; import com.simibubi.create.AllItems; import com.simibubi.create.AllRecipeTypes; +import com.simibubi.create.AllTags; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; @@ -92,6 +93,10 @@ public class PressingRecipeGen extends ProcessingRecipeGen { .output(Mods.RU, "silt_dirt_path") .whenModLoaded(Mods.RU.getId())), + // IE + + IE_PLATES = iePlates("aluminum", "lead", "silver", "nickel", "uranium", "constantan", "electrum", "steel"), + // Vampirism VMP_CURSED_PATH = moddedPaths(Mods.VMP, "cursed_earth"), @@ -110,6 +115,14 @@ public class PressingRecipeGen extends ProcessingRecipeGen { return null; } + GeneratedRecipe iePlates(String... metals) { + for (String metal : metals) + create(Mods.IE.recipeId("plate_" + metal), b -> b.require(AllTags.commonItemTag("ingots/" + metal)) + .output(Mods.IE, "plate_" + metal) + .whenModLoaded(Mods.IE.getId())); + return null; + } + GeneratedRecipe moddedCompacting(Mods mod, String input, String output) { return create("compat/" + mod.getId() + "/" + output, b -> b.require(mod, input) .output(mod, output) diff --git a/src/main/java/com/simibubi/create/foundation/ponder/CreatePonderPlugin.java b/src/main/java/com/simibubi/create/foundation/ponder/CreatePonderPlugin.java index 684c8b4b72..ea95b85406 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/CreatePonderPlugin.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/CreatePonderPlugin.java @@ -42,7 +42,7 @@ public class CreatePonderPlugin implements PonderPlugin { helper.registerSharedText("rpm32", "32 RPM"); helper.registerSharedText("movement_anchors", "With the help of Super Glue, larger structures can be moved."); - helper.registerSharedText("behaviour_modify_wrench", "This behaviour can be modified using a Wrench"); + helper.registerSharedText("behaviour_modify_value_panel", "This behaviour can be modified using the value panel"); helper.registerSharedText("storage_on_contraption", "Inventories attached to the Contraption will pick up their drops automatically"); } diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BearingScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BearingScenes.java index a7e7bc1324..23e150d5de 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BearingScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BearingScenes.java @@ -388,8 +388,7 @@ public class BearingScenes { Vec3 blockSurface = util.vector().blockSurface(bearingPos, Direction.NORTH) .add(0, 2 / 16f, 0); scene.overlay().showFilterSlotInput(blockSurface, Direction.NORTH, 60); - scene.overlay().showControls(blockSurface, Pointing.DOWN, 60).scroll() - .withItem(AllItems.WRENCH.asStack()); + scene.overlay().showControls(blockSurface, Pointing.DOWN, 60).rightClick(); scene.idle(10); scene.overlay().showText(60) .pointAt(blockSurface) diff --git a/src/main/resources/assets/create/lang/default/interface.json b/src/main/resources/assets/create/lang/default/interface.json index f5f339ed42..c569ce5ac0 100644 --- a/src/main/resources/assets/create/lang/default/interface.json +++ b/src/main/resources/assets/create/lang/default/interface.json @@ -955,7 +955,7 @@ "create.train_assembly.no_controls": "Attach at least one forward-facing Train Controls block (Are you missing Super Glue?)", "create.train_assembly.sideways_controls": "Train Controls cannot face sideways", "create.train_assembly.bogey_created": "Bogey created. Click again to cycle type", - "create.train_assembly.requires_casing": "Use Railway Casing to create bogeys on tracks", + "create.train_assembly.requires_casing": "Use Train Casing to create bogeys on tracks", "create.track_target.set": "Targeted track selected", "create.track_target.success": "Successfully bound to targeted track", diff --git a/src/main/resources/assets/create/models/block/package_frogport/block.json b/src/main/resources/assets/create/models/block/package_frogport/block.json index 2193c26069..b478b4ebab 100644 --- a/src/main/resources/assets/create/models/block/package_frogport/block.json +++ b/src/main/resources/assets/create/models/block/package_frogport/block.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "textures": { "0": "create:block/port2", - "particle": "create:block/port2" + "particle": "create:block/vault/vault_top_small" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/package_frogport/item.json b/src/main/resources/assets/create/models/block/package_frogport/item.json index a702e87c80..90a855b1e9 100644 --- a/src/main/resources/assets/create/models/block/package_frogport/item.json +++ b/src/main/resources/assets/create/models/block/package_frogport/item.json @@ -4,7 +4,7 @@ "textures": { "0": "create:block/port2", "1": "create:block/port", - "particle": "create:block/port2" + "particle": "create:block/vault/vault_top_small" }, "elements": [ {