diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 691ed4dcf..c9bc38bf0 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -5346,8 +5346,8 @@ a1d4f4243cc2c700488fbfa292b483a7f43d4d58 data/create/tags/items/contraption_cont c98ffdc2780c2a7690c590f46f014aeee7b0b504 data/create/tags/items/create_ingots.json 8699ff3a635e20ddfcda237feec30b48277c417f data/create/tags/items/crushed_raw_materials.json 49847bfbea11808b5101c972023a7f5833fe5a14 data/create/tags/items/deployable_drink.json -67385d5198d0796ec8f0d2c6ae144c672f4317a1 data/create/tags/items/modded_stripped_logs.json -27a1074a88a7b939c811341086afece325ed724c data/create/tags/items/modded_stripped_wood.json +bc8248a29717ad7426329616ad360139b170c695 data/create/tags/items/modded_stripped_logs.json +bb1de990ae480c6741d09b0677b2559c76788638 data/create/tags/items/modded_stripped_wood.json 8c8f6658ee72bdea2fcef77bade7bfa48de784c8 data/create/tags/items/pressurized_air_sources.json bce28787b0271382842823d04a977912a88b01c2 data/create/tags/items/sandpaper.json 6cdeeac1689f7b5bfd9bc40b462143d8eaf3ad0b data/create/tags/items/seats.json diff --git a/src/generated/resources/data/create/tags/items/modded_stripped_logs.json b/src/generated/resources/data/create/tags/items/modded_stripped_logs.json index 804aea4d3..4b1ac1f8c 100644 --- a/src/generated/resources/data/create/tags/items/modded_stripped_logs.json +++ b/src/generated/resources/data/create/tags/items/modded_stripped_logs.json @@ -289,10 +289,6 @@ "id": "blue_skies:stripped_cherry_log", "required": false }, - { - "id": "byg:stripped_bulbis_stem", - "required": false - }, { "id": "environmental:stripped_cherry_log", "required": false @@ -329,10 +325,6 @@ "id": "atmospheric:stripped_grimwood_log", "required": false }, - { - "id": "infernalexp:stripped_luminous_stem", - "required": false - }, { "id": "goodending:stripped_muddy_oak_log", "required": false @@ -356,6 +348,14 @@ { "id": "biomemakeover:stripped_ancient_oak_log", "required": false + }, + { + "id": "infernalexp:stripped_luminous_stem", + "required": false + }, + { + "id": "byg:stripped_bulbis_stem", + "required": false } ] -} +} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/items/modded_stripped_wood.json b/src/generated/resources/data/create/tags/items/modded_stripped_wood.json index 2f3250c5f..629db0fce 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 @@ -289,10 +289,6 @@ "id": "blue_skies:stripped_cherry_wood", "required": false }, - { - "id": "byg:stripped_bulbis_wood", - "required": false - }, { "id": "environmental:stripped_cherry_wood", "required": false @@ -329,10 +325,6 @@ "id": "atmospheric:stripped_grimwood", "required": false }, - { - "id": "infernalexp:stripped_luminous_hyphae", - "required": false - }, { "id": "goodending:stripped_muddy_oak_wood", "required": false @@ -356,6 +348,14 @@ { "id": "biomemakeover:stripped_ancient_oak_wood", "required": false + }, + { + "id": "infernalexp:stripped_luminous_hyphae", + "required": false + }, + { + "id": "byg:stripped_bulbis_wood", + "required": false } ] -} +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/foundation/data/TagGen.java b/src/main/java/com/simibubi/create/foundation/data/TagGen.java index 0fe706f4e..5870c6e28 100644 --- a/src/main/java/com/simibubi/create/foundation/data/TagGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/TagGen.java @@ -211,7 +211,14 @@ public class TagGen { helper.add(Mods.BOP, "fir", "redwood", "cherry", "mahogany", "jacaranda", "palm", "willow", "dead", "magic", "umbran", "hellbark"); helper.add(Mods.BSK, "bluebright", "starlit", "frostbright", "lunar", "dusk", "maple", "cherry"); + helper.add(Mods.ENV, "cherry", "willow", "wisteria"); + helper.add(Mods.ATM, "aspen", "kousa", "yucca", "morado"); + helper.add(Mods.ATM_2, "rosewood", "grimwood"); + helper.add(Mods.GOOD, "muddy_oak", "cypress"); + helper.add(Mods.BMK, "blighted_balsa", "willow", "swamp_cypress", "ancient_oak"); + addOptional(logAppender, Mods.IX, "stripped_luminous_stem"); + addOptional(woodAppender, Mods.IX, "stripped_luminous_hyphae"); addOptional(logAppender, Mods.BYG, "stripped_bulbis_stem"); addOptional(woodAppender, Mods.BYG, "stripped_bulbis_wood"); } 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 b89e5498e..09c22b6e1 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 @@ -26,6 +26,12 @@ public enum Mods { TF("twilightforest"), ECO("ecologics"), + ENV("environmental"), + ATM("atmospheric"), + ATM_2("atmospheric", b -> b.omitWoodSuffix()), + IX("infernalexp"), + GOOD("goodending"), + BMK("biomemakeover") ; private final String id;