From 7a1dfeb8094d931178068139adebc98e13928573 Mon Sep 17 00:00:00 2001 From: gniftygnome Date: Sun, 17 Nov 2024 15:00:03 -0800 Subject: [PATCH] Stable release for 1.21.2/3. - Stable release for 1.21.2/3 - Use stable Biolith release - Clean up tags and tag translations --- build.gradle | 5 - .../assets/terrestria/lang/en_us.json | 4 +- .../assets/terrestria/lang/ru_ru.json | 27 +- .../data/TerrestriaBiomeTagProvider.java | 371 +++++++++--------- .../data/TerrestriaBlockTagProvider.java | 221 ++++++----- .../data/TerrestriaItemTagProvider.java | 49 ++- .../terrestria/tag/TerrestriaBlockTags.java | 2 - .../terrestria/tag/TerrestriaItemTags.java | 2 - gradle.properties | 2 +- 9 files changed, 357 insertions(+), 326 deletions(-) diff --git a/build.gradle b/build.gradle index 0209200b..0c858a97 100644 --- a/build.gradle +++ b/build.gradle @@ -91,11 +91,6 @@ allprojects { name = 'TerraformersMC' url = 'https://maven.terraformersmc.com/' } - - // TerraBlender - maven { - url = 'https://maven.minecraftforge.net/' - } } } diff --git a/client/src/main/resources/assets/terrestria/lang/en_us.json b/client/src/main/resources/assets/terrestria/lang/en_us.json index dfddaf32..f7c95796 100644 --- a/client/src/main/resources/assets/terrestria/lang/en_us.json +++ b/client/src/main/resources/assets/terrestria/lang/en_us.json @@ -549,7 +549,5 @@ "tag.item.c.podzols": "Podzols", "tag.item.c.sand": "Sand", "tag.item.c.sands": "Sands", - "tag.item.c.stone": "Stone", - "tag.item.c.stripped_logs": "Stripped Logs", - "tag.item.c.stripped_woods": "Stripped Woods" + "tag.item.c.stone": "Stone" } diff --git a/client/src/main/resources/assets/terrestria/lang/ru_ru.json b/client/src/main/resources/assets/terrestria/lang/ru_ru.json index aaa67f35..d05c139c 100644 --- a/client/src/main/resources/assets/terrestria/lang/ru_ru.json +++ b/client/src/main/resources/assets/terrestria/lang/ru_ru.json @@ -496,6 +496,18 @@ "item.terrestria.saguaro_cactus_sapling": "Саженец кактуса сагуаро", "item.terrestria.yucca_palm_sapling": "Саженец юкки пальмовой", + "tag.item.terrestria.cypress_logs": "Брёвна кипариса", + "tag.item.terrestria.hemlock_logs": "Брёвна тсуги", + "tag.item.terrestria.japanese_maple_logs": "Брёвна японского клёна", + "tag.item.terrestria.mossy_ingredients": "Замшелые ингридиенты", + "tag.item.terrestria.rainbow_eucalyptus_logs": "Брёвна радужного эвкалипта", + "tag.item.terrestria.redwood_logs": "Брёвна секвойи", + "tag.item.terrestria.rubber_logs": "Брёвна гевеи", + "tag.item.terrestria.sakura_logs": "Брёвна сакуры", + "tag.item.terrestria.small_oak_logs": "Тонкие дубовые брёвна", + "tag.item.terrestria.willow_logs": "Брёвна ивы", + "tag.item.terrestria.yucca_palm_logs": "Брёвна юкки пальмовой", + "tag.item.c.basalt": "Базальт", "tag.item.c.basalts": "Базальтовые", "tag.item.c.black_sand": "Чёрный песок", @@ -507,18 +519,5 @@ "tag.item.c.podzols": "Подзолы", "tag.item.c.sand": "Песок", "tag.item.c.sands": "Пески", - "tag.item.c.stone": "Камень", - "tag.item.c.stripped_logs": "Обтёсанные брёвна", - "tag.item.c.stripped_woods": "Обтёсанная древесина", - "tag.item.terrestria.cypress_logs": "Брёвна кипариса", - "tag.item.terrestria.hemlock_logs": "Брёвна тсуги", - "tag.item.terrestria.japanese_maple_logs": "Брёвна японского клёна", - "tag.item.terrestria.mossy_ingredients": "Замшелые ингридиенты", - "tag.item.terrestria.rainbow_eucalyptus_logs": "Брёвна радужного эвкалипта", - "tag.item.terrestria.redwood_logs": "Брёвна секвойи", - "tag.item.terrestria.rubber_logs": "Брёвна гевеи", - "tag.item.terrestria.sakura_logs": "Брёвна сакуры", - "tag.item.terrestria.small_oak_logs": "Тонкие дубовые брёвна", - "tag.item.terrestria.willow_logs": "Брёвна ивы", - "tag.item.terrestria.yucca_palm_logs": "Брёвна юкки пальмовой" + "tag.item.c.stone": "Камень" } diff --git a/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaBiomeTagProvider.java b/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaBiomeTagProvider.java index e4d9ecc6..73d0d042 100644 --- a/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaBiomeTagProvider.java +++ b/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaBiomeTagProvider.java @@ -21,289 +21,290 @@ protected TerrestriaBiomeTagProvider(FabricDataOutput output, CompletableFuture< @Override public void configure(RegistryWrapper.WrapperLookup registries) { /* - * Vanilla biome categories + * Vanilla biome tags */ getOrCreateTagBuilder(BiomeTags.ALLOWS_SURFACE_SLIME_SPAWNS) - .addOptional(TerrestriaBiomes.CYPRESS_SWAMP); + .addOptional(TerrestriaBiomes.CYPRESS_SWAMP); getOrCreateTagBuilder(BiomeTags.IS_BEACH) - .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND); + .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND); getOrCreateTagBuilder(BiomeTags.IS_FOREST) - .addOptional(TerrestriaBiomes.CYPRESS_FOREST) - .addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST) - .addOptional(TerrestriaBiomes.SAKURA_FOREST); + .addOptional(TerrestriaBiomes.CYPRESS_FOREST) + .addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST) + .addOptional(TerrestriaBiomes.SAKURA_FOREST); getOrCreateTagBuilder(BiomeTags.IS_HILL) - .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND); + .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND); getOrCreateTagBuilder(BiomeTags.IS_JUNGLE) - .addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST); + .addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST); getOrCreateTagBuilder(BiomeTags.IS_MOUNTAIN) - .addOptional(TerrestriaBiomes.CALDERA); + .addOptional(TerrestriaBiomes.CALDERA); getOrCreateTagBuilder(BiomeTags.IS_SAVANNA) - .addOptional(TerrestriaBiomes.OUTBACK); + .addOptional(TerrestriaBiomes.OUTBACK); getOrCreateTagBuilder(BiomeTags.IS_TAIGA) - .addOptional(TerrestriaBiomes.DENSE_WOODLANDS) - .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) - .addOptional(TerrestriaBiomes.HEMLOCK_TREELINE) - .addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST) - .addOptional(TerrestriaBiomes.REDWOOD_FOREST) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_TREELINE) - .addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST); + .addOptional(TerrestriaBiomes.DENSE_WOODLANDS) + .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) + .addOptional(TerrestriaBiomes.HEMLOCK_TREELINE) + .addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST) + .addOptional(TerrestriaBiomes.REDWOOD_FOREST) + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST) + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_TREELINE) + .addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST); getOrCreateTagBuilder(BiomeTags.SPAWNS_COLD_VARIANT_FROGS) - .addOptional(TerrestriaBiomes.CALDERA) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_TREELINE); + .addOptional(TerrestriaBiomes.CALDERA) + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST) + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_TREELINE); getOrCreateTagBuilder(BiomeTags.SPAWNS_WARM_VARIANT_FROGS) - .addOptional(TerrestriaBiomes.CANYON) - .addOptional(TerrestriaBiomes.DUNES) - .addOptional(TerrestriaBiomes.LUSH_DESERT) - .addOptional(TerrestriaBiomes.OASIS) - .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND); + .addOptional(TerrestriaBiomes.CANYON) + .addOptional(TerrestriaBiomes.DUNES) + .addOptional(TerrestriaBiomes.LUSH_DESERT) + .addOptional(TerrestriaBiomes.OASIS) + .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND); getOrCreateTagBuilder(BiomeTags.WATER_ON_MAP_OUTLINES) - .addOptional(TerrestriaBiomes.CYPRESS_SWAMP); + .addOptional(TerrestriaBiomes.CYPRESS_SWAMP); /* - * Common biome categories + * Conventional biome tags */ getOrCreateTagBuilder(ConventionalBiomeTags.IS_BADLANDS) - .addOptional(TerrestriaBiomes.CANYON); + .addOptional(TerrestriaBiomes.CANYON); getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD_OVERWORLD) - .addOptional(TerrestriaBiomes.CALDERA) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_TREELINE); + .addOptional(TerrestriaBiomes.CALDERA) + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST) + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_TREELINE); getOrCreateTagBuilder(ConventionalBiomeTags.IS_CONIFEROUS_TREE) - .addOptional(TerrestriaBiomes.CALDERA) - .addOptional(TerrestriaBiomes.CYPRESS_FOREST); + .addOptional(TerrestriaBiomes.CALDERA) + .addOptional(TerrestriaBiomes.CYPRESS_FOREST); getOrCreateTagBuilder(ConventionalBiomeTags.IS_DEAD) - .addOptional(TerrestriaBiomes.DUNES); + .addOptional(TerrestriaBiomes.DUNES); getOrCreateTagBuilder(ConventionalBiomeTags.IS_DECIDUOUS_TREE) - .addOptional(TerrestriaBiomes.DENSE_WOODLANDS) - .addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST) - .addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST) - .addOptional(TerrestriaBiomes.SAKURA_FOREST); + .addOptional(TerrestriaBiomes.DENSE_WOODLANDS) + .addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST) + .addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST) + .addOptional(TerrestriaBiomes.SAKURA_FOREST); getOrCreateTagBuilder(ConventionalBiomeTags.IS_DESERT) - .addOptional(TerrestriaBiomes.CANYON) - .addOptional(TerrestriaBiomes.DUNES) - .addOptional(TerrestriaBiomes.LUSH_DESERT) - .addOptional(TerrestriaBiomes.OASIS); + .addOptional(TerrestriaBiomes.CANYON) + .addOptional(TerrestriaBiomes.DUNES) + .addOptional(TerrestriaBiomes.LUSH_DESERT) + .addOptional(TerrestriaBiomes.OASIS); getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT_OVERWORLD) - .addOptional(TerrestriaBiomes.CANYON) - .addOptional(TerrestriaBiomes.LUSH_DESERT) - .addOptional(TerrestriaBiomes.OASIS) - .addOptional(TerrestriaBiomes.OUTBACK) - .addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST) - .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND); + .addOptional(TerrestriaBiomes.CANYON) + .addOptional(TerrestriaBiomes.LUSH_DESERT) + .addOptional(TerrestriaBiomes.OASIS) + .addOptional(TerrestriaBiomes.OUTBACK) + .addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST) + .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND); getOrCreateTagBuilder(ConventionalBiomeTags.IS_OVERWORLD) - .addOptional(TerrestriaBiomes.CALDERA) - .addOptional(TerrestriaBiomes.CANYON) - .addOptional(TerrestriaBiomes.CYPRESS_FOREST) - .addOptional(TerrestriaBiomes.CYPRESS_SWAMP) - .addOptional(TerrestriaBiomes.DENSE_WOODLANDS) - .addOptional(TerrestriaBiomes.DUNES) - .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) - .addOptional(TerrestriaBiomes.HEMLOCK_TREELINE) - .addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST) - .addOptional(TerrestriaBiomes.LUSH_DESERT) - .addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST) - .addOptional(TerrestriaBiomes.OASIS) - .addOptional(TerrestriaBiomes.OUTBACK) - .addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST) - .addOptional(TerrestriaBiomes.REDWOOD_FOREST) - .addOptional(TerrestriaBiomes.SAKURA_FOREST) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_TREELINE) - .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND) - .addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST); + .addOptional(TerrestriaBiomes.CALDERA) + .addOptional(TerrestriaBiomes.CANYON) + .addOptional(TerrestriaBiomes.CYPRESS_FOREST) + .addOptional(TerrestriaBiomes.CYPRESS_SWAMP) + .addOptional(TerrestriaBiomes.DENSE_WOODLANDS) + .addOptional(TerrestriaBiomes.DUNES) + .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) + .addOptional(TerrestriaBiomes.HEMLOCK_TREELINE) + .addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST) + .addOptional(TerrestriaBiomes.LUSH_DESERT) + .addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST) + .addOptional(TerrestriaBiomes.OASIS) + .addOptional(TerrestriaBiomes.OUTBACK) + .addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST) + .addOptional(TerrestriaBiomes.REDWOOD_FOREST) + .addOptional(TerrestriaBiomes.SAKURA_FOREST) + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST) + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_TREELINE) + .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND) + .addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST); getOrCreateTagBuilder(ConventionalBiomeTags.IS_SAVANNA) - .addOptional(TerrestriaBiomes.OUTBACK); + .addOptional(TerrestriaBiomes.OUTBACK); getOrCreateTagBuilder(ConventionalBiomeTags.IS_SNOWY) - .addOptional(TerrestriaBiomes.CALDERA) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_TREELINE); + .addOptional(TerrestriaBiomes.CALDERA) + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST) + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_TREELINE); getOrCreateTagBuilder(ConventionalBiomeTags.IS_SWAMP) - .addOptional(TerrestriaBiomes.CYPRESS_SWAMP); + .addOptional(TerrestriaBiomes.CYPRESS_SWAMP); getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD) - .addOptional(TerrestriaBiomes.CYPRESS_FOREST) - .addOptional(TerrestriaBiomes.CYPRESS_SWAMP) - .addOptional(TerrestriaBiomes.DENSE_WOODLANDS) - .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) - .addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST) - .addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST) - .addOptional(TerrestriaBiomes.REDWOOD_FOREST) - .addOptional(TerrestriaBiomes.SAKURA_FOREST); + .addOptional(TerrestriaBiomes.CYPRESS_FOREST) + .addOptional(TerrestriaBiomes.CYPRESS_SWAMP) + .addOptional(TerrestriaBiomes.DENSE_WOODLANDS) + .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) + .addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST) + .addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST) + .addOptional(TerrestriaBiomes.REDWOOD_FOREST) + .addOptional(TerrestriaBiomes.SAKURA_FOREST); getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD) - .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST); + .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST); getOrCreateTagBuilder(ConventionalBiomeTags.IS_WINDSWEPT) - .addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST); + .addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST); /* * Biome structure generation tags */ getOrCreateTagBuilder(BiomeTags.DESERT_PYRAMID_HAS_STRUCTURE) - .addOptional(TerrestriaBiomes.LUSH_DESERT) - .addOptional(TerrestriaBiomes.OASIS); + .addOptional(TerrestriaBiomes.LUSH_DESERT) + .addOptional(TerrestriaBiomes.OASIS); getOrCreateTagBuilder(BiomeTags.IGLOO_HAS_STRUCTURE) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST); + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST); getOrCreateTagBuilder(BiomeTags.JUNGLE_TEMPLE_HAS_STRUCTURE) - .addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST); + .addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST); getOrCreateTagBuilder(BiomeTags.MINESHAFT_HAS_STRUCTURE) - .addOptional(TerrestriaBiomes.CALDERA) - .addOptional(TerrestriaBiomes.CANYON) - .addOptional(TerrestriaBiomes.CYPRESS_FOREST) - .addOptional(TerrestriaBiomes.CYPRESS_SWAMP) - .addOptional(TerrestriaBiomes.DENSE_WOODLANDS) - .addOptional(TerrestriaBiomes.DUNES) - .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) - .addOptional(TerrestriaBiomes.HEMLOCK_TREELINE) - .addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST) - .addOptional(TerrestriaBiomes.LUSH_DESERT) - .addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST) - .addOptional(TerrestriaBiomes.OASIS) - .addOptional(TerrestriaBiomes.OUTBACK) - .addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST) - .addOptional(TerrestriaBiomes.REDWOOD_FOREST) - .addOptional(TerrestriaBiomes.SAKURA_FOREST) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_TREELINE) - .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND) - .addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST); + .addOptional(TerrestriaBiomes.CALDERA) + .addOptional(TerrestriaBiomes.CANYON) + .addOptional(TerrestriaBiomes.CYPRESS_FOREST) + .addOptional(TerrestriaBiomes.CYPRESS_SWAMP) + .addOptional(TerrestriaBiomes.DENSE_WOODLANDS) + .addOptional(TerrestriaBiomes.DUNES) + .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) + .addOptional(TerrestriaBiomes.HEMLOCK_TREELINE) + .addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST) + .addOptional(TerrestriaBiomes.LUSH_DESERT) + .addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST) + .addOptional(TerrestriaBiomes.OASIS) + .addOptional(TerrestriaBiomes.OUTBACK) + .addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST) + .addOptional(TerrestriaBiomes.REDWOOD_FOREST) + .addOptional(TerrestriaBiomes.SAKURA_FOREST) + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST) + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_TREELINE) + .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND) + .addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST); getOrCreateTagBuilder(BiomeTags.RUINED_PORTAL_DESERT_HAS_STRUCTURE) - .addOptional(TerrestriaBiomes.LUSH_DESERT) - .addOptional(TerrestriaBiomes.OASIS) - .addOptional(TerrestriaBiomes.OUTBACK); + .addOptional(TerrestriaBiomes.LUSH_DESERT) + .addOptional(TerrestriaBiomes.OASIS) + .addOptional(TerrestriaBiomes.OUTBACK); getOrCreateTagBuilder(BiomeTags.RUINED_PORTAL_JUNGLE_HAS_STRUCTURE) - .addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST) - .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND); + .addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST) + .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND); getOrCreateTagBuilder(BiomeTags.RUINED_PORTAL_MOUNTAIN_HAS_STRUCTURE) - .addOptional(TerrestriaBiomes.HEMLOCK_TREELINE) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_TREELINE) - .addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST); + .addOptional(TerrestriaBiomes.HEMLOCK_TREELINE) + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_TREELINE) + .addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST); getOrCreateTagBuilder(BiomeTags.RUINED_PORTAL_STANDARD_HAS_STRUCTURE) - .addOptional(TerrestriaBiomes.CYPRESS_FOREST) - .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) - .addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST) - .addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST) - .addOptional(TerrestriaBiomes.REDWOOD_FOREST) - .addOptional(TerrestriaBiomes.SAKURA_FOREST) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST); + .addOptional(TerrestriaBiomes.CYPRESS_FOREST) + .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) + .addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST) + .addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST) + .addOptional(TerrestriaBiomes.REDWOOD_FOREST) + .addOptional(TerrestriaBiomes.SAKURA_FOREST) + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST); getOrCreateTagBuilder(BiomeTags.SWAMP_HUT_HAS_STRUCTURE) - .addOptional(TerrestriaBiomes.CYPRESS_SWAMP); + .addOptional(TerrestriaBiomes.CYPRESS_SWAMP); getOrCreateTagBuilder(BiomeTags.SHIPWRECK_BEACHED_HAS_STRUCTURE) - .addTag(BiomeTags.IS_BEACH); + .addTag(BiomeTags.IS_BEACH); getOrCreateTagBuilder(BiomeTags.STRONGHOLD_HAS_STRUCTURE) - .addOptional(TerrestriaBiomes.CALDERA) - .addOptional(TerrestriaBiomes.CANYON) - .addOptional(TerrestriaBiomes.CYPRESS_FOREST) - .addOptional(TerrestriaBiomes.CYPRESS_SWAMP) - .addOptional(TerrestriaBiomes.DENSE_WOODLANDS) - .addOptional(TerrestriaBiomes.DUNES) - .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) - .addOptional(TerrestriaBiomes.HEMLOCK_TREELINE) - .addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST) - .addOptional(TerrestriaBiomes.LUSH_DESERT) - .addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST) - .addOptional(TerrestriaBiomes.OASIS) - .addOptional(TerrestriaBiomes.OUTBACK) - .addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST) - .addOptional(TerrestriaBiomes.REDWOOD_FOREST) - .addOptional(TerrestriaBiomes.SAKURA_FOREST) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_TREELINE) - .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND) - .addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST); + .addOptional(TerrestriaBiomes.CALDERA) + .addOptional(TerrestriaBiomes.CANYON) + .addOptional(TerrestriaBiomes.CYPRESS_FOREST) + .addOptional(TerrestriaBiomes.CYPRESS_SWAMP) + .addOptional(TerrestriaBiomes.DENSE_WOODLANDS) + .addOptional(TerrestriaBiomes.DUNES) + .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) + .addOptional(TerrestriaBiomes.HEMLOCK_TREELINE) + .addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST) + .addOptional(TerrestriaBiomes.LUSH_DESERT) + .addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST) + .addOptional(TerrestriaBiomes.OASIS) + .addOptional(TerrestriaBiomes.OUTBACK) + .addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST) + .addOptional(TerrestriaBiomes.REDWOOD_FOREST) + .addOptional(TerrestriaBiomes.SAKURA_FOREST) + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST) + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_TREELINE) + .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND) + .addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST); getOrCreateTagBuilder(BiomeTags.TRAIL_RUINS_HAS_STRUCTURE) - .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) - .addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST) - .addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST) - .addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST); + .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) + .addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST) + .addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST) + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST) + .addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST); getOrCreateTagBuilder(BiomeTags.TRIAL_CHAMBERS_HAS_STRUCTURE) - .addOptional(TerrestriaBiomes.CANYON) - .addOptional(TerrestriaBiomes.CYPRESS_FOREST) - .addOptional(TerrestriaBiomes.CYPRESS_SWAMP) - .addOptional(TerrestriaBiomes.DENSE_WOODLANDS) - .addOptional(TerrestriaBiomes.DUNES) - .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) - .addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST) - .addOptional(TerrestriaBiomes.LUSH_DESERT) - .addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST) - .addOptional(TerrestriaBiomes.OASIS) - .addOptional(TerrestriaBiomes.OUTBACK) - .addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST) - .addOptional(TerrestriaBiomes.REDWOOD_FOREST) - .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND) - .addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST); + .addOptional(TerrestriaBiomes.CANYON) + .addOptional(TerrestriaBiomes.CYPRESS_FOREST) + .addOptional(TerrestriaBiomes.CYPRESS_SWAMP) + .addOptional(TerrestriaBiomes.DENSE_WOODLANDS) + .addOptional(TerrestriaBiomes.DUNES) + .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) + .addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST) + .addOptional(TerrestriaBiomes.LUSH_DESERT) + .addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST) + .addOptional(TerrestriaBiomes.OASIS) + .addOptional(TerrestriaBiomes.OUTBACK) + .addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST) + .addOptional(TerrestriaBiomes.REDWOOD_FOREST) + .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND) + .addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST); getOrCreateTagBuilder(BiomeTags.VILLAGE_DESERT_HAS_STRUCTURE) - .addOptional(TerrestriaBiomes.LUSH_DESERT) - .addOptional(TerrestriaBiomes.OASIS) - .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND); + .addOptional(TerrestriaBiomes.LUSH_DESERT) + .addOptional(TerrestriaBiomes.OASIS) + .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND); getOrCreateTagBuilder(BiomeTags.VILLAGE_PLAINS_HAS_STRUCTURE) - .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) - .addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST) - .addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST) - .addOptional(TerrestriaBiomes.REDWOOD_FOREST) - .addOptional(TerrestriaBiomes.SAKURA_FOREST); + .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) + .addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST) + .addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST) + .addOptional(TerrestriaBiomes.REDWOOD_FOREST) + .addOptional(TerrestriaBiomes.SAKURA_FOREST); getOrCreateTagBuilder(BiomeTags.VILLAGE_SAVANNA_HAS_STRUCTURE) - .addOptional(TerrestriaBiomes.OUTBACK); + .addOptional(TerrestriaBiomes.OUTBACK); getOrCreateTagBuilder(BiomeTags.VILLAGE_SNOWY_HAS_STRUCTURE) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST) - .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_TREELINE); + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST) + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_TREELINE); getOrCreateTagBuilder(BiomeTags.VILLAGE_TAIGA_HAS_STRUCTURE) - .addOptional(TerrestriaBiomes.HEMLOCK_TREELINE) - .addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST); + .addOptional(TerrestriaBiomes.HEMLOCK_TREELINE) + .addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST); + getOrCreateTagBuilder(TerrestriaBiomeTags.CANYON_ARCH_HAS_STRUCTURE) - .addOptional(TerrestriaBiomes.CANYON); + .addOptional(TerrestriaBiomes.CANYON); getOrCreateTagBuilder(TerrestriaBiomeTags.OCEAN_VOLCANO_HAS_STRUCTURE) - .add(BiomeKeys.DEEP_FROZEN_OCEAN) - .add(BiomeKeys.DEEP_COLD_OCEAN) - .add(BiomeKeys.DEEP_OCEAN) - .add(BiomeKeys.DEEP_LUKEWARM_OCEAN); + .add(BiomeKeys.DEEP_FROZEN_OCEAN) + .add(BiomeKeys.DEEP_COLD_OCEAN) + .add(BiomeKeys.DEEP_OCEAN) + .add(BiomeKeys.DEEP_LUKEWARM_OCEAN); getOrCreateTagBuilder(TerrestriaBiomeTags.VOLCANO_HAS_STRUCTURE) - .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND); + .addOptional(TerrestriaBiomes.VOLCANIC_ISLAND); } } diff --git a/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaBlockTagProvider.java b/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaBlockTagProvider.java index d4879d41..973a98ca 100644 --- a/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaBlockTagProvider.java +++ b/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaBlockTagProvider.java @@ -26,98 +26,119 @@ protected TerrestriaBlockTagProvider(FabricDataOutput output, CompletableFuture< @Override public void configure(RegistryWrapper.WrapperLookup registries) { - // basic block tags + /* + * Basic block tags + */ getOrCreateTagBuilder(BlockTags.AZALEA_ROOT_REPLACEABLE) - .add(TerrestriaBlocks.VOLCANIC_ROCK.plain.full); + .add(TerrestriaBlocks.VOLCANIC_ROCK.plain.full); getOrCreateTagBuilder(BlockTags.FLOWER_POTS) - .add(TerrestriaBlocks.POTTED_AGAVE) - .add(TerrestriaBlocks.POTTED_ALOE_VERA) - .add(TerrestriaBlocks.POTTED_BRYCE_SAPLING) - .add(TerrestriaBlocks.POTTED_CYPRESS_SAPLING) - .add(TerrestriaBlocks.POTTED_DARK_JAPANESE_MAPLE_SAPLING) - .add(TerrestriaBlocks.POTTED_HEMLOCK_SAPLING) - .add(TerrestriaBlocks.POTTED_INDIAN_PAINTBRUSH) - .add(TerrestriaBlocks.POTTED_JAPANESE_MAPLE_SAPLING) - .add(TerrestriaBlocks.POTTED_JAPANESE_MAPLE_SHRUB_SAPLING) - .add(TerrestriaBlocks.POTTED_JUNGLE_PALM_SAPLING) - .add(TerrestriaBlocks.POTTED_MONSTERAS) - .add(TerrestriaBlocks.POTTED_RAINBOW_EUCALYPTUS_SAPLING) - .add(TerrestriaBlocks.POTTED_REDWOOD_SAPLING) - .add(TerrestriaBlocks.POTTED_RUBBER_SAPLING) - .add(TerrestriaBlocks.POTTED_SAGUARO_CACTUS_SAPLING) - .add(TerrestriaBlocks.POTTED_SAKURA_SAPLING) - .add(TerrestriaBlocks.POTTED_TINY_CACTUS) - .add(TerrestriaBlocks.POTTED_WILLOW_SAPLING) - .add(TerrestriaBlocks.POTTED_YUCCA_PALM_SAPLING); - - getOrCreateTagBuilder(BlockTags.HOE_MINEABLE) - .add(TerrestriaBlocks.DARK_JAPANESE_MAPLE_LEAVES) - .add(TerrestriaBlocks.JAPANESE_MAPLE_SHRUB_LEAVES) - .add(TerrestriaBlocks.JUNGLE_PALM_LEAVES); + .add(TerrestriaBlocks.POTTED_AGAVE) + .add(TerrestriaBlocks.POTTED_ALOE_VERA) + .add(TerrestriaBlocks.POTTED_BRYCE_SAPLING) + .add(TerrestriaBlocks.POTTED_CYPRESS_SAPLING) + .add(TerrestriaBlocks.POTTED_DARK_JAPANESE_MAPLE_SAPLING) + .add(TerrestriaBlocks.POTTED_HEMLOCK_SAPLING) + .add(TerrestriaBlocks.POTTED_INDIAN_PAINTBRUSH) + .add(TerrestriaBlocks.POTTED_JAPANESE_MAPLE_SAPLING) + .add(TerrestriaBlocks.POTTED_JAPANESE_MAPLE_SHRUB_SAPLING) + .add(TerrestriaBlocks.POTTED_JUNGLE_PALM_SAPLING) + .add(TerrestriaBlocks.POTTED_MONSTERAS) + .add(TerrestriaBlocks.POTTED_RAINBOW_EUCALYPTUS_SAPLING) + .add(TerrestriaBlocks.POTTED_REDWOOD_SAPLING) + .add(TerrestriaBlocks.POTTED_RUBBER_SAPLING) + .add(TerrestriaBlocks.POTTED_SAGUARO_CACTUS_SAPLING) + .add(TerrestriaBlocks.POTTED_SAKURA_SAPLING) + .add(TerrestriaBlocks.POTTED_TINY_CACTUS) + .add(TerrestriaBlocks.POTTED_WILLOW_SAPLING) + .add(TerrestriaBlocks.POTTED_YUCCA_PALM_SAPLING); getOrCreateTagBuilder(BlockTags.LEAVES) - .add(TerrestriaBlocks.DARK_JAPANESE_MAPLE_LEAVES) - .add(TerrestriaBlocks.JAPANESE_MAPLE_SHRUB_LEAVES) - .add(TerrestriaBlocks.JUNGLE_PALM_LEAVES); + .add(TerrestriaBlocks.DARK_JAPANESE_MAPLE_LEAVES) + .add(TerrestriaBlocks.JAPANESE_MAPLE_SHRUB_LEAVES) + .add(TerrestriaBlocks.JUNGLE_PALM_LEAVES); + + getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN) + .addTag(TerrestriaBlockTags.SMALL_OAK_LOGS); getOrCreateTagBuilder(BlockTags.MOSS_REPLACEABLE) - .add(TerrestriaBlocks.VOLCANIC_ROCK.plain.full); + .add(TerrestriaBlocks.VOLCANIC_ROCK.plain.full); getOrCreateTagBuilder(BlockTags.OAK_LOGS) - .addTag(TerrestriaBlockTags.SMALL_OAK_LOGS); + .addTag(TerrestriaBlockTags.SMALL_OAK_LOGS); getOrCreateTagBuilder(BlockTags.OVERWORLD_CARVER_REPLACEABLES) - .add(Blocks.SMOOTH_SANDSTONE) - .add(TerrestriaBlocks.ANDISOL.getDirt()) - .add(TerrestriaBlocks.ANDISOL.getGrassBlock()) - .add(TerrestriaBlocks.VOLCANIC_ROCK.plain.full); + .add(Blocks.SMOOTH_SANDSTONE) + .add(TerrestriaBlocks.ANDISOL.getDirt()) + .add(TerrestriaBlocks.ANDISOL.getGrassBlock()) + .add(TerrestriaBlocks.VOLCANIC_ROCK.plain.full); getOrCreateTagBuilder(BlockTags.SAPLINGS) - .add(TerrestriaBlocks.BRYCE_SAPLING) - .add(TerrestriaBlocks.CYPRESS_SAPLING) - .add(TerrestriaBlocks.DARK_JAPANESE_MAPLE_SAPLING) - .add(TerrestriaBlocks.HEMLOCK_SAPLING) - .add(TerrestriaBlocks.JAPANESE_MAPLE_SAPLING) - .add(TerrestriaBlocks.JAPANESE_MAPLE_SHRUB_SAPLING) - .add(TerrestriaBlocks.JUNGLE_PALM_SAPLING) - .add(TerrestriaBlocks.RAINBOW_EUCALYPTUS_SAPLING) - .add(TerrestriaBlocks.REDWOOD_SAPLING) - .add(TerrestriaBlocks.RUBBER_SAPLING) - .add(TerrestriaBlocks.SAKURA_SAPLING) - .add(TerrestriaBlocks.SAGUARO_CACTUS_SAPLING) - .add(TerrestriaBlocks.WILLOW_SAPLING) - .add(TerrestriaBlocks.YUCCA_PALM_SAPLING); + .add(TerrestriaBlocks.BRYCE_SAPLING) + .add(TerrestriaBlocks.CYPRESS_SAPLING) + .add(TerrestriaBlocks.DARK_JAPANESE_MAPLE_SAPLING) + .add(TerrestriaBlocks.HEMLOCK_SAPLING) + .add(TerrestriaBlocks.JAPANESE_MAPLE_SAPLING) + .add(TerrestriaBlocks.JAPANESE_MAPLE_SHRUB_SAPLING) + .add(TerrestriaBlocks.JUNGLE_PALM_SAPLING) + .add(TerrestriaBlocks.RAINBOW_EUCALYPTUS_SAPLING) + .add(TerrestriaBlocks.REDWOOD_SAPLING) + .add(TerrestriaBlocks.RUBBER_SAPLING) + .add(TerrestriaBlocks.SAKURA_SAPLING) + .add(TerrestriaBlocks.SAGUARO_CACTUS_SAPLING) + .add(TerrestriaBlocks.WILLOW_SAPLING) + .add(TerrestriaBlocks.YUCCA_PALM_SAPLING); getOrCreateTagBuilder(BlockTags.SMALL_FLOWERS) - .add(TerrestriaBlocks.INDIAN_PAINTBRUSH) - .add(TerrestriaBlocks.MONSTERAS); + .add(TerrestriaBlocks.INDIAN_PAINTBRUSH) + .add(TerrestriaBlocks.MONSTERAS); + + + /* + * Tool block tags + */ + getOrCreateTagBuilder(BlockTags.HOE_MINEABLE) + .add(TerrestriaBlocks.DARK_JAPANESE_MAPLE_LEAVES) + .add(TerrestriaBlocks.JAPANESE_MAPLE_SHRUB_LEAVES) + .add(TerrestriaBlocks.JUNGLE_PALM_LEAVES); + /* + * Conventional block tags + */ getOrCreateTagBuilder(TerrestriaBlockTags.BLACK_SANDS) - .add(TerrestriaBlocks.BLACK_SAND); + .add(TerrestriaBlocks.BLACK_SAND); - getOrCreateTagBuilder(TerrestriaBlockTags.SMALL_OAK_LOGS) - .add(TerrestriaBlocks.SMALL_OAK_LOG) - .add(TerrestriaBlocks.STRIPPED_SMALL_OAK_LOG); + getOrCreateTagBuilder(ConventionalBlockTags.STRIPPED_LOGS) + .add(TerrestriaBlocks.STRIPPED_SMALL_OAK_LOG); - getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN) - .addTag(TerrestriaBlockTags.SMALL_OAK_LOGS); - getOrCreateTagBuilder(TerrestriaBlockTags.STRIPPED_LOGS) - .add(TerrestriaBlocks.STRIPPED_SMALL_OAK_LOG); + /* + * Local block tags + */ + getOrCreateTagBuilder(TerrestriaBlockTags.SMALL_OAK_LOGS) + .add(TerrestriaBlocks.SMALL_OAK_LOG) + .add(TerrestriaBlocks.STRIPPED_SMALL_OAK_LOG); - // custom dirt block tags + /* + * Custom dirt block tags + */ addDirt(TerrestriaBlocks.ANDISOL); - // custom sand block tags + /* + * Custom sand block tags + */ addSand(TerrestriaBlocks.BLACK_SAND); - // stone building block tags + /* + * Stone building block tags + */ addStone(TerrestriaBlockTags.BASALTS, TerrestriaBlocks.VOLCANIC_ROCK); - // wood building block tags + /* + * Wood building block tags + */ addWood(TerrestriaBlockTags.CYPRESS_LOGS, TerrestriaBlocks.CYPRESS); addWood(TerrestriaBlockTags.HEMLOCK_LOGS, TerrestriaBlocks.HEMLOCK); addWood(TerrestriaBlockTags.JAPANESE_MAPLE_LOGS, TerrestriaBlocks.JAPANESE_MAPLE); @@ -131,55 +152,55 @@ public void configure(RegistryWrapper.WrapperLookup registries) { private void addDirt(DirtBlocks dirtBlock) { getOrCreateTagBuilder(BlockTags.ANIMALS_SPAWNABLE_ON) - .add(dirtBlock.getGrassBlock()); + .add(dirtBlock.getGrassBlock()); getOrCreateTagBuilder(BlockTags.BIG_DRIPLEAF_PLACEABLE) - .add(dirtBlock.getFarmland()); + .add(dirtBlock.getFarmland()); getOrCreateTagBuilder(BlockTags.CONVERTABLE_TO_MUD) - .add(dirtBlock.getDirt()); + .add(dirtBlock.getDirt()); getOrCreateTagBuilder(BlockTags.DIRT) - .add(dirtBlock.getDirt()) - .add(dirtBlock.getGrassBlock()) - .add(dirtBlock.getPodzol()); + .add(dirtBlock.getDirt()) + .add(dirtBlock.getGrassBlock()) + .add(dirtBlock.getPodzol()); getOrCreateTagBuilder(BlockTags.ENDERMAN_HOLDABLE) - .add(dirtBlock.getDirt()) - .add(dirtBlock.getGrassBlock()) - .add(dirtBlock.getPodzol()); + .add(dirtBlock.getDirt()) + .add(dirtBlock.getGrassBlock()) + .add(dirtBlock.getPodzol()); getOrCreateTagBuilder(BlockTags.MUSHROOM_GROW_BLOCK) - .add(dirtBlock.getPodzol()); + .add(dirtBlock.getPodzol()); getOrCreateTagBuilder(BlockTags.SHOVEL_MINEABLE) - .add(dirtBlock.getDirt()) - .add(dirtBlock.getDirtPath()) - .add(dirtBlock.getFarmland()) - .add(dirtBlock.getGrassBlock()) - .add(dirtBlock.getPodzol()); + .add(dirtBlock.getDirt()) + .add(dirtBlock.getDirtPath()) + .add(dirtBlock.getFarmland()) + .add(dirtBlock.getGrassBlock()) + .add(dirtBlock.getPodzol()); getOrCreateTagBuilder(BlockTags.VALID_SPAWN) - .add(dirtBlock.getGrassBlock()) - .add(dirtBlock.getPodzol()); + .add(dirtBlock.getGrassBlock()) + .add(dirtBlock.getPodzol()); getOrCreateTagBuilder(TerrestriaBlockTags.DIRTS) - .add(dirtBlock.getDirt()); + .add(dirtBlock.getDirt()); getOrCreateTagBuilder(TerraformDirtBlockTags.FARMLAND) - .add(dirtBlock.getFarmland()); + .add(dirtBlock.getFarmland()); getOrCreateTagBuilder(TerraformDirtBlockTags.GRASS_BLOCKS) - .add(dirtBlock.getGrassBlock()); + .add(dirtBlock.getGrassBlock()); getOrCreateTagBuilder(TerrestriaBlockTags.PODZOLS) - .add(dirtBlock.getPodzol()); + .add(dirtBlock.getPodzol()); getOrCreateTagBuilder(TerraformDirtBlockTags.SOIL) - .add(dirtBlock.getDirt()) - .add(dirtBlock.getGrassBlock()) - .add(dirtBlock.getPodzol()); + .add(dirtBlock.getDirt()) + .add(dirtBlock.getGrassBlock()) + .add(dirtBlock.getPodzol()); } private void addSand(ColoredFallingBlock sandBlock) { @@ -241,31 +262,31 @@ private void addStoneVariant(StoneVariantBlocks stoneVariantBlock) { getOrCreateTagBuilder(BlockTags.WALLS).add(stoneVariantBlock.wall); getOrCreateTagBuilder(BlockTags.PICKAXE_MINEABLE) - .add(stoneVariantBlock.full) - .add(stoneVariantBlock.slab) - .add(stoneVariantBlock.stairs); - // Adding to WALLS does this for PICKAXE_MINEABLE. + .add(stoneVariantBlock.full) + .add(stoneVariantBlock.slab) + .add(stoneVariantBlock.stairs); + // Adding to WALLS does this for PICKAXE_MINEABLE. } private void addWood(TagKey logTag, WoodBlocks woodBlock) { FabricTagBuilder woodBuilder = getOrCreateTagBuilder(logTag); woodBuilder - .add(woodBlock.log) - .add(woodBlock.strippedLog); - getOrCreateTagBuilder(TerrestriaBlockTags.STRIPPED_LOGS).add(woodBlock.strippedLog); + .add(woodBlock.log) + .add(woodBlock.strippedLog); + getOrCreateTagBuilder(ConventionalBlockTags.STRIPPED_LOGS).add(woodBlock.strippedLog); if (woodBlock.hasWood()) { woodBuilder - .add(woodBlock.wood) - .add(woodBlock.strippedWood); - getOrCreateTagBuilder(TerrestriaBlockTags.STRIPPED_WOODS).add(woodBlock.strippedWood); + .add(woodBlock.wood) + .add(woodBlock.strippedWood); + getOrCreateTagBuilder(ConventionalBlockTags.STRIPPED_WOODS).add(woodBlock.strippedWood); } if (woodBlock.hasQuarterLog()) { woodBuilder - .add(woodBlock.quarterLog) - .add(woodBlock.strippedQuarterLog); - getOrCreateTagBuilder(TerrestriaBlockTags.STRIPPED_LOGS).add(woodBlock.strippedQuarterLog); + .add(woodBlock.quarterLog) + .add(woodBlock.strippedQuarterLog); + getOrCreateTagBuilder(ConventionalBlockTags.STRIPPED_LOGS).add(woodBlock.strippedQuarterLog); } getOrCreateTagBuilder(BlockTags.FENCE_GATES).add(woodBlock.fenceGate); diff --git a/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaItemTagProvider.java b/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaItemTagProvider.java index 2f27598d..84c4653b 100644 --- a/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaItemTagProvider.java +++ b/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaItemTagProvider.java @@ -22,6 +22,9 @@ protected TerrestriaItemTagProvider(FabricDataOutput output, CompletableFuture PLANKS_THAT_BURN = TerrestriaBlockTags.of(Identifier.of("c", "planks_that_burn")); public static final TagKey PODZOLS = TerrestriaBlockTags.of(Identifier.of("c", "podzols")); public static final TagKey SANDS = TerrestriaBlockTags.of(Identifier.of("c", "sands")); - public static final TagKey STRIPPED_LOGS = TerrestriaBlockTags.of(Identifier.of("c", "stripped_logs")); - public static final TagKey STRIPPED_WOODS = TerrestriaBlockTags.of(Identifier.of("c", "stripped_woods")); public static final TagKey CYPRESS_LOGS = TerrestriaBlockTags.of("cypress_logs"); public static final TagKey HEMLOCK_LOGS = TerrestriaBlockTags.of("hemlock_logs"); diff --git a/common/src/main/java/com/terraformersmc/terrestria/tag/TerrestriaItemTags.java b/common/src/main/java/com/terraformersmc/terrestria/tag/TerrestriaItemTags.java index 462838bf..24fa8afe 100644 --- a/common/src/main/java/com/terraformersmc/terrestria/tag/TerrestriaItemTags.java +++ b/common/src/main/java/com/terraformersmc/terrestria/tag/TerrestriaItemTags.java @@ -19,8 +19,6 @@ public final class TerrestriaItemTags { public static final TagKey SAND = TerrestriaItemTags.of(Identifier.of("c", "sand")); public static final TagKey SANDS = TerrestriaItemTags.of(Identifier.of("c", "sands")); public static final TagKey STONE = TerrestriaItemTags.of(Identifier.of("c", "stone")); - public static final TagKey STRIPPED_LOGS = TerrestriaItemTags.of(Identifier.of("c", "stripped_logs")); - public static final TagKey STRIPPED_WOODS = TerrestriaItemTags.of(Identifier.of("c", "stripped_woods")); public static final TagKey CYPRESS_LOGS = TerrestriaItemTags.of("cypress_logs"); public static final TagKey HEMLOCK_LOGS = TerrestriaItemTags.of("hemlock_logs"); diff --git a/gradle.properties b/gradle.properties index 45681d7d..266f195b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ terraform_tree_api_version=12.0.0-alpha.2 terraform_wood_api_version=12.0.0-alpha.2 # Biolith for worldgen module and testing -biolith_version=3.1.0-beta.1 +biolith_version=3.1.0 # Project Metadata project_name=Terrestria