From 45465fb69b67ca3837c273b5412897d36e6bfb66 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sat, 12 Dec 2020 17:33:16 +0100 Subject: [PATCH] Minor adjustments - Fluid tanks are not nbt safe - Mekanism uses reversed ids --- src/generated/resources/.cache/cache | 21 ++++++------ ...json => ingot_osmium_compat_mekanism.json} | 4 +-- ...sm.json => ingot_tin_compat_mekanism.json} | 4 +-- ...json => ingot_osmium_compat_mekanism.json} | 4 +-- ...sm.json => ingot_tin_compat_mekanism.json} | 4 +-- ...json => ingot_osmium_compat_mekanism.json} | 2 +- ...sm.json => ingot_tin_compat_mekanism.json} | 2 +- ...json => ingot_osmium_compat_mekanism.json} | 2 +- ...sm.json => ingot_tin_compat_mekanism.json} | 2 +- .../mekanism/crushed_osmium_ore.json | 4 +-- .../splashing/mekanism/crushed_tin_ore.json | 4 +-- .../data/create/tags/blocks/safe_nbt.json | 1 - .../java/com/simibubi/create/AllBlocks.java | 1 - .../processing/ProcessingRecipeBuilder.java | 4 +-- .../data/recipe/CreateRecipeProvider.java | 2 -- .../create/foundation/data/recipe/Mods.java | 34 +++++++++++++++++++ .../data/recipe/StandardRecipeGen.java | 15 +++++--- .../data/recipe/WashingRecipeGen.java | 21 ++++++++---- 18 files changed, 88 insertions(+), 43 deletions(-) rename src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/{osmium_ingot_compat_mekanism.json => ingot_osmium_compat_mekanism.json} (80%) rename src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/{tin_ingot_compat_mekanism.json => ingot_tin_compat_mekanism.json} (81%) rename src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/{osmium_ingot_compat_mekanism.json => ingot_osmium_compat_mekanism.json} (80%) rename src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/{tin_ingot_compat_mekanism.json => ingot_tin_compat_mekanism.json} (81%) rename src/generated/resources/data/create/recipes/blasting/{osmium_ingot_compat_mekanism.json => ingot_osmium_compat_mekanism.json} (86%) rename src/generated/resources/data/create/recipes/blasting/{tin_ingot_compat_mekanism.json => ingot_tin_compat_mekanism.json} (87%) rename src/generated/resources/data/create/recipes/smelting/{osmium_ingot_compat_mekanism.json => ingot_osmium_compat_mekanism.json} (86%) rename src/generated/resources/data/create/recipes/smelting/{tin_ingot_compat_mekanism.json => ingot_tin_compat_mekanism.json} (87%) create mode 100644 src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 9182811c0..6427baf4f 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1577,20 +1577,20 @@ a135eec618e448f440d9f42cc7a3e6c63fc45a71 data/create/advancements/overstressed.j 2e253226c408dffb9dfb828b846f70ebd1cfb16e data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_immersiveengineering.json 3f022f89aeb5034f2292ca71daa9f311e8af40ff data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_immersiveengineering.json b7232d0e659de3f227289a5275f76a5a2ec578bb data/create/advancements/recipes/building_blocks/blasting/ingot_nickel_compat_immersiveengineering.json +1f527bbe24e79f3f149c06dd8be7016eea42b4e9 data/create/advancements/recipes/building_blocks/blasting/ingot_osmium_compat_mekanism.json bf68b12cf828b64f5bb407bba6cf6ced8578327c data/create/advancements/recipes/building_blocks/blasting/ingot_silver_compat_immersiveengineering.json +fc07b75f81782fa06990c7eb7febc635621df91a data/create/advancements/recipes/building_blocks/blasting/ingot_tin_compat_mekanism.json 84963b1e8eb81dd20df6a9680028f8b76fef2bae data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_immersiveengineering.json 744d8831fde05ee2598ccde10f9289512c45d55b data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_mysticalworld.json 4ef0ac97acddee1c49a0deb402b43feb40af1dc6 data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_silents_mechanisms.json 25c6e6736da3a529c4cfb384a2dba707f946ce22 data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_thermal.json 6a7c767957b8c1827ad58210b37321a2a6bb4018 data/create/advancements/recipes/building_blocks/blasting/nickel_ingot_compat_silents_mechanisms.json e2475d1fad9aaa82e99415a2a5d07a2343ce84a6 data/create/advancements/recipes/building_blocks/blasting/nickel_ingot_compat_thermal.json -075d793d172da2500e591af050176b1d3a0d26aa data/create/advancements/recipes/building_blocks/blasting/osmium_ingot_compat_mekanism.json f994f545e3a1990448e852c556d94f7eaf9954a0 data/create/advancements/recipes/building_blocks/blasting/platinum_ingot_compat_silents_mechanisms.json 85b1a8c173ca7e5421f9d2bd0f3f997c8431d15c data/create/advancements/recipes/building_blocks/blasting/quicksilver_ingot_compat_mysticalworld.json 9b48187d487ddabcad4f4e4f75b67813f26a746d data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_mysticalworld.json 96bf046af4d23dddcca5915cfbfc04a46b0d2912 data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_silents_mechanisms.json 96a3efecf663433123861136467d9fa28ea26a1e data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_thermal.json -0c12fee4021c8095385f3df008bd187dd0baea0e data/create/advancements/recipes/building_blocks/blasting/tin_ingot_compat_mekanism.json 506ade70e5bcc111323823f195c3abe4869d4c69 data/create/advancements/recipes/building_blocks/blasting/tin_ingot_compat_mysticalworld.json a75f1162ac89cd50a1ca8e525dd059fb359a6550 data/create/advancements/recipes/building_blocks/blasting/tin_ingot_compat_silents_mechanisms.json 230c3da350aa45524712d5dd28b84aa59b2883e9 data/create/advancements/recipes/building_blocks/blasting/tin_ingot_compat_thermal.json @@ -1603,20 +1603,20 @@ d192e3f2185ad3cd8cd64f639dd6395aaec89563 data/create/advancements/recipes/buildi 43d3d2c952f54fdf73e4df422554451ceff899d3 data/create/advancements/recipes/building_blocks/smelting/ingot_aluminum_compat_immersiveengineering.json 48439dd60a0a79f0ab6accc3773a3a8b64b7396e data/create/advancements/recipes/building_blocks/smelting/ingot_lead_compat_immersiveengineering.json 7d8325768f249a1ac5d79d60eb58b6eb32c51234 data/create/advancements/recipes/building_blocks/smelting/ingot_nickel_compat_immersiveengineering.json +c2a565459bc3a2b6aa1770e36295373f886b27b3 data/create/advancements/recipes/building_blocks/smelting/ingot_osmium_compat_mekanism.json d192714def52e54a58ae96f7592055e925d88bb8 data/create/advancements/recipes/building_blocks/smelting/ingot_silver_compat_immersiveengineering.json +e922be59fa4cb031020041f54d06d361f090e6a8 data/create/advancements/recipes/building_blocks/smelting/ingot_tin_compat_mekanism.json 6f0b67b3f49da5c3102a48e68e6c4f834d08b0e2 data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_immersiveengineering.json 847dc1a0bd2275a11ff02624b98cf7fdf0d8f47b data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_mysticalworld.json 79d5f852e9e48e9e8ff5cd42890fbc9ad29e9712 data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_silents_mechanisms.json cdf4697b74e4a6add2ea41825733f4d9ff2b83e6 data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_thermal.json 2be47fb3a33a7e92705767eb255d7586de56f4a5 data/create/advancements/recipes/building_blocks/smelting/nickel_ingot_compat_silents_mechanisms.json 6dff1a0b51d7a81d6a4e8f4fd8fa558f9befea1b data/create/advancements/recipes/building_blocks/smelting/nickel_ingot_compat_thermal.json -1cebfdc52bfa34515144e651ba5a6d65e97a57a9 data/create/advancements/recipes/building_blocks/smelting/osmium_ingot_compat_mekanism.json 70d98f34671f09331f6765447b95cd00c3b8d4e5 data/create/advancements/recipes/building_blocks/smelting/platinum_ingot_compat_silents_mechanisms.json 8e5beb04ea241145f4e34320cba1745fd9d386e6 data/create/advancements/recipes/building_blocks/smelting/quicksilver_ingot_compat_mysticalworld.json 60fd25d05bfe101d83e3a13678cca9940665771c data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_mysticalworld.json 29685c6f05455faa657cb51433352d005b798cf4 data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_silents_mechanisms.json 05b68914ac2fb0da7609a32369bf739e28256e41 data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_thermal.json -787158553e0eac72dffffed787d2a2529754e8b0 data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_mekanism.json 7677ff00e70a92e9c4b9035b0d706e0c255b7e26 data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_mysticalworld.json e98e6372bb065a0d82f44bea7169e8f40bd40920 data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_silents_mechanisms.json c33e122c534a7a134f69faa36446ce7564d8a705 data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_thermal.json @@ -2634,7 +2634,9 @@ d9021504be855cd2d4d91503a82b84233052adb0 data/create/recipes/blasting/gold_ingot f2307aa01ddf7accb3fe19c4d3f9b46dec1acf97 data/create/recipes/blasting/ingot_aluminum_compat_immersiveengineering.json 8315c188802bd64f7226a9e942be45173112c7ac data/create/recipes/blasting/ingot_lead_compat_immersiveengineering.json 368fd45a8e9d5d2fc0e1f8af1ffb48984b85601c data/create/recipes/blasting/ingot_nickel_compat_immersiveengineering.json +d167828a4fe3a20d765831c1df433fc3c8efeab8 data/create/recipes/blasting/ingot_osmium_compat_mekanism.json 9b5a388f0f8a3a8fae9e6bbf6460913b7c1f6fe7 data/create/recipes/blasting/ingot_silver_compat_immersiveengineering.json +7997e66e5e7aebe2c6da764902d78e3bf5f4c530 data/create/recipes/blasting/ingot_tin_compat_mekanism.json ba7498521a1e07b9bd46ec230d952fb232eaaba0 data/create/recipes/blasting/ingot_uranium_compat_immersiveengineering.json 69cda0f54c47cd44c296608cc379db855602410f data/create/recipes/blasting/iron_ingot_from_crushed.json 65a44735ffa0c3e471a1df30b987d8c3cf1764fc data/create/recipes/blasting/lead_ingot_compat_mysticalworld.json @@ -2642,13 +2644,11 @@ aeb345e5b4c266ac9e2ef6929b153cb535468d01 data/create/recipes/blasting/lead_ingot 606b46f5af59d7bd71462807ceb95edebb09a07e data/create/recipes/blasting/lead_ingot_compat_thermal.json 91691cb14043e8222c38a18bb103f874b39d30b1 data/create/recipes/blasting/nickel_ingot_compat_silents_mechanisms.json bd26be2cc7044537628e10ff057a7ce78b720025 data/create/recipes/blasting/nickel_ingot_compat_thermal.json -453a6602d70bbd30e13033565eb6ce6fa8fde194 data/create/recipes/blasting/osmium_ingot_compat_mekanism.json a99be7aae1706cce96a3b6fadd38295bb53d10b7 data/create/recipes/blasting/platinum_ingot_compat_silents_mechanisms.json 3419a88787e331d59e0da8b9084d8c8a72a84ec0 data/create/recipes/blasting/quicksilver_ingot_compat_mysticalworld.json 84b73c8ef561ab0ecc2954cd86160595975811d6 data/create/recipes/blasting/silver_ingot_compat_mysticalworld.json 3ce20049c90fc3ce446efac1d166b5e1b2855980 data/create/recipes/blasting/silver_ingot_compat_silents_mechanisms.json c49e88f38ad624a56865bb293e2b81da09ebdf37 data/create/recipes/blasting/silver_ingot_compat_thermal.json -3d0c3e23be0d237a37a1c9945a7d0021248ffc50 data/create/recipes/blasting/tin_ingot_compat_mekanism.json 44a31af2877854f1b22691eb9b0dd831f80628f0 data/create/recipes/blasting/tin_ingot_compat_mysticalworld.json dd44cf0e09b1b34b4d2c254ab3d10d05a02717aa data/create/recipes/blasting/tin_ingot_compat_silents_mechanisms.json 539c30c3c06489815b0a356735a0dd42ac432b26 data/create/recipes/blasting/tin_ingot_compat_thermal.json @@ -3327,7 +3327,9 @@ b032c79090adad2262ae94609e0b3747327d51a2 data/create/recipes/smelting/gold_ingot 5cd79470a32c77fc7347a04ad2096df08769a59f data/create/recipes/smelting/ingot_aluminum_compat_immersiveengineering.json ce34f496dca15378b5e4b21c70505e9d1184848d data/create/recipes/smelting/ingot_lead_compat_immersiveengineering.json 428b3981a13c63381115384496d89375e3d20837 data/create/recipes/smelting/ingot_nickel_compat_immersiveengineering.json +36a8f88fe3a9b09674bbba99a8f41c8ac5542cdb data/create/recipes/smelting/ingot_osmium_compat_mekanism.json 456ec25989f6d882fc931764341d8217386cf9ab data/create/recipes/smelting/ingot_silver_compat_immersiveengineering.json +d2ab440819e4534f717315b7a737bcc2883072ed data/create/recipes/smelting/ingot_tin_compat_mekanism.json 7ca0d75c667e171f2abc5faeb96ef17282b130ac data/create/recipes/smelting/ingot_uranium_compat_immersiveengineering.json fe3e4c244c34aa6948243fabd6b42f04f80d4992 data/create/recipes/smelting/iron_ingot_from_crushed.json 4a1e8041f44bb36d29ec624fc78bdfd0ac875953 data/create/recipes/smelting/lead_ingot_compat_mysticalworld.json @@ -3336,7 +3338,6 @@ fe3e4c244c34aa6948243fabd6b42f04f80d4992 data/create/recipes/smelting/iron_ingot bf0e5df5a88e583e39a4e14b006cbf33b99611e1 data/create/recipes/smelting/limestone.json 6a9ef35f3e5fc37602d887687924547ea77bffcd data/create/recipes/smelting/nickel_ingot_compat_silents_mechanisms.json 76b02e4111687e1013a2ae0d171fb01f5787626f data/create/recipes/smelting/nickel_ingot_compat_thermal.json -18d0f016d3dfa08789438e074626258932404898 data/create/recipes/smelting/osmium_ingot_compat_mekanism.json 86725fc9711c6e7971a4b396aa089ad191089bb3 data/create/recipes/smelting/platinum_ingot_compat_silents_mechanisms.json 92c308baf81fe2c8a63c90b0dfc7cf8cc2183c4b data/create/recipes/smelting/quicksilver_ingot_compat_mysticalworld.json 2c230522bb0946bde6a51442cb15c5efeea99b15 data/create/recipes/smelting/scoria.json @@ -3344,7 +3345,6 @@ f5317c85a9e10a5f9346e13aef8bb364a5203346 data/create/recipes/smelting/scoria_fro 96c2b799b812e469bb1785200d68c1e8f8cfacf7 data/create/recipes/smelting/silver_ingot_compat_mysticalworld.json 21c5fbce648ca8812d4c75e3c71934bc269e2216 data/create/recipes/smelting/silver_ingot_compat_silents_mechanisms.json c01f5fdef7419a2da5e0f24d61637ec35a006fd1 data/create/recipes/smelting/silver_ingot_compat_thermal.json -85116bc01ff8513f9e3122af0dcd32fbcd645828 data/create/recipes/smelting/tin_ingot_compat_mekanism.json 3e977195d8c825365753eb609e3bccca3302a0a3 data/create/recipes/smelting/tin_ingot_compat_mysticalworld.json 07bc2816c79de888e8f8f5954c6f917f6ab37176 data/create/recipes/smelting/tin_ingot_compat_silents_mechanisms.json 8d6139a5463119f2930476c429c175e14c7c7a58 data/create/recipes/smelting/tin_ingot_compat_thermal.json @@ -3376,8 +3376,8 @@ a43d7c9a6369a48ef7d1396f2c11dc1f3704a61e data/create/recipes/splashing/lime_conc 67d97de29a9075a7ba8edb6e47c997b02600557e data/create/recipes/splashing/limestone.json 862f7b68bb107d7c4ecc82ddd10c788eb0a07b03 data/create/recipes/splashing/magenta_concrete_powder.json 004e05fed3684de8603905d9c9381cbbd789a882 data/create/recipes/splashing/magma_block.json -11e61710da12d73aa86660c1ea208f9533a7882c data/create/recipes/splashing/mekanism/crushed_osmium_ore.json -370c28fb8f2da4fbbb498ee3de11d1d21252957b data/create/recipes/splashing/mekanism/crushed_tin_ore.json +f627573eefe0353b32d7c48abd7dcbcf13613004 data/create/recipes/splashing/mekanism/crushed_osmium_ore.json +a1828cb3c934c4146008d1d10d04adb80a80ac94 data/create/recipes/splashing/mekanism/crushed_tin_ore.json ea4a295149091e3b4b8388cb9d4dd2ab509d666e data/create/recipes/splashing/mysticalworld/crushed_lead_ore.json 1ecac82da1ccc381e303dc64e8033c13cf66fb59 data/create/recipes/splashing/mysticalworld/crushed_quicksilver_ore.json fd1751c804bfc156c7bd97955fabb19f9a4b94ec data/create/recipes/splashing/mysticalworld/crushed_silver_ore.json @@ -3431,6 +3431,7 @@ d3fdb8ece6cb072a93ddb64a0baad5ac952117a4 data/create/recipes/weathered_limestone eedf31af7134d03656c5fa57229982f9c5bed07c data/create/tags/blocks/brittle.json 13b55d6e905a02403d2e95e9ba2357f99c5f2241 data/create/tags/blocks/fan_heaters.json 3bc64e3a1e7980237435b1770a9ba2102d57fcd4 data/create/tags/blocks/fan_transparent.json +c5439249176a869a6d1537da46922d6f6c0c2186 data/create/tags/blocks/safe_nbt.json c9ac7e3e5ec18554e7184168d65e9b8e44ef5610 data/create/tags/blocks/sails.json 6cdeeac1689f7b5bfd9bc40b462143d8eaf3ad0b data/create/tags/blocks/seats.json 50936b211d94167a35ec78c89954082a336b6269 data/create/tags/blocks/valve_handles.json diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/osmium_ingot_compat_mekanism.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_osmium_compat_mekanism.json similarity index 80% rename from src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/osmium_ingot_compat_mekanism.json rename to src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_osmium_compat_mekanism.json index 1aa1197f7..c2a16b13e 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/osmium_ingot_compat_mekanism.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_osmium_compat_mekanism.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "create:blasting/osmium_ingot_compat_mekanism" + "create:blasting/ingot_osmium_compat_mekanism" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "create:blasting/osmium_ingot_compat_mekanism" + "recipe": "create:blasting/ingot_osmium_compat_mekanism" } } }, diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/tin_ingot_compat_mekanism.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_tin_compat_mekanism.json similarity index 81% rename from src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/tin_ingot_compat_mekanism.json rename to src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_tin_compat_mekanism.json index 1c1029415..a3b8566b0 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/tin_ingot_compat_mekanism.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_tin_compat_mekanism.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "create:blasting/tin_ingot_compat_mekanism" + "create:blasting/ingot_tin_compat_mekanism" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "create:blasting/tin_ingot_compat_mekanism" + "recipe": "create:blasting/ingot_tin_compat_mekanism" } } }, diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/osmium_ingot_compat_mekanism.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_osmium_compat_mekanism.json similarity index 80% rename from src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/osmium_ingot_compat_mekanism.json rename to src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_osmium_compat_mekanism.json index 8ef5a05d5..4719c363d 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/osmium_ingot_compat_mekanism.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_osmium_compat_mekanism.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "create:smelting/osmium_ingot_compat_mekanism" + "create:smelting/ingot_osmium_compat_mekanism" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "create:smelting/osmium_ingot_compat_mekanism" + "recipe": "create:smelting/ingot_osmium_compat_mekanism" } } }, diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_mekanism.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_tin_compat_mekanism.json similarity index 81% rename from src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_mekanism.json rename to src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_tin_compat_mekanism.json index be2f789a2..2b25cbd3e 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_mekanism.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_tin_compat_mekanism.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "create:smelting/tin_ingot_compat_mekanism" + "create:smelting/ingot_tin_compat_mekanism" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "create:smelting/tin_ingot_compat_mekanism" + "recipe": "create:smelting/ingot_tin_compat_mekanism" } } }, diff --git a/src/generated/resources/data/create/recipes/blasting/osmium_ingot_compat_mekanism.json b/src/generated/resources/data/create/recipes/blasting/ingot_osmium_compat_mekanism.json similarity index 86% rename from src/generated/resources/data/create/recipes/blasting/osmium_ingot_compat_mekanism.json rename to src/generated/resources/data/create/recipes/blasting/ingot_osmium_compat_mekanism.json index 65bbfe190..f191d5906 100644 --- a/src/generated/resources/data/create/recipes/blasting/osmium_ingot_compat_mekanism.json +++ b/src/generated/resources/data/create/recipes/blasting/ingot_osmium_compat_mekanism.json @@ -3,7 +3,7 @@ "ingredient": { "item": "create:crushed_osmium_ore" }, - "result": "mekanism:osmium_ingot", + "result": "mekanism:ingot_osmium", "experience": 0.1, "cookingtime": 100, "conditions": [ diff --git a/src/generated/resources/data/create/recipes/blasting/tin_ingot_compat_mekanism.json b/src/generated/resources/data/create/recipes/blasting/ingot_tin_compat_mekanism.json similarity index 87% rename from src/generated/resources/data/create/recipes/blasting/tin_ingot_compat_mekanism.json rename to src/generated/resources/data/create/recipes/blasting/ingot_tin_compat_mekanism.json index 182dec6ef..0bc4fe4f7 100644 --- a/src/generated/resources/data/create/recipes/blasting/tin_ingot_compat_mekanism.json +++ b/src/generated/resources/data/create/recipes/blasting/ingot_tin_compat_mekanism.json @@ -3,7 +3,7 @@ "ingredient": { "item": "create:crushed_tin_ore" }, - "result": "mekanism:tin_ingot", + "result": "mekanism:ingot_tin", "experience": 0.1, "cookingtime": 100, "conditions": [ diff --git a/src/generated/resources/data/create/recipes/smelting/osmium_ingot_compat_mekanism.json b/src/generated/resources/data/create/recipes/smelting/ingot_osmium_compat_mekanism.json similarity index 86% rename from src/generated/resources/data/create/recipes/smelting/osmium_ingot_compat_mekanism.json rename to src/generated/resources/data/create/recipes/smelting/ingot_osmium_compat_mekanism.json index b522da67c..56f95d5f3 100644 --- a/src/generated/resources/data/create/recipes/smelting/osmium_ingot_compat_mekanism.json +++ b/src/generated/resources/data/create/recipes/smelting/ingot_osmium_compat_mekanism.json @@ -3,7 +3,7 @@ "ingredient": { "item": "create:crushed_osmium_ore" }, - "result": "mekanism:osmium_ingot", + "result": "mekanism:ingot_osmium", "experience": 0.1, "cookingtime": 200, "conditions": [ diff --git a/src/generated/resources/data/create/recipes/smelting/tin_ingot_compat_mekanism.json b/src/generated/resources/data/create/recipes/smelting/ingot_tin_compat_mekanism.json similarity index 87% rename from src/generated/resources/data/create/recipes/smelting/tin_ingot_compat_mekanism.json rename to src/generated/resources/data/create/recipes/smelting/ingot_tin_compat_mekanism.json index c5f7205c7..476cd4942 100644 --- a/src/generated/resources/data/create/recipes/smelting/tin_ingot_compat_mekanism.json +++ b/src/generated/resources/data/create/recipes/smelting/ingot_tin_compat_mekanism.json @@ -3,7 +3,7 @@ "ingredient": { "item": "create:crushed_tin_ore" }, - "result": "mekanism:tin_ingot", + "result": "mekanism:ingot_tin", "experience": 0.1, "cookingtime": 200, "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_osmium_ore.json b/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_osmium_ore.json index a01ea54c9..b05c11800 100644 --- a/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_osmium_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_osmium_ore.json @@ -7,11 +7,11 @@ ], "results": [ { - "item": "mekanism:osmium_nugget", + "item": "mekanism:nugget_osmium", "count": 10 }, { - "item": "mekanism:osmium_nugget", + "item": "mekanism:nugget_osmium", "count": 5, "chance": 0.5 } diff --git a/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_tin_ore.json b/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_tin_ore.json index 4f04dbf57..21f9b3556 100644 --- a/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_tin_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_tin_ore.json @@ -7,11 +7,11 @@ ], "results": [ { - "item": "mekanism:tin_nugget", + "item": "mekanism:nugget_tin", "count": 10 }, { - "item": "mekanism:tin_nugget", + "item": "mekanism:nugget_tin", "count": 5, "chance": 0.5 } diff --git a/src/generated/resources/data/create/tags/blocks/safe_nbt.json b/src/generated/resources/data/create/tags/blocks/safe_nbt.json index e0049a6df..cd67c1292 100644 --- a/src/generated/resources/data/create/tags/blocks/safe_nbt.json +++ b/src/generated/resources/data/create/tags/blocks/safe_nbt.json @@ -2,7 +2,6 @@ "replace": false, "values": [ "create:creative_motor", - "create:fluid_tank", "create:creative_fluid_tank", "create:mechanical_piston", "create:sticky_mechanical_piston", diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 91864933b..1b9fcc141 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -593,7 +593,6 @@ public class AllBlocks { public static final BlockEntry FLUID_TANK = REGISTRATE.block("fluid_tank", FluidTankBlock::regular) .initialProperties(SharedProperties::softMetal) - .tag(AllBlockTags.SAFE_NBT.tag) .properties(Block.Properties::nonOpaque) .blockstate(new FluidTankGenerator()::generate) .onRegister(CreateRegistrate.blockModel(() -> FluidTankModel::standard)) diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeBuilder.java b/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeBuilder.java index cd30fdcd8..386e6ecad 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeBuilder.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeBuilder.java @@ -156,8 +156,8 @@ public class ProcessingRecipeBuilder> { return this; } - public ProcessingRecipeBuilder output(float chance, String modId, String registryName, int amount) { - params.results.add(new ProcessingOutput(Pair.of(new ResourceLocation(modId, registryName), amount), chance)); + public ProcessingRecipeBuilder output(float chance, ResourceLocation registryName, int amount) { + params.results.add(new ProcessingOutput(Pair.of(registryName, amount), chance)); return this; } diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CreateRecipeProvider.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CreateRecipeProvider.java index 299c6ff17..035fcc2f8 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CreateRecipeProvider.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CreateRecipeProvider.java @@ -20,8 +20,6 @@ import net.minecraftforge.common.Tags; public abstract class CreateRecipeProvider extends RecipeProvider { - public final String MEK = "mekanism", TH = "thermal", MW = "mysticalworld", SM = "silents_mechanisms", IE = "immersiveengineering"; - final List all = new ArrayList<>(); public CreateRecipeProvider(DataGenerator p_i48262_1_) { diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java b/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java new file mode 100644 index 000000000..500f7ae98 --- /dev/null +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java @@ -0,0 +1,34 @@ +package com.simibubi.create.foundation.data.recipe; + +import net.minecraft.util.ResourceLocation; + +public enum Mods { + + MEK("mekanism", true), + TH("thermal", false), + MW("mysticalworld", false), + SM("silents_mechanisms", false), + IE("immersiveengineering", true) + + ; + + private String id; + private boolean reversedPrefix; + + private Mods(String id, boolean reversedPrefix) { + this.id = id; + this.reversedPrefix = reversedPrefix;} + + public ResourceLocation ingotOf(String type) { + return new ResourceLocation(id, reversedPrefix ? "ingot_" + type : type + "_ingot"); + } + + public ResourceLocation nuggetOf(String type) { + return new ResourceLocation(id, reversedPrefix ? "nugget_" + type : type + "_nugget"); + } + + public String getId() { + return id; + } + +} diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java index aae5fb32d..856f55c34 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java @@ -1,5 +1,11 @@ package com.simibubi.create.foundation.data.recipe; +import static com.simibubi.create.foundation.data.recipe.Mods.IE; +import static com.simibubi.create.foundation.data.recipe.Mods.MEK; +import static com.simibubi.create.foundation.data.recipe.Mods.MW; +import static com.simibubi.create.foundation.data.recipe.Mods.SM; +import static com.simibubi.create.foundation.data.recipe.Mods.TH; + import java.util.ArrayList; import java.util.List; import java.util.function.UnaryOperator; @@ -994,10 +1000,11 @@ public class StandardRecipeGen extends CreateRecipeProvider { .inBlastFurnace(); } - GeneratedRecipe blastModdedCrushedMetal(ItemEntry ingredient, String metalName, String... mods) { - for (String modId : mods) { - String ingot = modId.equals(IE) ? "ingot_" + metalName : metalName + "_ingot"; - create(new ResourceLocation(modId, ingot)).withSuffix("_compat_" + modId) + GeneratedRecipe blastModdedCrushedMetal(ItemEntry ingredient, String metalName, Mods... mods) { + for (Mods mod : mods) { + ResourceLocation ingot = mod.ingotOf(metalName); + String modId = mod.getId(); + create(ingot).withSuffix("_compat_" + modId) .whenModLoaded(modId) .viaCooking(ingredient::get) .rewardXP(.1f) diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/WashingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/WashingRecipeGen.java index d4fbc0a4d..6c726e541 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/WashingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/WashingRecipeGen.java @@ -1,5 +1,11 @@ package com.simibubi.create.foundation.data.recipe; +import static com.simibubi.create.foundation.data.recipe.Mods.IE; +import static com.simibubi.create.foundation.data.recipe.Mods.MEK; +import static com.simibubi.create.foundation.data.recipe.Mods.MW; +import static com.simibubi.create.foundation.data.recipe.Mods.SM; +import static com.simibubi.create.foundation.data.recipe.Mods.TH; + import java.util.function.Supplier; import com.simibubi.create.AllItems; @@ -15,6 +21,7 @@ import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; import net.minecraft.tags.ItemTags; import net.minecraft.util.IItemProvider; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.Tags; public class WashingRecipeGen extends ProcessingRecipeGen { @@ -86,15 +93,15 @@ public class WashingRecipeGen extends ProcessingRecipeGen { .output(.5f, nugget.get(), 5)); } - public GeneratedRecipe moddedCrushedOre(ItemEntry crushed, String metalName, String... mods) { - for (String modId : mods) { - String nugget = modId.equals(IE) ? "nugget_" + metalName : metalName + "_nugget"; - create(modId + "/" + crushed.getId() + public GeneratedRecipe moddedCrushedOre(ItemEntry crushed, String metalName, Mods... mods) { + for (Mods mod : mods) { + ResourceLocation nugget = mod.nuggetOf(metalName); + create(mod.getId() + "/" + crushed.getId() .getPath(), b -> b.withItemIngredients(Ingredient.fromItems(crushed::get)) - .output(1, modId, nugget, 10) - .output(.5f, modId, nugget, 5) - .whenModLoaded(modId)); + .output(1, nugget, 10) + .output(.5f, nugget, 5) + .whenModLoaded(mod.getId())); } return null; }