From 17ba73dedfcbef377d29b860e82d39de85ec5e7c Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Fri, 11 Dec 2020 13:02:04 +0100 Subject: [PATCH] Thermal compat - Apparently this mod is still a thing --- src/generated/resources/.cache/cache | 20 ++++++++++++ .../blasting/lead_ingot_compat_thermal.json | 32 +++++++++++++++++++ .../blasting/nickel_ingot_compat_thermal.json | 32 +++++++++++++++++++ .../blasting/silver_ingot_compat_thermal.json | 32 +++++++++++++++++++ .../blasting/tin_ingot_compat_thermal.json | 32 +++++++++++++++++++ .../smelting/lead_ingot_compat_thermal.json | 32 +++++++++++++++++++ .../smelting/nickel_ingot_compat_thermal.json | 32 +++++++++++++++++++ .../smelting/silver_ingot_compat_thermal.json | 32 +++++++++++++++++++ .../smelting/tin_ingot_compat_thermal.json | 32 +++++++++++++++++++ .../blasting/lead_ingot_compat_thermal.json | 15 +++++++++ .../blasting/nickel_ingot_compat_thermal.json | 15 +++++++++ .../blasting/silver_ingot_compat_thermal.json | 15 +++++++++ .../blasting/tin_ingot_compat_thermal.json | 15 +++++++++ .../smelting/lead_ingot_compat_thermal.json | 15 +++++++++ .../smelting/nickel_ingot_compat_thermal.json | 15 +++++++++ .../smelting/silver_ingot_compat_thermal.json | 15 +++++++++ .../smelting/tin_ingot_compat_thermal.json | 15 +++++++++ .../splashing/thermal/crushed_lead_ore.json | 25 +++++++++++++++ .../splashing/thermal/crushed_nickel_ore.json | 25 +++++++++++++++ .../splashing/thermal/crushed_silver_ore.json | 25 +++++++++++++++ .../splashing/thermal/crushed_tin_ore.json | 25 +++++++++++++++ .../content/schematics/MaterialChecklist.java | 6 ++-- .../data/recipe/CreateRecipeProvider.java | 2 +- .../data/recipe/StandardRecipeGen.java | 8 ++--- .../data/recipe/WashingRecipeGen.java | 8 ++--- .../compat/thermal/crushing/apatite_ore.json | 31 ++++++++++++++++++ .../compat/thermal/crushing/cinnabar_ore.json | 31 ++++++++++++++++++ .../compat/thermal/crushing/niter_ore.json | 31 ++++++++++++++++++ .../compat/thermal/crushing/sulfur_ore.json | 31 ++++++++++++++++++ 29 files changed, 633 insertions(+), 11 deletions(-) create mode 100644 src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_thermal.json create mode 100644 src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/nickel_ingot_compat_thermal.json create mode 100644 src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_thermal.json create mode 100644 src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/tin_ingot_compat_thermal.json create mode 100644 src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_thermal.json create mode 100644 src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/nickel_ingot_compat_thermal.json create mode 100644 src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_thermal.json create mode 100644 src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_thermal.json create mode 100644 src/generated/resources/data/create/recipes/blasting/lead_ingot_compat_thermal.json create mode 100644 src/generated/resources/data/create/recipes/blasting/nickel_ingot_compat_thermal.json create mode 100644 src/generated/resources/data/create/recipes/blasting/silver_ingot_compat_thermal.json create mode 100644 src/generated/resources/data/create/recipes/blasting/tin_ingot_compat_thermal.json create mode 100644 src/generated/resources/data/create/recipes/smelting/lead_ingot_compat_thermal.json create mode 100644 src/generated/resources/data/create/recipes/smelting/nickel_ingot_compat_thermal.json create mode 100644 src/generated/resources/data/create/recipes/smelting/silver_ingot_compat_thermal.json create mode 100644 src/generated/resources/data/create/recipes/smelting/tin_ingot_compat_thermal.json create mode 100644 src/generated/resources/data/create/recipes/splashing/thermal/crushed_lead_ore.json create mode 100644 src/generated/resources/data/create/recipes/splashing/thermal/crushed_nickel_ore.json create mode 100644 src/generated/resources/data/create/recipes/splashing/thermal/crushed_silver_ore.json create mode 100644 src/generated/resources/data/create/recipes/splashing/thermal/crushed_tin_ore.json create mode 100644 src/main/resources/data/create/recipes/compat/thermal/crushing/apatite_ore.json create mode 100644 src/main/resources/data/create/recipes/compat/thermal/crushing/cinnabar_ore.json create mode 100644 src/main/resources/data/create/recipes/compat/thermal/crushing/niter_ore.json create mode 100644 src/main/resources/data/create/recipes/compat/thermal/crushing/sulfur_ore.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index bd1124aa0..74c77ae29 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1581,15 +1581,19 @@ bf68b12cf828b64f5bb407bba6cf6ced8578327c data/create/advancements/recipes/buildi 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 38410d4b3bbbf33c1c8913735abd1b3d71fb3829 data/create/advancements/recipes/building_blocks/blasting/uranium_ingot_compat_silents_mechanisms.json 22067545c460d95831d9dddf361da9becac3396e data/create/advancements/recipes/building_blocks/smelting/aluminum_ingot_compat_silents_mechanisms.json e525d8eda8d0aac6791ae935ed4f3f75cc521460 data/create/advancements/recipes/building_blocks/smelting/glass_from_framed_glass.json @@ -1603,15 +1607,19 @@ d192714def52e54a58ae96f7592055e925d88bb8 data/create/advancements/recipes/buildi 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 8b47a4314f17dabe490ffc9bcd9b9d32640a6ef2 data/create/advancements/recipes/building_blocks/smelting/uranium_ingot_compat_silents_mechanisms.json 9db50289b778cbcdfd9cd8589361924a0f1bebad data/create/advancements/recipes/create.base/blasting/brass_ingot_from_crushed.json 9b7a18a8697ef7ea09538909df640af53d0b6ca7 data/create/advancements/recipes/create.base/blasting/copper_ingot_from_crushed.json @@ -2631,15 +2639,19 @@ ba7498521a1e07b9bd46ec230d952fb232eaaba0 data/create/recipes/blasting/ingot_uran 69cda0f54c47cd44c296608cc379db855602410f data/create/recipes/blasting/iron_ingot_from_crushed.json 65a44735ffa0c3e471a1df30b987d8c3cf1764fc data/create/recipes/blasting/lead_ingot_compat_mysticalworld.json aeb345e5b4c266ac9e2ef6929b153cb535468d01 data/create/recipes/blasting/lead_ingot_compat_silents_mechanisms.json +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 363e231126694b3ed8dc539b9dfb1c949bacbf5e data/create/recipes/blasting/uranium_ingot_compat_silents_mechanisms.json 70b58fa5ee4ca088f5cd9d4bce2853b1bbf98780 data/create/recipes/blasting/zinc_ingot_from_crushed.json 397a2b5d5d3b072066c3d7a9546769560e4674a3 data/create/recipes/blasting/zinc_ingot_from_ore.json @@ -3320,8 +3332,10 @@ ce34f496dca15378b5e4b21c70505e9d1184848d data/create/recipes/smelting/ingot_lead fe3e4c244c34aa6948243fabd6b42f04f80d4992 data/create/recipes/smelting/iron_ingot_from_crushed.json 4a1e8041f44bb36d29ec624fc78bdfd0ac875953 data/create/recipes/smelting/lead_ingot_compat_mysticalworld.json 76433e1605c03dec670d95e9541770c53f4a5aaf data/create/recipes/smelting/lead_ingot_compat_silents_mechanisms.json +5247ec83241f698e363d676ad1f19070c736f150 data/create/recipes/smelting/lead_ingot_compat_thermal.json 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 @@ -3329,9 +3343,11 @@ bf0e5df5a88e583e39a4e14b006cbf33b99611e1 data/create/recipes/smelting/limestone. f5317c85a9e10a5f9346e13aef8bb364a5203346 data/create/recipes/smelting/scoria_from_natural.json 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 4284a72dcd1819d9a9a644a955d3398d489e10fe data/create/recipes/smelting/uranium_ingot_compat_silents_mechanisms.json a5d23be4cc959eb47d84b210190abaafcf41f022 data/create/recipes/smelting/zinc_ingot_from_crushed.json 2d8e448bbe841871c5d9a022149c5f34fd5c0df1 data/create/recipes/smelting/zinc_ingot_from_ore.json @@ -3382,6 +3398,10 @@ fc9889cf6c0594b3635670b85f5cfec628a78537 data/create/recipes/splashing/silents_m cf0dcdb8ec3f3e75b315faa377eccef662dea71f data/create/recipes/splashing/soul_sand.json ba660fe5786c95a359a6ddfdeb73d7109cbebe5d data/create/recipes/splashing/stained_glass.json c7a51fd1b730d48991cf6b4f1b56da4144537f1d data/create/recipes/splashing/stained_glass_pane.json +0dab1568708dfa19a2f4c3d06074bb12d477b89c data/create/recipes/splashing/thermal/crushed_lead_ore.json +1bb810e459ab32eaa33e29d4868f4d057b5b3273 data/create/recipes/splashing/thermal/crushed_nickel_ore.json +13a59189b523238f8e39b928d129993608c6ffbc data/create/recipes/splashing/thermal/crushed_silver_ore.json +b7287dc1142ec6f5d6945424f3a183784bd5e270 data/create/recipes/splashing/thermal/crushed_tin_ore.json 39bd2780c1d3066e6b5b8d3b029f058f5ea63165 data/create/recipes/splashing/wheat_flour.json 24cedf74a5a118fa03c7e91a3fdaae3e41f6ec40 data/create/recipes/splashing/white_concrete_powder.json 4ad9a4699a6e28c4406ab2aa453bbe50fcb34abc data/create/recipes/splashing/wool.json diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_thermal.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_thermal.json new file mode 100644 index 000000000..d1d9d5e92 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_thermal.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:blasting/lead_ingot_compat_thermal" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "create:crushed_lead_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:blasting/lead_ingot_compat_thermal" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/nickel_ingot_compat_thermal.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/nickel_ingot_compat_thermal.json new file mode 100644 index 000000000..ef3951a56 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/nickel_ingot_compat_thermal.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:blasting/nickel_ingot_compat_thermal" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "create:crushed_nickel_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:blasting/nickel_ingot_compat_thermal" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_thermal.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_thermal.json new file mode 100644 index 000000000..05e2d52e6 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_thermal.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:blasting/silver_ingot_compat_thermal" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "create:crushed_silver_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:blasting/silver_ingot_compat_thermal" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/tin_ingot_compat_thermal.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/tin_ingot_compat_thermal.json new file mode 100644 index 000000000..31234b7cc --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/tin_ingot_compat_thermal.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:blasting/tin_ingot_compat_thermal" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "create:crushed_tin_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:blasting/tin_ingot_compat_thermal" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_thermal.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_thermal.json new file mode 100644 index 000000000..9d8874f9b --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_thermal.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:smelting/lead_ingot_compat_thermal" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "create:crushed_lead_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:smelting/lead_ingot_compat_thermal" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/nickel_ingot_compat_thermal.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/nickel_ingot_compat_thermal.json new file mode 100644 index 000000000..11fe26842 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/nickel_ingot_compat_thermal.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:smelting/nickel_ingot_compat_thermal" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "create:crushed_nickel_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:smelting/nickel_ingot_compat_thermal" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_thermal.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_thermal.json new file mode 100644 index 000000000..e90a9f346 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_thermal.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:smelting/silver_ingot_compat_thermal" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "create:crushed_silver_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:smelting/silver_ingot_compat_thermal" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_thermal.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_thermal.json new file mode 100644 index 000000000..a0e99fb44 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_thermal.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:smelting/tin_ingot_compat_thermal" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "create:crushed_tin_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:smelting/tin_ingot_compat_thermal" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/blasting/lead_ingot_compat_thermal.json b/src/generated/resources/data/create/recipes/blasting/lead_ingot_compat_thermal.json new file mode 100644 index 000000000..e6b05e422 --- /dev/null +++ b/src/generated/resources/data/create/recipes/blasting/lead_ingot_compat_thermal.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "create:crushed_lead_ore" + }, + "result": "thermal:lead_ingot", + "experience": 0.1, + "cookingtime": 100, + "conditions": [ + { + "modid": "thermal", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/blasting/nickel_ingot_compat_thermal.json b/src/generated/resources/data/create/recipes/blasting/nickel_ingot_compat_thermal.json new file mode 100644 index 000000000..377dde1b9 --- /dev/null +++ b/src/generated/resources/data/create/recipes/blasting/nickel_ingot_compat_thermal.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "create:crushed_nickel_ore" + }, + "result": "thermal:nickel_ingot", + "experience": 0.1, + "cookingtime": 100, + "conditions": [ + { + "modid": "thermal", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/blasting/silver_ingot_compat_thermal.json b/src/generated/resources/data/create/recipes/blasting/silver_ingot_compat_thermal.json new file mode 100644 index 000000000..94079c912 --- /dev/null +++ b/src/generated/resources/data/create/recipes/blasting/silver_ingot_compat_thermal.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "create:crushed_silver_ore" + }, + "result": "thermal:silver_ingot", + "experience": 0.1, + "cookingtime": 100, + "conditions": [ + { + "modid": "thermal", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/blasting/tin_ingot_compat_thermal.json b/src/generated/resources/data/create/recipes/blasting/tin_ingot_compat_thermal.json new file mode 100644 index 000000000..bda6c13ff --- /dev/null +++ b/src/generated/resources/data/create/recipes/blasting/tin_ingot_compat_thermal.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "create:crushed_tin_ore" + }, + "result": "thermal:tin_ingot", + "experience": 0.1, + "cookingtime": 100, + "conditions": [ + { + "modid": "thermal", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/smelting/lead_ingot_compat_thermal.json b/src/generated/resources/data/create/recipes/smelting/lead_ingot_compat_thermal.json new file mode 100644 index 000000000..0a6ead4f6 --- /dev/null +++ b/src/generated/resources/data/create/recipes/smelting/lead_ingot_compat_thermal.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:crushed_lead_ore" + }, + "result": "thermal:lead_ingot", + "experience": 0.1, + "cookingtime": 200, + "conditions": [ + { + "modid": "thermal", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/smelting/nickel_ingot_compat_thermal.json b/src/generated/resources/data/create/recipes/smelting/nickel_ingot_compat_thermal.json new file mode 100644 index 000000000..03c534ae3 --- /dev/null +++ b/src/generated/resources/data/create/recipes/smelting/nickel_ingot_compat_thermal.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:crushed_nickel_ore" + }, + "result": "thermal:nickel_ingot", + "experience": 0.1, + "cookingtime": 200, + "conditions": [ + { + "modid": "thermal", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/smelting/silver_ingot_compat_thermal.json b/src/generated/resources/data/create/recipes/smelting/silver_ingot_compat_thermal.json new file mode 100644 index 000000000..6d5039376 --- /dev/null +++ b/src/generated/resources/data/create/recipes/smelting/silver_ingot_compat_thermal.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:crushed_silver_ore" + }, + "result": "thermal:silver_ingot", + "experience": 0.1, + "cookingtime": 200, + "conditions": [ + { + "modid": "thermal", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/smelting/tin_ingot_compat_thermal.json b/src/generated/resources/data/create/recipes/smelting/tin_ingot_compat_thermal.json new file mode 100644 index 000000000..e70aac300 --- /dev/null +++ b/src/generated/resources/data/create/recipes/smelting/tin_ingot_compat_thermal.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:crushed_tin_ore" + }, + "result": "thermal:tin_ingot", + "experience": 0.1, + "cookingtime": 200, + "conditions": [ + { + "modid": "thermal", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/thermal/crushed_lead_ore.json b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_lead_ore.json new file mode 100644 index 000000000..9c32c0d7f --- /dev/null +++ b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_lead_ore.json @@ -0,0 +1,25 @@ +{ + "type": "create:splashing", + "ingredients": [ + { + "item": "create:crushed_lead_ore" + } + ], + "results": [ + { + "item": "thermal:lead_nugget", + "count": 10 + }, + { + "item": "thermal:lead_nugget", + "count": 5, + "chance": 0.5 + } + ], + "conditions": [ + { + "modid": "thermal", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/thermal/crushed_nickel_ore.json b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_nickel_ore.json new file mode 100644 index 000000000..294901799 --- /dev/null +++ b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_nickel_ore.json @@ -0,0 +1,25 @@ +{ + "type": "create:splashing", + "ingredients": [ + { + "item": "create:crushed_nickel_ore" + } + ], + "results": [ + { + "item": "thermal:nickel_nugget", + "count": 10 + }, + { + "item": "thermal:nickel_nugget", + "count": 5, + "chance": 0.5 + } + ], + "conditions": [ + { + "modid": "thermal", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/thermal/crushed_silver_ore.json b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_silver_ore.json new file mode 100644 index 000000000..d62f2b9d3 --- /dev/null +++ b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_silver_ore.json @@ -0,0 +1,25 @@ +{ + "type": "create:splashing", + "ingredients": [ + { + "item": "create:crushed_silver_ore" + } + ], + "results": [ + { + "item": "thermal:silver_nugget", + "count": 10 + }, + { + "item": "thermal:silver_nugget", + "count": 5, + "chance": 0.5 + } + ], + "conditions": [ + { + "modid": "thermal", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/thermal/crushed_tin_ore.json b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_tin_ore.json new file mode 100644 index 000000000..1040fd5dc --- /dev/null +++ b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_tin_ore.json @@ -0,0 +1,25 @@ +{ + "type": "create:splashing", + "ingredients": [ + { + "item": "create:crushed_tin_ore" + } + ], + "results": [ + { + "item": "thermal:tin_nugget", + "count": 10 + }, + { + "item": "thermal:tin_nugget", + "count": 5, + "chance": 0.5 + } + ], + "conditions": [ + { + "modid": "thermal", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/content/schematics/MaterialChecklist.java b/src/main/java/com/simibubi/create/content/schematics/MaterialChecklist.java index 045511d4d..704320f78 100644 --- a/src/main/java/com/simibubi/create/content/schematics/MaterialChecklist.java +++ b/src/main/java/com/simibubi/create/content/schematics/MaterialChecklist.java @@ -21,6 +21,8 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; public class MaterialChecklist { + + public static final int MAX_ENTRIES_PER_PAGE = 5; public Map gathered; public Map required; @@ -108,7 +110,7 @@ public class MaterialChecklist { continue; } - if (itemsWritten == 6) { + if (itemsWritten == MAX_ENTRIES_PER_PAGE) { itemsWritten = 0; string.append("\"}"); pages.add(StringNBT.of(string.toString())); @@ -120,7 +122,7 @@ public class MaterialChecklist { } for (Item item : completed) { - if (itemsWritten == 6) { + if (itemsWritten == MAX_ENTRIES_PER_PAGE) { itemsWritten = 0; string.append("\"}"); pages.add(StringNBT.of(string.toString())); 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 67f4b3129..299c6ff17 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,7 +20,7 @@ import net.minecraftforge.common.Tags; public abstract class CreateRecipeProvider extends RecipeProvider { - public final String MEK = "mekanism", MW = "mysticalworld", SM = "silents_mechanisms", IE = "immersiveengineering"; + public final String MEK = "mekanism", TH = "thermal", MW = "mysticalworld", SM = "silents_mechanisms", IE = "immersiveengineering"; final List all = new ArrayList<>(); 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 135737ba6..ae4d3d36c 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 @@ -948,13 +948,13 @@ public class StandardRecipeGen extends CreateRecipeProvider { CRUSHED_OSMIUM = blastModdedCrushedMetal(AllItems.CRUSHED_OSMIUM, "osmium", MEK), CRUSHED_PLATINUM = blastModdedCrushedMetal(AllItems.CRUSHED_PLATINUM, "platinum", SM), - CRUSHED_SILVER = blastModdedCrushedMetal(AllItems.CRUSHED_SILVER, "silver", MW, IE, SM), - CRUSHED_TIN = blastModdedCrushedMetal(AllItems.CRUSHED_TIN, "tin", MEK, MW, SM), - CRUSHED_LEAD = blastModdedCrushedMetal(AllItems.CRUSHED_LEAD, "lead", MW, IE, SM), + CRUSHED_SILVER = blastModdedCrushedMetal(AllItems.CRUSHED_SILVER, "silver", MW, TH, IE, SM), + CRUSHED_TIN = blastModdedCrushedMetal(AllItems.CRUSHED_TIN, "tin", MEK, TH, MW, SM), + CRUSHED_LEAD = blastModdedCrushedMetal(AllItems.CRUSHED_LEAD, "lead", MW, TH, IE, SM), CRUSHED_QUICKSILVER = blastModdedCrushedMetal(AllItems.CRUSHED_QUICKSILVER, "quicksilver", MW), CRUSHED_BAUXITE = blastModdedCrushedMetal(AllItems.CRUSHED_BAUXITE, "aluminum", IE, SM), CRUSHED_URANIUM = blastModdedCrushedMetal(AllItems.CRUSHED_URANIUM, "uranium", IE, SM), - CRUSHED_NICKEL = blastModdedCrushedMetal(AllItems.CRUSHED_NICKEL, "nickel", IE, SM) + CRUSHED_NICKEL = blastModdedCrushedMetal(AllItems.CRUSHED_NICKEL, "nickel", TH, IE, SM) ; 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 3c895424c..d4fbc0a4d 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 @@ -45,13 +45,13 @@ public class WashingRecipeGen extends ProcessingRecipeGen { CRUSHED_OSMIUM = moddedCrushedOre(AllItems.CRUSHED_OSMIUM, "osmium", MEK), CRUSHED_PLATINUM = moddedCrushedOre(AllItems.CRUSHED_PLATINUM, "platinum", SM), - CRUSHED_SILVER = moddedCrushedOre(AllItems.CRUSHED_SILVER, "silver", MW, IE, SM), - CRUSHED_TIN = moddedCrushedOre(AllItems.CRUSHED_TIN, "tin", MEK, MW, SM), - CRUSHED_LEAD = moddedCrushedOre(AllItems.CRUSHED_LEAD, "lead", MW, IE, SM), + CRUSHED_SILVER = moddedCrushedOre(AllItems.CRUSHED_SILVER, "silver", TH, MW, IE, SM), + CRUSHED_TIN = moddedCrushedOre(AllItems.CRUSHED_TIN, "tin", TH, MEK, MW, SM), + CRUSHED_LEAD = moddedCrushedOre(AllItems.CRUSHED_LEAD, "lead", TH, MW, IE, SM), CRUSHED_QUICKSILVER = moddedCrushedOre(AllItems.CRUSHED_QUICKSILVER, "quicksilver", MW), CRUSHED_BAUXITE = moddedCrushedOre(AllItems.CRUSHED_BAUXITE, "aluminum", IE, SM), CRUSHED_URANIUM = moddedCrushedOre(AllItems.CRUSHED_URANIUM, "uranium", IE, SM), - CRUSHED_NICKEL = moddedCrushedOre(AllItems.CRUSHED_NICKEL, "nickel", IE, SM), + CRUSHED_NICKEL = moddedCrushedOre(AllItems.CRUSHED_NICKEL, "nickel", TH, IE, SM), ICE = convert(Blocks.ICE, Blocks.PACKED_ICE), MAGMA_BLOCK = convert(Blocks.MAGMA_BLOCK, Blocks.OBSIDIAN), diff --git a/src/main/resources/data/create/recipes/compat/thermal/crushing/apatite_ore.json b/src/main/resources/data/create/recipes/compat/thermal/crushing/apatite_ore.json new file mode 100644 index 000000000..92aa84550 --- /dev/null +++ b/src/main/resources/data/create/recipes/compat/thermal/crushing/apatite_ore.json @@ -0,0 +1,31 @@ +{ + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "thermal" + } + ], + "type": "create:crushing", + "ingredients": [ + { + "tag": "forge:ores/apatite" + } + ], + "results": [ + { + "item": "thermal:apatite", + "count": 2 + }, + { + "item": "thermal:apatite", + "count": 1, + "chance": 0.25 + }, + { + "item": "minecraft:cobblestone", + "count": 1, + "chance": 0.125 + } + ], + "processingTime": 300 +} diff --git a/src/main/resources/data/create/recipes/compat/thermal/crushing/cinnabar_ore.json b/src/main/resources/data/create/recipes/compat/thermal/crushing/cinnabar_ore.json new file mode 100644 index 000000000..9a00358d8 --- /dev/null +++ b/src/main/resources/data/create/recipes/compat/thermal/crushing/cinnabar_ore.json @@ -0,0 +1,31 @@ +{ + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "thermal" + } + ], + "type": "create:crushing", + "ingredients": [ + { + "tag": "forge:ores/cinnabar" + } + ], + "results": [ + { + "item": "thermal:cinnabar", + "count": 2 + }, + { + "item": "thermal:cinnabar", + "count": 1, + "chance": 0.25 + }, + { + "item": "minecraft:cobblestone", + "count": 1, + "chance": 0.125 + } + ], + "processingTime": 300 +} diff --git a/src/main/resources/data/create/recipes/compat/thermal/crushing/niter_ore.json b/src/main/resources/data/create/recipes/compat/thermal/crushing/niter_ore.json new file mode 100644 index 000000000..ba9ac7626 --- /dev/null +++ b/src/main/resources/data/create/recipes/compat/thermal/crushing/niter_ore.json @@ -0,0 +1,31 @@ +{ + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "thermal" + } + ], + "type": "create:crushing", + "ingredients": [ + { + "tag": "forge:ores/niter" + } + ], + "results": [ + { + "item": "thermal:niter", + "count": 2 + }, + { + "item": "thermal:niter", + "count": 1, + "chance": 0.25 + }, + { + "item": "minecraft:cobblestone", + "count": 1, + "chance": 0.125 + } + ], + "processingTime": 300 +} diff --git a/src/main/resources/data/create/recipes/compat/thermal/crushing/sulfur_ore.json b/src/main/resources/data/create/recipes/compat/thermal/crushing/sulfur_ore.json new file mode 100644 index 000000000..58e3b3415 --- /dev/null +++ b/src/main/resources/data/create/recipes/compat/thermal/crushing/sulfur_ore.json @@ -0,0 +1,31 @@ +{ + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "thermal" + } + ], + "type": "create:crushing", + "ingredients": [ + { + "tag": "forge:ores/sulfur" + } + ], + "results": [ + { + "item": "thermal:sulfur", + "count": 2 + }, + { + "item": "thermal:sulfur", + "count": 1, + "chance": 0.25 + }, + { + "item": "minecraft:cobblestone", + "count": 1, + "chance": 0.125 + } + ], + "processingTime": 300 +}