From 6fe9a036f64b8791984cae937cf1e992fa74181d Mon Sep 17 00:00:00 2001 From: attackeight Date: Wed, 7 Aug 2024 13:51:12 -0400 Subject: [PATCH] More Mod Compat 4 Update compat mods to 1.19 Add windswept support Add Good Ending Support Update Forbidden Arcanus support Add Quark ancient wood --- build.gradle | 64 +++++++++---------- .../8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 | 4 +- .../b256105d8411632b0d585496ea8944a751a08034 | 38 ++++++++--- .../{cherrywood.json => aurum_log.json} | 4 +- .../{mysterywood.json => aurum_wood.json} | 4 +- .../{cherrywood_log.json => cherry_log.json} | 4 +- ...{mysterywood_log.json => cherry_wood.json} | 4 +- ...herrywood.json => stripped_aurum_log.json} | 4 +- ...terywood.json => stripped_aurum_wood.json} | 4 +- ...wood_log.json => stripped_cherry_log.json} | 4 +- ...ood_log.json => stripped_cherry_wood.json} | 4 +- .../compat/goodending/cypress_log.json | 20 ++++++ .../compat/goodending/cypress_wood.json | 20 ++++++ .../compat/goodending/muddy_oak_log.json | 20 ++++++ .../compat/goodending/muddy_oak_wood.json | 20 ++++++ .../goodending/stripped_cypress_log.json | 21 ++++++ .../goodending/stripped_cypress_wood.json | 21 ++++++ .../goodending/stripped_muddy_oak_log.json | 21 ++++++ .../goodending/stripped_muddy_oak_wood.json | 21 ++++++ .../cutting/compat/quark/ancient_log.json | 20 ++++++ .../cutting/compat/quark/ancient_wood.json | 20 ++++++ .../compat/quark/stripped_ancient_log.json | 21 ++++++ .../compat/quark/stripped_ancient_wood.json | 21 ++++++ .../compat/windswept/chestnut_log.json | 20 ++++++ .../compat/windswept/chestnut_wood.json | 20 ++++++ .../cutting/compat/windswept/holly_log.json | 20 ++++++ .../cutting/compat/windswept/holly_wood.json | 20 ++++++ .../windswept/stripped_chestnut_log.json | 21 ++++++ .../windswept/stripped_chestnut_wood.json | 21 ++++++ .../compat/windswept/stripped_holly_log.json | 21 ++++++ .../compat/windswept/stripped_holly_wood.json | 21 ++++++ .../tags/items/modded_stripped_wood.json | 4 +- .../data/recipe/CuttingRecipeGen.java | 16 +++-- .../create/foundation/data/recipe/Mods.java | 5 +- 34 files changed, 506 insertions(+), 67 deletions(-) rename src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/{cherrywood.json => aurum_log.json} (69%) rename src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/{mysterywood.json => aurum_wood.json} (69%) rename src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/{cherrywood_log.json => cherry_log.json} (67%) rename src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/{mysterywood_log.json => cherry_wood.json} (67%) rename src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/{stripped_cherrywood.json => stripped_aurum_log.json} (69%) rename src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/{stripped_mysterywood.json => stripped_aurum_wood.json} (69%) rename src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/{stripped_cherrywood_log.json => stripped_cherry_log.json} (68%) rename src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/{stripped_mysterywood_log.json => stripped_cherry_wood.json} (68%) create mode 100644 src/generated/resources/data/create/recipes/cutting/compat/goodending/cypress_log.json create mode 100644 src/generated/resources/data/create/recipes/cutting/compat/goodending/cypress_wood.json create mode 100644 src/generated/resources/data/create/recipes/cutting/compat/goodending/muddy_oak_log.json create mode 100644 src/generated/resources/data/create/recipes/cutting/compat/goodending/muddy_oak_wood.json create mode 100644 src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_cypress_log.json create mode 100644 src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_cypress_wood.json create mode 100644 src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_muddy_oak_log.json create mode 100644 src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_muddy_oak_wood.json create mode 100644 src/generated/resources/data/create/recipes/cutting/compat/quark/ancient_log.json create mode 100644 src/generated/resources/data/create/recipes/cutting/compat/quark/ancient_wood.json create mode 100644 src/generated/resources/data/create/recipes/cutting/compat/quark/stripped_ancient_log.json create mode 100644 src/generated/resources/data/create/recipes/cutting/compat/quark/stripped_ancient_wood.json create mode 100644 src/generated/resources/data/create/recipes/cutting/compat/windswept/chestnut_log.json create mode 100644 src/generated/resources/data/create/recipes/cutting/compat/windswept/chestnut_wood.json create mode 100644 src/generated/resources/data/create/recipes/cutting/compat/windswept/holly_log.json create mode 100644 src/generated/resources/data/create/recipes/cutting/compat/windswept/holly_wood.json create mode 100644 src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_chestnut_log.json create mode 100644 src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_chestnut_wood.json create mode 100644 src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_holly_log.json create mode 100644 src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_holly_wood.json diff --git a/build.gradle b/build.gradle index 3bdf28498..d35f461cb 100644 --- a/build.gradle +++ b/build.gradle @@ -200,42 +200,42 @@ dependencies { compileOnly fg.deobf("com.ferreusveritas.dynamictrees:DynamicTrees-${dynamic_trees_minecraft_version}:${dynamic_trees_version}") } - // implementation fg.deobf("curse.maven:ic2-classic-242942:4563059") + // implementation fg.deobf("curse.maven:ic2-classic-242942:5555152") // implementation fg.deobf("curse.maven:druidcraft-340991:3101903") - // implementation fg.deobf("com.ferreusveritas.dynamictrees:DynamicTrees-1.16.5:0.10.0-Beta25") + // implementation fg.deobf("com.ferreusveritas.dynamictrees:DynamicTrees-1.19.2:1.2.2") // runtimeOnly fg.deobf("curse.maven:framedblocks-441647:4762544") - // runtimeOnly fg.deobf("curse.maven:galosphere-631098:4398234") - // runtimeOnly fg.deobf("curse.maven:elementary-ores-332609:3956498") - // runtimeOnly fg.deobf("curse.maven:flib-661261:3956196") - // runtimeOnly fg.deobf("curse.maven:infernal-expansion-395078:3854062") - // runtimeOnly fg.deobf("vazkii.arl:AutoRegLib:1.4-35.69") - // runtimeOnly fg.deobf("vazkii.quark:Quark:r2.0-212.984") - // runtimeOnly fg.deobf("curse.maven:mantle-74924:4509007") - // runtimeOnly fg.deobf("curse.maven:tinkers-construct-74072:4509008") - // runtimeOnly fg.deobf("maven.modrinth:rubidium:0.5.3") - // implementation fg.deobf("com.railwayteam.railways:railways-1.18.2-1.1.1:all") { transitive = false } - // runtimeOnly fg.deobf("maven.modrinth:aether:1.19.2-1.0.0-beta.1.1-forge") + // runtimeOnly fg.deobf("curse.maven:galosphere-631098:4574834") + // runtimeOnly fg.deobf("curse.maven:elementary-ores-332609:4514276") 1.19.4 only + // runtimeOnly fg.deobf("curse.maven:flib-661261:4479544") + // runtimeOnly fg.deobf("curse.maven:infernal-expansion-395078:4002091") + // runtimeOnly fg.deobf("vazkii.autoreglib:AutoRegLib:1.8.2-58.126") + // runtimeOnly fg.deobf("curse.maven:quark-243121:4812006") + // runtimeOnly fg.deobf("curse.maven:mantle-74924:5339977") + // runtimeOnly fg.deobf("curse.maven:tinkers-construct-74072:5358052") + // runtimeOnly fg.deobf("maven.modrinth:rubidium:0.6.2c") + // implementation fg.deobf("com.railwayteam.railways:railways-1.19.2-1.6.4:all") { transitive = false } + // runtimeOnly fg.deobf("maven.modrinth:aether:1.19.2-1.4.2-forge") // runtimeOnly fg.deobf("maven.modrinth:spark:1.10.38-forge") - // runtimeOnly fg.deobf("curse.maven:forbidden-arcanus-309858:4729924") - // runtimeOnly fg.deobf("curse.maven:valhelsia-core-416935:3886212") - // implementation fg.deobf("curse.maven:modern-ui-352491:5229350") - // runtimeOnly fg.deobf("curse.maven:sophisticated-storage-619320:5194748") - // runtimeOnly fg.deobf("curse.maven:sophisticated-core-618298:5296312") - // runtimeOnly fg.deobf("curse.maven:functional-storage-556861:5271589") - // runtimeOnly fg.deobf("curse.maven:titanium-287342:5151207") - // runtimeOnly fg.deobf("curse.maven:storage-drawers-223852:3807626") - // implementation fg.deobf("curse.maven:ftb-chunks-forge-314906:4494633") - // implementation fg.deobf("curse.maven:architectury-api-419699:4521465") - // implementation fg.deobf("curse.maven:ftb-library-forge-404465:4396792") - // implementation fg.deobf("curse.maven:ftb-teams-forge-404468:4579981") - // runtimeOnly fg.deobf("curse.maven:forbidden-arcanus-309858:4729924") - // runtimeOnly fg.deobf("curse.maven:valhelsia-core-416935:3886212") - // runtimeOnly fg.deobf("curse.maven:citadel-331936:3783096") - // runtimeOnly fg.deobf("curse.maven:ice-and-fire-dragons-264231:4614465") - // runtimeOnly fg.deobf("curse.maven:exnihilosequentia-400012:4083676") - // runtimeOnly fg.deobf("curse.maven:upgrade-aquatic-326895:4365140") - // runtimeOnly fg.deobf("curse.maven:blueprint-382216:3991478") + // runtimeOnly fg.deobf("curse.maven:forbidden-arcanus-309858:4852521") + // runtimeOnly fg.deobf("curse.maven:valhelsia-core-416935:4181245") + // runtimeOnly fg.deobf("curse.maven:modern-ui-352491:5229370") + // runtimeOnly fg.deobf("curse.maven:sophisticated-storage-619320:5194750") + // runtimeOnly fg.deobf("curse.maven:sophisticated-core-618298:5296313") + // runtimeOnly fg.deobf("curse.maven:functional-storage-556861:5499169") + // runtimeOnly fg.deobf("curse.maven:titanium-287342:5356458") + // runtimeOnly fg.deobf("curse.maven:storage-drawers-223852:3884263") + // runtimeOnly fg.deobf("curse.maven:ftb-chunks-forge-314906:5417874") + // runtimeOnly fg.deobf("curse.maven:architectury-api-419699:5137942") + // runtimeOnly fg.deobf("curse.maven:ftb-library-forge-404465:4661834") + // runtimeOnly fg.deobf("curse.maven:ftb-teams-forge-404468:4611938") + // runtimeOnly fg.deobf("curse.maven:citadel-331936:4556677") + // runtimeOnly fg.deobf("curse.maven:ice-and-fire-dragons-264231:5037952") + // runtimeOnly fg.deobf("curse.maven:exnihilosequentia-400012:4993344") + // runtimeOnly fg.deobf("curse.maven:upgrade-aquatic-326895:4777515") + // runtimeOnly fg.deobf("curse.maven:blueprint-382216:4749000") + // runtimeOnly fg.deobf("curse.maven:windsweptmod-636321:4817132") + // runtimeOnly fg.deobf("curse.maven:good-ending-690161:4363719") // https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497 // Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings diff --git a/src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 b/src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 index cb1c68f46..451246b8b 100644 --- a/src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 +++ b/src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 @@ -1,4 +1,4 @@ -// 1.19.2 2024-08-07T09:26:25.1854904 Registrate Provider for create [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] +// 1.19.2 2024-08-07T13:21:18.6734034 Registrate Provider for create [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] 60bbdf92d2ac9824ea6144955c74043a6005f79d assets/create/blockstates/acacia_window.json 6a67703c2697d81b7dc83e9d72a66f9c9ff08383 assets/create/blockstates/acacia_window_pane.json c3ae87b62e81d8e9476eccd793bb1548d74c66a1 assets/create/blockstates/adjustable_chain_gearshift.json @@ -4206,7 +4206,7 @@ d371dfd35e49a7bef19f59c03e7f4ae20992f03d data/create/tags/items/create_ingots.js 910d0f5ccbc4c84b224eca1f1588b1695f41447b data/create/tags/items/crushed_raw_materials.json 0fa526e7e742573b603ad26b09526cf724efa1dc data/create/tags/items/deployable_drink.json ae5c7c69acfe764ed2b7bc4f1db35fb941b0c7a5 data/create/tags/items/modded_stripped_logs.json -20b118c190182ecd9b4ada2bccd4681f7c4225cc data/create/tags/items/modded_stripped_wood.json +06d0f69ae6022b09c01f5a2ce35454e9c98cbc86 data/create/tags/items/modded_stripped_wood.json 695d75b352fd190b303c724d1aaee9bb786a903b data/create/tags/items/pressurized_air_sources.json 2cd3adffd8b151354df137a990dcb97996a665bb data/create/tags/items/sandpaper.json 79418bd729cef417b322cef9b491e7ae83317d61 data/create/tags/items/seats.json diff --git a/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 b/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 index de1d16141..405e2d1b1 100644 --- a/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 +++ b/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 @@ -1,4 +1,4 @@ -// 1.19.2 2024-08-07T09:26:25.2403429 Create's Processing Recipes +// 1.19.2 2024-08-07T13:26:27.8886754 Create's Processing Recipes 3c94326fb730f68c1e44fe1e2ef09c9db6ffd92b data/create/recipes/compacting/andesite_from_flint.json 8d3d5b31f3601b9f681ff710e0545a483a1494c6 data/create/recipes/compacting/blaze_cake.json 8bd7f4e3a686ab520b2d55594d2018d0e9a50c91 data/create/recipes/compacting/chocolate.json @@ -458,14 +458,22 @@ e4c5b799335a71a4259de6519ff9fe86fc014c85 data/create/recipes/cutting/compat/ecol 45734ddd48ac17b25b88cf1f5b0d227431946cf7 data/create/recipes/cutting/compat/ecologics/walnut_wood.json b0be23a2a268557b1ab26518a9d6ff1e492068fa data/create/recipes/cutting/compat/endergetic/poise_stem.json 1581ae3f152ba5784d6b737ed37e0fe8e6317a76 data/create/recipes/cutting/compat/endergetic/stripped_poise_stem.json -cbd3c2674078ba4966965990aaa51ee5afc2cf8f data/create/recipes/cutting/compat/forbidden_arcanus/cherrywood.json -17c1e13d1261454992c6063dcecf7e54d4a645a5 data/create/recipes/cutting/compat/forbidden_arcanus/cherrywood_log.json -e5c3b98a78aa3995654583f3ce1c70e7cf8c2130 data/create/recipes/cutting/compat/forbidden_arcanus/mysterywood.json -58166d1cdb0e04952667484b6568de9d081aeba3 data/create/recipes/cutting/compat/forbidden_arcanus/mysterywood_log.json -9cc60d3115f09eee286781905a1d0ca11976dbb5 data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherrywood.json -4b2e710b98a3fd0a883cf5be9ec75835f8e4631b data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherrywood_log.json -a3035cdad141574294844b8aaa41b92ac76dac2e data/create/recipes/cutting/compat/forbidden_arcanus/stripped_mysterywood.json -20e75208dcb1720de5bbf629911f52b95612227f data/create/recipes/cutting/compat/forbidden_arcanus/stripped_mysterywood_log.json +97d07cbd21b147d93cbfea6534258f0b5faabbbb data/create/recipes/cutting/compat/forbidden_arcanus/aurum_log.json +b08980c7deb9a4de4983fdae188f0c5ac627c1e5 data/create/recipes/cutting/compat/forbidden_arcanus/aurum_wood.json +6d4536b52410f319b7848c0a21d18f1e16e6ad4b data/create/recipes/cutting/compat/forbidden_arcanus/cherry_log.json +e440058dbfa78f8535439c738798072cfe20aad2 data/create/recipes/cutting/compat/forbidden_arcanus/cherry_wood.json +47902025354c45f34fa62402fc5f32db6648a7c3 data/create/recipes/cutting/compat/forbidden_arcanus/stripped_aurum_log.json +f8f97315cfcd7e76229b9856ca6b2942bd7754f5 data/create/recipes/cutting/compat/forbidden_arcanus/stripped_aurum_wood.json +e16fd6870670e212ea7e9e84a2e3e65f34e2c6a8 data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherry_log.json +0b3598e3d00b76abc78de03671824862d9bbc262 data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherry_wood.json +c6e138b6adf0311deebeff7cacdcdb57337f41da data/create/recipes/cutting/compat/goodending/cypress_log.json +cac6d3d763a3909d9a1f3eebe83190013e323e8a data/create/recipes/cutting/compat/goodending/cypress_wood.json +a3664dc30807cbc7903f79944bfb9b7d08a91671 data/create/recipes/cutting/compat/goodending/muddy_oak_log.json +c0bde27c6ff867dbfe7bea538bce82ddd12d4fea data/create/recipes/cutting/compat/goodending/muddy_oak_wood.json +eb749011e1c688f2005a63eb9953d29c6287eae4 data/create/recipes/cutting/compat/goodending/stripped_cypress_log.json +228632291f42fb47b73a6e3058a27475d97c20f1 data/create/recipes/cutting/compat/goodending/stripped_cypress_wood.json +c9e3c6e1b591822283f4436c70a52ce27034e8cf data/create/recipes/cutting/compat/goodending/stripped_muddy_oak_log.json +f6cabdcbdb8aeffb03228bf65183bbec5aaba182 data/create/recipes/cutting/compat/goodending/stripped_muddy_oak_wood.json 3a9be23a966c2737c5059474c17a86566bc5505f data/create/recipes/cutting/compat/hexcasting/edified_log.json 3f3879c426acb1753f2985ed19f0a905bdbd3797 data/create/recipes/cutting/compat/hexcasting/edified_wood.json 68d80d00d15d6ad14100025eecbd76c1fa8e3a52 data/create/recipes/cutting/compat/hexcasting/stripped_edified_log.json @@ -502,10 +510,14 @@ b233b2f811b6d4ef1b9595b77f5ba7f0cee8ddeb data/create/recipes/cutting/compat/proj 0b293cb0b338a3937795c47051dd7131e641e566 data/create/recipes/cutting/compat/projectvibrantjourneys/stripped_redwood_log.json 75559f5d33f679683a9649a2b6e471ee563fcbc0 data/create/recipes/cutting/compat/projectvibrantjourneys/stripped_willow_log.json bb8114426af3e2e175bd07dd35cd1c8eaafdc309 data/create/recipes/cutting/compat/projectvibrantjourneys/willow_log.json +5a8b70f884741f155924174f8f8911574a782928 data/create/recipes/cutting/compat/quark/ancient_log.json +0b6953e5fd8f5d248f5327a8775e4e30a355ca49 data/create/recipes/cutting/compat/quark/ancient_wood.json a0194f77f72349786f6b87e641c9628f7fe46fdf data/create/recipes/cutting/compat/quark/azalea_log.json 17daa6e2505ae75e51def1f1523f9d6f120de696 data/create/recipes/cutting/compat/quark/azalea_wood.json 118122fbd3154c0090768d9103e802d2e68b3f06 data/create/recipes/cutting/compat/quark/blossom_log.json 57b23b572f4d75bb39f7f84277f0a0a4e6be992b data/create/recipes/cutting/compat/quark/blossom_wood.json +d36666b83bf934aabd20aac182c4863de693903e data/create/recipes/cutting/compat/quark/stripped_ancient_log.json +a666d4c2d54acfa924eeef535415b993d40ca015 data/create/recipes/cutting/compat/quark/stripped_ancient_wood.json e05b81a5609420153b3ecace758a153bd88a4bef data/create/recipes/cutting/compat/quark/stripped_azalea_log.json f820204e8d99f21203b001da23e8b44cf61e33e2 data/create/recipes/cutting/compat/quark/stripped_azalea_wood.json af71513af8de414036ff73fee0eaca4b823de99c data/create/recipes/cutting/compat/quark/stripped_blossom_log.json @@ -668,6 +680,14 @@ b86b4710a31b8ab98d3f61972fd0e3a80d1cb788 data/create/recipes/cutting/compat/upgr ab08c98c58c2beab4805d0576cac3874c4774553 data/create/recipes/cutting/compat/upgrade_aquatic/stripped_river_log.json b368756fa5ec34fa279f53fb99aea8f47757828a data/create/recipes/cutting/compat/upgrade_aquatic/stripped_river_wood.json b5b38739f5c763a04dd1d8386b9afc1081d1c436 data/create/recipes/cutting/compat/upgrade_aquatic/strippped_driftwood.json +2619c5f3916147bf13a21f986f1889a67f885d1b data/create/recipes/cutting/compat/windswept/chestnut_log.json +40068203261db20d74bd84fa8c9e9a6fa9fc4ef5 data/create/recipes/cutting/compat/windswept/chestnut_wood.json +70a5cf4ac9996f9f424c064fc39fab8901f5c71c data/create/recipes/cutting/compat/windswept/holly_log.json +28833896273e3da215da3dee4da13e43ac56aecf data/create/recipes/cutting/compat/windswept/holly_wood.json +0e20d4166a792d5beba3e3ca17beb61253ceb162 data/create/recipes/cutting/compat/windswept/stripped_chestnut_log.json +33de028562009de6bdccd54f5b3835b7bbfe06a7 data/create/recipes/cutting/compat/windswept/stripped_chestnut_wood.json +68ddfcd839417094d75e889ed42ea244d07e2c0f data/create/recipes/cutting/compat/windswept/stripped_holly_log.json +a22e7839d935d0aca9de371ba50d956e0cbfa137 data/create/recipes/cutting/compat/windswept/stripped_holly_wood.json 0a3c2e35782d54a28c3c60eae10bdd6247d5977f data/create/recipes/cutting/crimson_hyphae.json cc4d09728d2407c0c972e696037d1b45db9a8bc2 data/create/recipes/cutting/crimson_stem.json ebdf404a6de7880a42527c35727fa4214eb8cff3 data/create/recipes/cutting/dark_oak_log.json diff --git a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherrywood.json b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/aurum_log.json similarity index 69% rename from src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherrywood.json rename to src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/aurum_log.json index aa4f61729..c64a7f623 100644 --- a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherrywood.json +++ b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/aurum_log.json @@ -8,13 +8,13 @@ ], "ingredients": [ { - "item": "forbidden_arcanus:cherrywood" + "item": "forbidden_arcanus:aurum_log" } ], "processingTime": 50, "results": [ { - "item": "forbidden_arcanus:stripped_cherrywood" + "item": "forbidden_arcanus:stripped_aurum_log" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/mysterywood.json b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/aurum_wood.json similarity index 69% rename from src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/mysterywood.json rename to src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/aurum_wood.json index 812b2d060..d0bd2d059 100644 --- a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/mysterywood.json +++ b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/aurum_wood.json @@ -8,13 +8,13 @@ ], "ingredients": [ { - "item": "forbidden_arcanus:mysterywood" + "item": "forbidden_arcanus:aurum_wood" } ], "processingTime": 50, "results": [ { - "item": "forbidden_arcanus:stripped_mysterywood" + "item": "forbidden_arcanus:stripped_aurum_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherrywood_log.json b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherry_log.json similarity index 67% rename from src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherrywood_log.json rename to src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherry_log.json index 7d6b44ce9..7d0f528f0 100644 --- a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherrywood_log.json +++ b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherry_log.json @@ -8,13 +8,13 @@ ], "ingredients": [ { - "item": "forbidden_arcanus:cherrywood_log" + "item": "forbidden_arcanus:cherry_log" } ], "processingTime": 50, "results": [ { - "item": "forbidden_arcanus:stripped_cherrywood_log" + "item": "forbidden_arcanus:stripped_cherry_log" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/mysterywood_log.json b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherry_wood.json similarity index 67% rename from src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/mysterywood_log.json rename to src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherry_wood.json index ed41c1933..cc988c4b2 100644 --- a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/mysterywood_log.json +++ b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherry_wood.json @@ -8,13 +8,13 @@ ], "ingredients": [ { - "item": "forbidden_arcanus:mysterywood_log" + "item": "forbidden_arcanus:cherry_wood" } ], "processingTime": 50, "results": [ { - "item": "forbidden_arcanus:stripped_mysterywood_log" + "item": "forbidden_arcanus:stripped_cherry_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherrywood.json b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_aurum_log.json similarity index 69% rename from src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherrywood.json rename to src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_aurum_log.json index 781886ed7..1d33c2557 100644 --- a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherrywood.json +++ b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_aurum_log.json @@ -8,14 +8,14 @@ ], "ingredients": [ { - "item": "forbidden_arcanus:stripped_cherrywood" + "item": "forbidden_arcanus:stripped_aurum_log" } ], "processingTime": 50, "results": [ { "count": 6, - "item": "forbidden_arcanus:cherrywood_planks" + "item": "forbidden_arcanus:aurum_planks" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_mysterywood.json b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_aurum_wood.json similarity index 69% rename from src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_mysterywood.json rename to src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_aurum_wood.json index b5bd435f8..ba72b3de8 100644 --- a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_mysterywood.json +++ b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_aurum_wood.json @@ -8,14 +8,14 @@ ], "ingredients": [ { - "item": "forbidden_arcanus:stripped_mysterywood" + "item": "forbidden_arcanus:stripped_aurum_wood" } ], "processingTime": 50, "results": [ { "count": 6, - "item": "forbidden_arcanus:mysterywood_planks" + "item": "forbidden_arcanus:aurum_planks" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherrywood_log.json b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherry_log.json similarity index 68% rename from src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherrywood_log.json rename to src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherry_log.json index 1d2a73111..a27273fc4 100644 --- a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherrywood_log.json +++ b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherry_log.json @@ -8,14 +8,14 @@ ], "ingredients": [ { - "item": "forbidden_arcanus:stripped_cherrywood_log" + "item": "forbidden_arcanus:stripped_cherry_log" } ], "processingTime": 50, "results": [ { "count": 6, - "item": "forbidden_arcanus:cherrywood_planks" + "item": "forbidden_arcanus:cherry_planks" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_mysterywood_log.json b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherry_wood.json similarity index 68% rename from src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_mysterywood_log.json rename to src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherry_wood.json index 24bc02de7..96cb93f81 100644 --- a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_mysterywood_log.json +++ b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherry_wood.json @@ -8,14 +8,14 @@ ], "ingredients": [ { - "item": "forbidden_arcanus:stripped_mysterywood_log" + "item": "forbidden_arcanus:stripped_cherry_wood" } ], "processingTime": 50, "results": [ { "count": 6, - "item": "forbidden_arcanus:mysterywood_planks" + "item": "forbidden_arcanus:cherry_planks" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/goodending/cypress_log.json b/src/generated/resources/data/create/recipes/cutting/compat/goodending/cypress_log.json new file mode 100644 index 000000000..9bf7bae19 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/goodending/cypress_log.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "goodending" + } + ], + "ingredients": [ + { + "item": "goodending:cypress_log" + } + ], + "processingTime": 50, + "results": [ + { + "item": "goodending:stripped_cypress_log" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/goodending/cypress_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/goodending/cypress_wood.json new file mode 100644 index 000000000..a79fd9ee4 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/goodending/cypress_wood.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "goodending" + } + ], + "ingredients": [ + { + "item": "goodending:cypress_wood" + } + ], + "processingTime": 50, + "results": [ + { + "item": "goodending:stripped_cypress_wood" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/goodending/muddy_oak_log.json b/src/generated/resources/data/create/recipes/cutting/compat/goodending/muddy_oak_log.json new file mode 100644 index 000000000..f51850831 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/goodending/muddy_oak_log.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "goodending" + } + ], + "ingredients": [ + { + "item": "goodending:muddy_oak_log" + } + ], + "processingTime": 50, + "results": [ + { + "item": "goodending:stripped_muddy_oak_log" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/goodending/muddy_oak_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/goodending/muddy_oak_wood.json new file mode 100644 index 000000000..d4b59beaf --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/goodending/muddy_oak_wood.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "goodending" + } + ], + "ingredients": [ + { + "item": "goodending:muddy_oak_wood" + } + ], + "processingTime": 50, + "results": [ + { + "item": "goodending:stripped_muddy_oak_wood" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_cypress_log.json b/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_cypress_log.json new file mode 100644 index 000000000..9cf45d2bd --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_cypress_log.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "goodending" + } + ], + "ingredients": [ + { + "item": "goodending:stripped_cypress_log" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "goodending:cypress_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_cypress_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_cypress_wood.json new file mode 100644 index 000000000..627e3bbba --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_cypress_wood.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "goodending" + } + ], + "ingredients": [ + { + "item": "goodending:stripped_cypress_wood" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "goodending:cypress_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_muddy_oak_log.json b/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_muddy_oak_log.json new file mode 100644 index 000000000..b87c79468 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_muddy_oak_log.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "goodending" + } + ], + "ingredients": [ + { + "item": "goodending:stripped_muddy_oak_log" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "goodending:muddy_oak_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_muddy_oak_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_muddy_oak_wood.json new file mode 100644 index 000000000..fa4e87410 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_muddy_oak_wood.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "goodending" + } + ], + "ingredients": [ + { + "item": "goodending:stripped_muddy_oak_wood" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "goodending:muddy_oak_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/quark/ancient_log.json b/src/generated/resources/data/create/recipes/cutting/compat/quark/ancient_log.json new file mode 100644 index 000000000..f8c7732a1 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/quark/ancient_log.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "quark" + } + ], + "ingredients": [ + { + "item": "quark:ancient_log" + } + ], + "processingTime": 50, + "results": [ + { + "item": "quark:stripped_ancient_log" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/quark/ancient_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/quark/ancient_wood.json new file mode 100644 index 000000000..79654adb9 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/quark/ancient_wood.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "quark" + } + ], + "ingredients": [ + { + "item": "quark:ancient_wood" + } + ], + "processingTime": 50, + "results": [ + { + "item": "quark:stripped_ancient_wood" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/quark/stripped_ancient_log.json b/src/generated/resources/data/create/recipes/cutting/compat/quark/stripped_ancient_log.json new file mode 100644 index 000000000..75de73d79 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/quark/stripped_ancient_log.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "quark" + } + ], + "ingredients": [ + { + "item": "quark:stripped_ancient_log" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "quark:ancient_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/quark/stripped_ancient_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/quark/stripped_ancient_wood.json new file mode 100644 index 000000000..7cdcf9a09 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/quark/stripped_ancient_wood.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "quark" + } + ], + "ingredients": [ + { + "item": "quark:stripped_ancient_wood" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "quark:ancient_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/windswept/chestnut_log.json b/src/generated/resources/data/create/recipes/cutting/compat/windswept/chestnut_log.json new file mode 100644 index 000000000..ec333925e --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/windswept/chestnut_log.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "windswept" + } + ], + "ingredients": [ + { + "item": "windswept:chestnut_log" + } + ], + "processingTime": 50, + "results": [ + { + "item": "windswept:stripped_chestnut_log" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/windswept/chestnut_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/windswept/chestnut_wood.json new file mode 100644 index 000000000..965afa048 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/windswept/chestnut_wood.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "windswept" + } + ], + "ingredients": [ + { + "item": "windswept:chestnut_wood" + } + ], + "processingTime": 50, + "results": [ + { + "item": "windswept:stripped_chestnut_wood" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/windswept/holly_log.json b/src/generated/resources/data/create/recipes/cutting/compat/windswept/holly_log.json new file mode 100644 index 000000000..65e94f938 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/windswept/holly_log.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "windswept" + } + ], + "ingredients": [ + { + "item": "windswept:holly_log" + } + ], + "processingTime": 50, + "results": [ + { + "item": "windswept:stripped_holly_log" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/windswept/holly_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/windswept/holly_wood.json new file mode 100644 index 000000000..a82a608d4 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/windswept/holly_wood.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "windswept" + } + ], + "ingredients": [ + { + "item": "windswept:holly_wood" + } + ], + "processingTime": 50, + "results": [ + { + "item": "windswept:stripped_holly_wood" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_chestnut_log.json b/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_chestnut_log.json new file mode 100644 index 000000000..01780d0c0 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_chestnut_log.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "windswept" + } + ], + "ingredients": [ + { + "item": "windswept:stripped_chestnut_log" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "windswept:chestnut_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_chestnut_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_chestnut_wood.json new file mode 100644 index 000000000..d37badef6 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_chestnut_wood.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "windswept" + } + ], + "ingredients": [ + { + "item": "windswept:stripped_chestnut_wood" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "windswept:chestnut_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_holly_log.json b/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_holly_log.json new file mode 100644 index 000000000..167c4f850 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_holly_log.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "windswept" + } + ], + "ingredients": [ + { + "item": "windswept:stripped_holly_log" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "windswept:holly_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_holly_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_holly_wood.json new file mode 100644 index 000000000..316c524ef --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_holly_wood.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "windswept" + } + ], + "ingredients": [ + { + "item": "windswept:stripped_holly_wood" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "windswept:holly_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/items/modded_stripped_wood.json b/src/generated/resources/data/create/tags/items/modded_stripped_wood.json index b2492e108..2073fcc4d 100644 --- a/src/generated/resources/data/create/tags/items/modded_stripped_wood.json +++ b/src/generated/resources/data/create/tags/items/modded_stripped_wood.json @@ -25,11 +25,11 @@ "required": false }, { - "id": "forbidden_arcanus:stripped_cherrywood", + "id": "forbidden_arcanus:stripped_cherrywood_wood", "required": false }, { - "id": "forbidden_arcanus:stripped_mysterywood", + "id": "forbidden_arcanus:stripped_mysterywood_wood", "required": false }, { 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 7af9ea3b1..66abc6843 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 @@ -54,8 +54,8 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { BTN_5 = stripAndMakePlanks(Mods.BTN, "glimmering_dreamwood", "glimmering_stripped_dreamwood", "dreamwood_planks"), - // Forbidden Arcanus (no _wood suffix) - FA = cuttingCompat(Mods.FA, "cherrywood", "mysterywood"), + // Forbidden Arcanus + FA = cuttingCompat(Mods.FA, "cherry", "aurum"), // Hexcasting (stripped is a suffix here) HEX = cuttingCompat(Mods.HEX, "edified"), @@ -91,7 +91,7 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { AP = cuttingCompat(Mods.AP, "twisted"), // Quark - Q = cuttingCompat(Mods.Q, "azalea", "blossom"), + Q = cuttingCompat(Mods.Q, "azalea", "blossom", "ancient"), // Ecologics ECO = cuttingCompat(Mods.ECO, "coconut", "walnut", "azalea"), @@ -153,7 +153,15 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { RU_12 = stripAndMakePlanks(Mods.RU, "ashen_log", "stripped_dead_log", null), RU_13 = stripAndMakePlanks(Mods.RU, "ashen_wood", "stripped_dead_wood", null), 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"), + + // Windswept + + WSP = cuttingCompat(Mods.WSP, "holly", "chestnut"), + + // Good Ending + + GOOD = cuttingCompat(Mods.GOOD, "muddy_oak", "cypress") ; GeneratedRecipe stripAndMakePlanks(Block wood, Block stripped, Block planks) { 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 index 485e9fac2..c5611ef24 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java @@ -13,7 +13,7 @@ public enum Mods { ARS_N("ars_nouveau"), BSK("blue_skies"), BTN("botania", b -> b.omitWoodSuffix()), - FA("forbidden_arcanus", b -> b.omitWoodSuffix()), + FA("forbidden_arcanus"), HEX("hexcasting"), ID("integrateddynamics", b -> b.strippedWoodIsSuffix()), BYG("byg"), @@ -55,7 +55,8 @@ public enum Mods { ENS("exnihilosequentia"), AET("aether"), HH("hauntedharvest"), - VMP("vampirism") + VMP("vampirism"), + WSP("windswept") ;