From b0caea8e204a7f026646396558d6d58a02bff9d6 Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 9 Sep 2022 11:27:39 -0700 Subject: [PATCH] Change codestyle for BookShelves tag. Closes #9027 Add IS_CAVE tag Closes #8885 Add IS_DESERT tag Closes #8979 Simplify Mangrove Swamp tags Closes #8980 --- .../resources/data/forge/tags/worldgen/biome/is_cave.json | 7 +++++++ .../resources/data/forge/tags/worldgen/biome/is_hot.json | 1 + .../data/forge/tags/worldgen/biome/is_underground.json | 4 +--- .../resources/data/forge/tags/worldgen/biome/is_wet.json | 1 + src/main/java/net/minecraftforge/common/Tags.java | 3 ++- .../minecraftforge/common/data/ForgeBiomeTagsProvider.java | 7 ++++--- .../minecraftforge/common/data/ForgeItemTagsProvider.java | 2 +- 7 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 src/generated/resources/data/forge/tags/worldgen/biome/is_cave.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_cave.json b/src/generated/resources/data/forge/tags/worldgen/biome/is_cave.json new file mode 100644 index 0000000000..21a70cfeec --- /dev/null +++ b/src/generated/resources/data/forge/tags/worldgen/biome/is_cave.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:lush_caves", + "minecraft:dripstone_caves", + "minecraft:deep_dark" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_hot.json b/src/generated/resources/data/forge/tags/worldgen/biome/is_hot.json index 6559f017e6..43c55b0c91 100644 --- a/src/generated/resources/data/forge/tags/worldgen/biome/is_hot.json +++ b/src/generated/resources/data/forge/tags/worldgen/biome/is_hot.json @@ -1,5 +1,6 @@ { "values": [ + "minecraft:mangrove_swamp", "#forge:is_hot/overworld", "#forge:is_hot/nether", { diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_underground.json b/src/generated/resources/data/forge/tags/worldgen/biome/is_underground.json index 21a70cfeec..c55f2d526e 100644 --- a/src/generated/resources/data/forge/tags/worldgen/biome/is_underground.json +++ b/src/generated/resources/data/forge/tags/worldgen/biome/is_underground.json @@ -1,7 +1,5 @@ { "values": [ - "minecraft:lush_caves", - "minecraft:dripstone_caves", - "minecraft:deep_dark" + "#forge:is_cave" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_wet.json b/src/generated/resources/data/forge/tags/worldgen/biome/is_wet.json index b355261275..b057580fa9 100644 --- a/src/generated/resources/data/forge/tags/worldgen/biome/is_wet.json +++ b/src/generated/resources/data/forge/tags/worldgen/biome/is_wet.json @@ -1,5 +1,6 @@ { "values": [ + "minecraft:mangrove_swamp", "#forge:is_wet/overworld", { "id": "#forge:is_wet/nether", diff --git a/src/main/java/net/minecraftforge/common/Tags.java b/src/main/java/net/minecraftforge/common/Tags.java index 7557cf0d64..b96668fccb 100644 --- a/src/main/java/net/minecraftforge/common/Tags.java +++ b/src/main/java/net/minecraftforge/common/Tags.java @@ -598,7 +598,7 @@ public class Tags public static final TagKey IS_MODIFIED = tag("is_modified"); public static final TagKey IS_WATER = tag("is_water"); - + public static final TagKey IS_DESERT = tag("is_desert"); public static final TagKey IS_PLAINS = tag("is_plains"); public static final TagKey IS_SWAMP = tag("is_swamp"); public static final TagKey IS_SANDY = tag("is_sandy"); @@ -607,6 +607,7 @@ public class Tags public static final TagKey IS_VOID = tag("is_void"); public static final TagKey IS_UNDERGROUND = tag("is_underground"); + public static final TagKey IS_CAVE = tag("is_cave"); public static final TagKey IS_PEAK = tag("is_peak"); public static final TagKey IS_SLOPE = tag("is_slope"); public static final TagKey IS_MOUNTAIN = tag("is_mountain"); diff --git a/src/main/java/net/minecraftforge/common/data/ForgeBiomeTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeBiomeTagsProvider.java index e0718bb227..5a283635c7 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeBiomeTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeBiomeTagsProvider.java @@ -71,14 +71,14 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider tag(Biomes.WINDSWEPT_SAVANNA, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_DRY_OVERWORLD, Tags.Biomes.IS_SPARSE_OVERWORLD, Tags.Biomes.IS_RARE); tag(Biomes.ERODED_BADLANDS, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_DRY_OVERWORLD, Tags.Biomes.IS_SPARSE_OVERWORLD, Tags.Biomes.IS_RARE); tag(Biomes.BAMBOO_JUNGLE, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_WET_OVERWORLD, Tags.Biomes.IS_RARE); - tag(Biomes.LUSH_CAVES, Tags.Biomes.IS_UNDERGROUND, Tags.Biomes.IS_LUSH, Tags.Biomes.IS_WET_OVERWORLD); - tag(Biomes.DRIPSTONE_CAVES, Tags.Biomes.IS_UNDERGROUND, Tags.Biomes.IS_SPARSE_OVERWORLD); + tag(Biomes.LUSH_CAVES, Tags.Biomes.IS_CAVE, Tags.Biomes.IS_LUSH, Tags.Biomes.IS_WET_OVERWORLD); + tag(Biomes.DRIPSTONE_CAVES, Tags.Biomes.IS_CAVE, Tags.Biomes.IS_SPARSE_OVERWORLD); tag(Biomes.SOUL_SAND_VALLEY, Tags.Biomes.IS_HOT_NETHER, Tags.Biomes.IS_DRY_NETHER); tag(Biomes.CRIMSON_FOREST, Tags.Biomes.IS_HOT_NETHER, Tags.Biomes.IS_DRY_NETHER); tag(Biomes.WARPED_FOREST, Tags.Biomes.IS_HOT_NETHER, Tags.Biomes.IS_DRY_NETHER); tag(Biomes.BASALT_DELTAS, Tags.Biomes.IS_HOT_NETHER, Tags.Biomes.IS_DRY_NETHER); tag(Biomes.MANGROVE_SWAMP, Tags.Biomes.IS_WET, Tags.Biomes.IS_WET_OVERWORLD, Tags.Biomes.IS_HOT, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_SWAMP); - tag(Biomes.DEEP_DARK, Tags.Biomes.IS_UNDERGROUND, Tags.Biomes.IS_RARE, Tags.Biomes.IS_SPOOKY); + tag(Biomes.DEEP_DARK, Tags.Biomes.IS_CAVE, Tags.Biomes.IS_RARE, Tags.Biomes.IS_SPOOKY); tag(Tags.Biomes.IS_HOT).addTag(Tags.Biomes.IS_HOT_OVERWORLD).addTag(Tags.Biomes.IS_HOT_NETHER).addOptionalTag(Tags.Biomes.IS_HOT_END.location()); tag(Tags.Biomes.IS_COLD).addTag(Tags.Biomes.IS_COLD_OVERWORLD).addOptionalTag(Tags.Biomes.IS_COLD_NETHER.location()).addTag(Tags.Biomes.IS_COLD_END); @@ -89,6 +89,7 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider tag(Tags.Biomes.IS_WATER).addTag(BiomeTags.IS_OCEAN).addTag(BiomeTags.IS_RIVER); tag(Tags.Biomes.IS_MOUNTAIN).addTag(Tags.Biomes.IS_PEAK).addTag(Tags.Biomes.IS_SLOPE); + tag(Tags.Biomes.IS_UNDERGROUND).addTag(Tags.Biomes.IS_CAVE); } @SafeVarargs diff --git a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java index 38d629f215..227295fd9b 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java @@ -34,7 +34,7 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider copy(Tags.Blocks.BARRELS, Tags.Items.BARRELS); copy(Tags.Blocks.BARRELS_WOODEN, Tags.Items.BARRELS_WOODEN); tag(Tags.Items.BONES).add(Items.BONE); - tag(Tags.Items.BOOKSHELVES).add(Items.BOOKSHELF); + copy(Tags.Blocks.BOOKSHELVES, Tags.Items.BOOKSHELVES); copy(Tags.Blocks.CHESTS, Tags.Items.CHESTS); copy(Tags.Blocks.CHESTS_ENDER, Tags.Items.CHESTS_ENDER); copy(Tags.Blocks.CHESTS_TRAPPED, Tags.Items.CHESTS_TRAPPED);