From 3cb6741121361a6635b20818ae43ce5aec829380 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 17:21:43 -0400 Subject: [PATCH 01/36] Add more chest tags --- .../convention/datagen/generators/BlockTagGenerator.java | 7 ++++++- .../datagen/generators/EnglishTagLangGenerator.java | 4 ++++ .../convention/datagen/generators/ItemTagGenerator.java | 2 ++ .../api/tag/convention/v2/ConventionalBlockTags.java | 2 ++ .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 3 +++ 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java index e1d31e87b4..40efddce02 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java @@ -95,9 +95,14 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { getOrCreateTagBuilder(ConventionalBlockTags.WOODEN_CHESTS) .add(Blocks.CHEST) .add(Blocks.TRAPPED_CHEST); + getOrCreateTagBuilder(ConventionalBlockTags.TRAPPED_CHESTS) + .add(Blocks.TRAPPED_CHEST); + getOrCreateTagBuilder(ConventionalBlockTags.ENDER_CHESTS) + .add(Blocks.ENDER_CHEST); getOrCreateTagBuilder(ConventionalBlockTags.CHESTS) .addTag(ConventionalBlockTags.WOODEN_CHESTS) - .add(Blocks.ENDER_CHEST); + .addTag(ConventionalBlockTags.TRAPPED_CHESTS) + .addTag(ConventionalBlockTags.ENDER_CHESTS); getOrCreateTagBuilder(ConventionalBlockTags.BOOKSHELVES) .add(Blocks.BOOKSHELF); generateGlassTags(); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index a93520876c..9171176e49 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -51,6 +51,8 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalBlockTags.BOOKSHELVES, "Bookshelves"); translationBuilder.add(ConventionalBlockTags.CHESTS, "Chests"); translationBuilder.add(ConventionalBlockTags.WOODEN_CHESTS, "Wooden Chests"); + translationBuilder.add(ConventionalBlockTags.TRAPPED_CHESTS, "Trapped Chests"); + translationBuilder.add(ConventionalBlockTags.ENDER_CHESTS, "Ender Chests"); translationBuilder.add(ConventionalBlockTags.GLASS_BLOCKS, "Glass Blocks"); translationBuilder.add(ConventionalBlockTags.GLASS_BLOCKS_TINTED, "Tinted Glass Blocks"); translationBuilder.add(ConventionalBlockTags.GLASS_BLOCKS_CHEAP, "Cheap Glass Blocks"); @@ -221,6 +223,8 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.BOOKSHELVES, "Bookshelves"); translationBuilder.add(ConventionalItemTags.CHESTS, "Chests"); translationBuilder.add(ConventionalItemTags.WOODEN_CHESTS, "Wooden Chests"); + translationBuilder.add(ConventionalItemTags.TRAPPED_CHESTS, "Trapped Chests"); + translationBuilder.add(ConventionalItemTags.ENDER_CHESTS, "Ender Chests"); translationBuilder.add(ConventionalItemTags.GLASS_BLOCKS, "Glass Blocks"); translationBuilder.add(ConventionalItemTags.GLASS_BLOCKS_TINTED, "Tinted Glass Blocks"); translationBuilder.add(ConventionalItemTags.GLASS_BLOCKS_CHEAP, "Cheap Glass Blocks"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index 111a0bf2ae..9f6e67e632 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -62,6 +62,8 @@ private void copyItemTags() { copy(ConventionalBlockTags.BOOKSHELVES, ConventionalItemTags.BOOKSHELVES); copy(ConventionalBlockTags.CHESTS, ConventionalItemTags.CHESTS); copy(ConventionalBlockTags.WOODEN_CHESTS, ConventionalItemTags.WOODEN_CHESTS); + copy(ConventionalBlockTags.TRAPPED_CHESTS, ConventionalItemTags.TRAPPED_CHESTS); + copy(ConventionalBlockTags.ENDER_CHESTS, ConventionalItemTags.ENDER_CHESTS); copy(ConventionalBlockTags.GLASS_BLOCKS, ConventionalItemTags.GLASS_BLOCKS); copy(ConventionalBlockTags.GLASS_BLOCKS_COLORLESS, ConventionalItemTags.GLASS_BLOCKS_COLORLESS); copy(ConventionalBlockTags.GLASS_BLOCKS_TINTED, ConventionalItemTags.GLASS_BLOCKS_TINTED); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java index 27c4740113..6aafca7ed7 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java @@ -55,6 +55,8 @@ private ConventionalBlockTags() { public static final TagKey BOOKSHELVES = register("bookshelves"); public static final TagKey CHESTS = register("chests"); public static final TagKey WOODEN_CHESTS = register("chests/wooden"); + public static final TagKey TRAPPED_CHESTS = register("chests/trapped"); + public static final TagKey ENDER_CHESTS = register("chests/ender"); public static final TagKey GLASS_BLOCKS = register("glass_blocks"); public static final TagKey GLASS_BLOCKS_COLORLESS = register("glass_blocks/colorless"); /** diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index d6b8a90ae8..7a87fce7fe 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -16,6 +16,7 @@ package net.fabricmc.fabric.api.tag.convention.v2; +import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.registry.tag.BlockTags; import net.minecraft.registry.tag.ItemTags; @@ -205,6 +206,8 @@ private ConventionalItemTags() { public static final TagKey BOOKSHELVES = register("bookshelves"); public static final TagKey CHESTS = register("chests"); public static final TagKey WOODEN_CHESTS = register("chests/wooden"); + public static final TagKey TRAPPED_CHESTS = register("chests/trapped"); + public static final TagKey ENDER_CHESTS = register("chests/ender"); public static final TagKey GLASS_BLOCKS = register("glass_blocks"); public static final TagKey GLASS_BLOCKS_COLORLESS = register("glass_blocks/colorless"); /** From d85d74fd44b9e4c036d5c2bc29f5bac1d1b604b0 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 17:22:06 -0400 Subject: [PATCH 02/36] adjust temperate biome tag --- .../datagen/generators/BiomeTagGenerator.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java index b6c7b311f6..b12a951e13 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java @@ -170,21 +170,23 @@ private void generateClimateAndVegetationTags() { .addTag(ConventionalBiomeTags.IS_COLD_OVERWORLD); getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD) - .add(BiomeKeys.FOREST) + .add(BiomeKeys.PLAINS) .add(BiomeKeys.SUNFLOWER_PLAINS) - .add(BiomeKeys.SWAMP) - .add(BiomeKeys.STONY_SHORE) - .add(BiomeKeys.DARK_FOREST) - .add(BiomeKeys.WINDSWEPT_FOREST) + .add(BiomeKeys.FOREST) + .add(BiomeKeys.FLOWER_FOREST) .add(BiomeKeys.BIRCH_FOREST) .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST) + .add(BiomeKeys.DARK_FOREST) + .add(BiomeKeys.CHERRY_GROVE) .add(BiomeKeys.MEADOW) - .add(BiomeKeys.PLAINS); + .add(BiomeKeys.SWAMP) + .add(BiomeKeys.BEACH) + .add(BiomeKeys.OCEAN) + .add(BiomeKeys.DEEP_OCEAN); getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE) .addTag(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD); getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT_OVERWORLD) - .add(BiomeKeys.SWAMP) .add(BiomeKeys.MANGROVE_SWAMP) .add(BiomeKeys.JUNGLE) .add(BiomeKeys.BAMBOO_JUNGLE) From 9485c0519347523c175133eaa891e0fd76c85bb4 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 17:32:44 -0400 Subject: [PATCH 03/36] More Cobblestone tags --- .../datagen/generators/BlockTagGenerator.java | 16 ++++++++++++---- .../generators/EnglishTagLangGenerator.java | 8 ++++++++ .../datagen/generators/ItemTagGenerator.java | 4 ++++ .../tag/convention/v2/ConventionalBlockTags.java | 4 ++++ .../tag/convention/v2/ConventionalItemTags.java | 4 ++++ 5 files changed, 32 insertions(+), 4 deletions(-) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java index 40efddce02..a9df816dd3 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java @@ -63,11 +63,19 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { .add(Blocks.GRANITE) .add(Blocks.TUFF) .add(Blocks.DEEPSLATE); - getOrCreateTagBuilder(ConventionalBlockTags.COBBLESTONES) - .add(Blocks.COBBLESTONE) - .add(Blocks.MOSSY_COBBLESTONE) - .add(Blocks.COBBLED_DEEPSLATE) + getOrCreateTagBuilder(ConventionalBlockTags.NORMAL_COBBLESTONES) + .add(Blocks.COBBLESTONE); + getOrCreateTagBuilder(ConventionalBlockTags.MOSSY_COBBLESTONES) + .add(Blocks.MOSSY_COBBLESTONE); + getOrCreateTagBuilder(ConventionalBlockTags.INFESTED_COBBLESTONES) .add(Blocks.INFESTED_COBBLESTONE); + getOrCreateTagBuilder(ConventionalBlockTags.DEEPSLATE_COBBLESTONES) + .add(Blocks.COBBLED_DEEPSLATE); + getOrCreateTagBuilder(ConventionalBlockTags.COBBLESTONES) + .addOptionalTag(ConventionalBlockTags.NORMAL_COBBLESTONES) + .addOptionalTag(ConventionalBlockTags.MOSSY_COBBLESTONES) + .addOptionalTag(ConventionalBlockTags.INFESTED_COBBLESTONES) + .addOptionalTag(ConventionalBlockTags.DEEPSLATE_COBBLESTONES); getOrCreateTagBuilder(ConventionalBlockTags.NORMAL_OBSIDIANS) .add(Blocks.OBSIDIAN); getOrCreateTagBuilder(ConventionalBlockTags.CRYING_OBSIDIANS) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 9171176e49..0faa78f94c 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -40,6 +40,10 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T // Blocks translationBuilder.add(ConventionalBlockTags.STONES, "Stones"); translationBuilder.add(ConventionalBlockTags.COBBLESTONES, "Cobblestones"); + translationBuilder.add(ConventionalBlockTags.NORMAL_COBBLESTONES, "Normal Cobblestones"); + translationBuilder.add(ConventionalBlockTags.MOSSY_COBBLESTONES, "Mossy Cobblestones"); + translationBuilder.add(ConventionalBlockTags.INFESTED_COBBLESTONES, "Infested Cobblestones"); + translationBuilder.add(ConventionalBlockTags.DEEPSLATE_COBBLESTONES, "Deepslate Cobblestones"); translationBuilder.add(ConventionalBlockTags.OBSIDIANS, "Obsidians"); translationBuilder.add(ConventionalBlockTags.NORMAL_OBSIDIANS, "Normal Obsidians"); translationBuilder.add(ConventionalBlockTags.CRYING_OBSIDIANS, "Crying Obsidians"); @@ -122,6 +126,10 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T // Items translationBuilder.add(ConventionalItemTags.STONES, "Stones"); translationBuilder.add(ConventionalItemTags.COBBLESTONES, "Cobblestones"); + translationBuilder.add(ConventionalItemTags.NORMAL_COBBLESTONES, "Normal Cobblestones"); + translationBuilder.add(ConventionalItemTags.MOSSY_COBBLESTONES, "Mossy Cobblestones"); + translationBuilder.add(ConventionalItemTags.INFESTED_COBBLESTONES, "Infested Cobblestones"); + translationBuilder.add(ConventionalItemTags.DEEPSLATE_COBBLESTONES, "Deepslate Cobblestones"); translationBuilder.add(ConventionalItemTags.OBSIDIANS, "Obsidians"); translationBuilder.add(ConventionalItemTags.NORMAL_OBSIDIANS, "Normal Obsidians"); translationBuilder.add(ConventionalItemTags.CRYING_OBSIDIANS, "Crying Obsidians"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index 9f6e67e632..f83a33e00e 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -54,6 +54,10 @@ protected void configure(RegistryWrapper.WrapperLookup arg) { private void copyItemTags() { copy(ConventionalBlockTags.STONES, ConventionalItemTags.STONES); copy(ConventionalBlockTags.COBBLESTONES, ConventionalItemTags.COBBLESTONES); + copy(ConventionalBlockTags.NORMAL_COBBLESTONES, ConventionalItemTags.NORMAL_COBBLESTONES); + copy(ConventionalBlockTags.MOSSY_COBBLESTONES, ConventionalItemTags.MOSSY_COBBLESTONES); + copy(ConventionalBlockTags.INFESTED_COBBLESTONES, ConventionalItemTags.INFESTED_COBBLESTONES); + copy(ConventionalBlockTags.DEEPSLATE_COBBLESTONES, ConventionalItemTags.DEEPSLATE_COBBLESTONES); copy(ConventionalBlockTags.OBSIDIANS, ConventionalItemTags.OBSIDIANS); copy(ConventionalBlockTags.NORMAL_OBSIDIANS, ConventionalItemTags.NORMAL_OBSIDIANS); copy(ConventionalBlockTags.CRYING_OBSIDIANS, ConventionalItemTags.CRYING_OBSIDIANS); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java index 6aafca7ed7..8a4cb766bd 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java @@ -35,6 +35,10 @@ private ConventionalBlockTags() { */ public static final TagKey STONES = register("stones"); public static final TagKey COBBLESTONES = register("cobblestones"); + public static final TagKey DEEPSLATE_COBBLESTONES = register("cobblestones/deepslate"); + public static final TagKey INFESTED_COBBLESTONES = register("cobblestones/infested"); + public static final TagKey MOSSY_COBBLESTONES = register("cobblestones/mossy"); + public static final TagKey NORMAL_COBBLESTONES = register("cobblestones/normal"); public static final TagKey OBSIDIANS = register("obsidians"); /** * For common obsidian that has no special quirks or behaviors. Ideal for recipe use. diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index 7a87fce7fe..1de77cf7c6 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -37,6 +37,10 @@ private ConventionalItemTags() { */ public static final TagKey STONES = register("stones"); public static final TagKey COBBLESTONES = register("cobblestones"); + public static final TagKey DEEPSLATE_COBBLESTONES = register("cobblestones/deepslate"); + public static final TagKey INFESTED_COBBLESTONES = register("cobblestones/infested"); + public static final TagKey MOSSY_COBBLESTONES = register("cobblestones/mossy"); + public static final TagKey NORMAL_COBBLESTONES = register("cobblestones/normal"); public static final TagKey OBSIDIANS = register("obsidians"); /** * For common obsidian that has no special quirks or behaviors. Ideal for recipe use. From 87cd331f7ea086fc04ae809f72faf3aa645e89ee Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 17:35:01 -0400 Subject: [PATCH 04/36] end stones tag --- .../tag/convention/datagen/generators/BlockTagGenerator.java | 2 ++ .../convention/datagen/generators/EnglishTagLangGenerator.java | 2 ++ .../tag/convention/datagen/generators/ItemTagGenerator.java | 1 + .../fabric/api/tag/convention/v2/ConventionalBlockTags.java | 1 + .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 1 + 5 files changed, 7 insertions(+) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java index a9df816dd3..740e8280ac 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java @@ -76,6 +76,8 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { .addOptionalTag(ConventionalBlockTags.MOSSY_COBBLESTONES) .addOptionalTag(ConventionalBlockTags.INFESTED_COBBLESTONES) .addOptionalTag(ConventionalBlockTags.DEEPSLATE_COBBLESTONES); + getOrCreateTagBuilder(ConventionalBlockTags.END_STONES) + .add(Blocks.END_STONE); getOrCreateTagBuilder(ConventionalBlockTags.NORMAL_OBSIDIANS) .add(Blocks.OBSIDIAN); getOrCreateTagBuilder(ConventionalBlockTags.CRYING_OBSIDIANS) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 0faa78f94c..668a7be1b5 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -44,6 +44,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalBlockTags.MOSSY_COBBLESTONES, "Mossy Cobblestones"); translationBuilder.add(ConventionalBlockTags.INFESTED_COBBLESTONES, "Infested Cobblestones"); translationBuilder.add(ConventionalBlockTags.DEEPSLATE_COBBLESTONES, "Deepslate Cobblestones"); + translationBuilder.add(ConventionalBlockTags.END_STONES, "End Stones"); translationBuilder.add(ConventionalBlockTags.OBSIDIANS, "Obsidians"); translationBuilder.add(ConventionalBlockTags.NORMAL_OBSIDIANS, "Normal Obsidians"); translationBuilder.add(ConventionalBlockTags.CRYING_OBSIDIANS, "Crying Obsidians"); @@ -130,6 +131,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.MOSSY_COBBLESTONES, "Mossy Cobblestones"); translationBuilder.add(ConventionalItemTags.INFESTED_COBBLESTONES, "Infested Cobblestones"); translationBuilder.add(ConventionalItemTags.DEEPSLATE_COBBLESTONES, "Deepslate Cobblestones"); + translationBuilder.add(ConventionalItemTags.END_STONES, "End Stones"); translationBuilder.add(ConventionalItemTags.OBSIDIANS, "Obsidians"); translationBuilder.add(ConventionalItemTags.NORMAL_OBSIDIANS, "Normal Obsidians"); translationBuilder.add(ConventionalItemTags.CRYING_OBSIDIANS, "Crying Obsidians"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index f83a33e00e..4cf6412868 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -58,6 +58,7 @@ private void copyItemTags() { copy(ConventionalBlockTags.MOSSY_COBBLESTONES, ConventionalItemTags.MOSSY_COBBLESTONES); copy(ConventionalBlockTags.INFESTED_COBBLESTONES, ConventionalItemTags.INFESTED_COBBLESTONES); copy(ConventionalBlockTags.DEEPSLATE_COBBLESTONES, ConventionalItemTags.DEEPSLATE_COBBLESTONES); + copy(ConventionalBlockTags.END_STONES, ConventionalItemTags.END_STONES); copy(ConventionalBlockTags.OBSIDIANS, ConventionalItemTags.OBSIDIANS); copy(ConventionalBlockTags.NORMAL_OBSIDIANS, ConventionalItemTags.NORMAL_OBSIDIANS); copy(ConventionalBlockTags.CRYING_OBSIDIANS, ConventionalItemTags.CRYING_OBSIDIANS); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java index 8a4cb766bd..8828f8082d 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java @@ -39,6 +39,7 @@ private ConventionalBlockTags() { public static final TagKey INFESTED_COBBLESTONES = register("cobblestones/infested"); public static final TagKey MOSSY_COBBLESTONES = register("cobblestones/mossy"); public static final TagKey NORMAL_COBBLESTONES = register("cobblestones/normal"); + public static final TagKey END_STONES = register("end_stones"); public static final TagKey OBSIDIANS = register("obsidians"); /** * For common obsidian that has no special quirks or behaviors. Ideal for recipe use. diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index 1de77cf7c6..65fc9f612c 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -41,6 +41,7 @@ private ConventionalItemTags() { public static final TagKey INFESTED_COBBLESTONES = register("cobblestones/infested"); public static final TagKey MOSSY_COBBLESTONES = register("cobblestones/mossy"); public static final TagKey NORMAL_COBBLESTONES = register("cobblestones/normal"); + public static final TagKey END_STONES = register("end_stones"); public static final TagKey OBSIDIANS = register("obsidians"); /** * For common obsidian that has no special quirks or behaviors. Ideal for recipe use. From 6f58e1779763fbc0f98604d384bf26411dec7340 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 17:43:53 -0400 Subject: [PATCH 05/36] Gravels tag --- .../tag/convention/datagen/generators/BlockTagGenerator.java | 2 ++ .../convention/datagen/generators/EnglishTagLangGenerator.java | 2 ++ .../tag/convention/datagen/generators/ItemTagGenerator.java | 1 + .../fabric/api/tag/convention/v2/ConventionalBlockTags.java | 1 + .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 1 + 5 files changed, 7 insertions(+) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java index 740e8280ac..8160fd0b1f 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java @@ -78,6 +78,8 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { .addOptionalTag(ConventionalBlockTags.DEEPSLATE_COBBLESTONES); getOrCreateTagBuilder(ConventionalBlockTags.END_STONES) .add(Blocks.END_STONE); + getOrCreateTagBuilder(ConventionalBlockTags.GRAVELS) + .add(Blocks.GRAVEL); getOrCreateTagBuilder(ConventionalBlockTags.NORMAL_OBSIDIANS) .add(Blocks.OBSIDIAN); getOrCreateTagBuilder(ConventionalBlockTags.CRYING_OBSIDIANS) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 668a7be1b5..e30c302e52 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -45,6 +45,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalBlockTags.INFESTED_COBBLESTONES, "Infested Cobblestones"); translationBuilder.add(ConventionalBlockTags.DEEPSLATE_COBBLESTONES, "Deepslate Cobblestones"); translationBuilder.add(ConventionalBlockTags.END_STONES, "End Stones"); + translationBuilder.add(ConventionalBlockTags.GRAVELS, "Gravels"); translationBuilder.add(ConventionalBlockTags.OBSIDIANS, "Obsidians"); translationBuilder.add(ConventionalBlockTags.NORMAL_OBSIDIANS, "Normal Obsidians"); translationBuilder.add(ConventionalBlockTags.CRYING_OBSIDIANS, "Crying Obsidians"); @@ -132,6 +133,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.INFESTED_COBBLESTONES, "Infested Cobblestones"); translationBuilder.add(ConventionalItemTags.DEEPSLATE_COBBLESTONES, "Deepslate Cobblestones"); translationBuilder.add(ConventionalItemTags.END_STONES, "End Stones"); + translationBuilder.add(ConventionalItemTags.GRAVELS, "Gravels"); translationBuilder.add(ConventionalItemTags.OBSIDIANS, "Obsidians"); translationBuilder.add(ConventionalItemTags.NORMAL_OBSIDIANS, "Normal Obsidians"); translationBuilder.add(ConventionalItemTags.CRYING_OBSIDIANS, "Crying Obsidians"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index 4cf6412868..afdfffa3c5 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -59,6 +59,7 @@ private void copyItemTags() { copy(ConventionalBlockTags.INFESTED_COBBLESTONES, ConventionalItemTags.INFESTED_COBBLESTONES); copy(ConventionalBlockTags.DEEPSLATE_COBBLESTONES, ConventionalItemTags.DEEPSLATE_COBBLESTONES); copy(ConventionalBlockTags.END_STONES, ConventionalItemTags.END_STONES); + copy(ConventionalBlockTags.GRAVELS, ConventionalItemTags.GRAVELS); copy(ConventionalBlockTags.OBSIDIANS, ConventionalItemTags.OBSIDIANS); copy(ConventionalBlockTags.NORMAL_OBSIDIANS, ConventionalItemTags.NORMAL_OBSIDIANS); copy(ConventionalBlockTags.CRYING_OBSIDIANS, ConventionalItemTags.CRYING_OBSIDIANS); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java index 8828f8082d..7d7e7fe764 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java @@ -40,6 +40,7 @@ private ConventionalBlockTags() { public static final TagKey MOSSY_COBBLESTONES = register("cobblestones/mossy"); public static final TagKey NORMAL_COBBLESTONES = register("cobblestones/normal"); public static final TagKey END_STONES = register("end_stones"); + public static final TagKey GRAVELS = register("gravels"); public static final TagKey OBSIDIANS = register("obsidians"); /** * For common obsidian that has no special quirks or behaviors. Ideal for recipe use. diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index 65fc9f612c..210b4798c7 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -42,6 +42,7 @@ private ConventionalItemTags() { public static final TagKey MOSSY_COBBLESTONES = register("cobblestones/mossy"); public static final TagKey NORMAL_COBBLESTONES = register("cobblestones/normal"); public static final TagKey END_STONES = register("end_stones"); + public static final TagKey GRAVELS = register("gravels"); public static final TagKey OBSIDIANS = register("obsidians"); /** * For common obsidian that has no special quirks or behaviors. Ideal for recipe use. From 832dc06e80e98ee7e5e92b5f46f61b8ca47e66c1 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 17:46:19 -0400 Subject: [PATCH 06/36] Netherracks tag --- .../tag/convention/datagen/generators/BlockTagGenerator.java | 2 ++ .../convention/datagen/generators/EnglishTagLangGenerator.java | 2 ++ .../tag/convention/datagen/generators/ItemTagGenerator.java | 1 + .../fabric/api/tag/convention/v2/ConventionalBlockTags.java | 1 + .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 1 + 5 files changed, 7 insertions(+) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java index 8160fd0b1f..e415f3c1ab 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java @@ -76,6 +76,8 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { .addOptionalTag(ConventionalBlockTags.MOSSY_COBBLESTONES) .addOptionalTag(ConventionalBlockTags.INFESTED_COBBLESTONES) .addOptionalTag(ConventionalBlockTags.DEEPSLATE_COBBLESTONES); + getOrCreateTagBuilder(ConventionalBlockTags.NETHERRACKS) + .add(Blocks.NETHERRACK); getOrCreateTagBuilder(ConventionalBlockTags.END_STONES) .add(Blocks.END_STONE); getOrCreateTagBuilder(ConventionalBlockTags.GRAVELS) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index e30c302e52..54fd95325c 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -44,6 +44,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalBlockTags.MOSSY_COBBLESTONES, "Mossy Cobblestones"); translationBuilder.add(ConventionalBlockTags.INFESTED_COBBLESTONES, "Infested Cobblestones"); translationBuilder.add(ConventionalBlockTags.DEEPSLATE_COBBLESTONES, "Deepslate Cobblestones"); + translationBuilder.add(ConventionalBlockTags.NETHERRACKS, "Netherracks"); translationBuilder.add(ConventionalBlockTags.END_STONES, "End Stones"); translationBuilder.add(ConventionalBlockTags.GRAVELS, "Gravels"); translationBuilder.add(ConventionalBlockTags.OBSIDIANS, "Obsidians"); @@ -132,6 +133,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.MOSSY_COBBLESTONES, "Mossy Cobblestones"); translationBuilder.add(ConventionalItemTags.INFESTED_COBBLESTONES, "Infested Cobblestones"); translationBuilder.add(ConventionalItemTags.DEEPSLATE_COBBLESTONES, "Deepslate Cobblestones"); + translationBuilder.add(ConventionalItemTags.NETHERRACKS, "Netherracks"); translationBuilder.add(ConventionalItemTags.END_STONES, "End Stones"); translationBuilder.add(ConventionalItemTags.GRAVELS, "Gravels"); translationBuilder.add(ConventionalItemTags.OBSIDIANS, "Obsidians"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index afdfffa3c5..afffdb8ebb 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -58,6 +58,7 @@ private void copyItemTags() { copy(ConventionalBlockTags.MOSSY_COBBLESTONES, ConventionalItemTags.MOSSY_COBBLESTONES); copy(ConventionalBlockTags.INFESTED_COBBLESTONES, ConventionalItemTags.INFESTED_COBBLESTONES); copy(ConventionalBlockTags.DEEPSLATE_COBBLESTONES, ConventionalItemTags.DEEPSLATE_COBBLESTONES); + copy(ConventionalBlockTags.NETHERRACKS, ConventionalItemTags.NETHERRACKS); copy(ConventionalBlockTags.END_STONES, ConventionalItemTags.END_STONES); copy(ConventionalBlockTags.GRAVELS, ConventionalItemTags.GRAVELS); copy(ConventionalBlockTags.OBSIDIANS, ConventionalItemTags.OBSIDIANS); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java index 7d7e7fe764..019d54d0fb 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java @@ -39,6 +39,7 @@ private ConventionalBlockTags() { public static final TagKey INFESTED_COBBLESTONES = register("cobblestones/infested"); public static final TagKey MOSSY_COBBLESTONES = register("cobblestones/mossy"); public static final TagKey NORMAL_COBBLESTONES = register("cobblestones/normal"); + public static final TagKey NETHERRACKS = register("netherracks"); public static final TagKey END_STONES = register("end_stones"); public static final TagKey GRAVELS = register("gravels"); public static final TagKey OBSIDIANS = register("obsidians"); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index 210b4798c7..8cffcc2299 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -41,6 +41,7 @@ private ConventionalItemTags() { public static final TagKey INFESTED_COBBLESTONES = register("cobblestones/infested"); public static final TagKey MOSSY_COBBLESTONES = register("cobblestones/mossy"); public static final TagKey NORMAL_COBBLESTONES = register("cobblestones/normal"); + public static final TagKey NETHERRACKS = register("netherracks"); public static final TagKey END_STONES = register("end_stones"); public static final TagKey GRAVELS = register("gravels"); public static final TagKey OBSIDIANS = register("obsidians"); From 07b096d9926e194618f86bf68bb048d36901faa3 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 18:00:41 -0400 Subject: [PATCH 07/36] Add all ores tags for consistency --- .../datagen/generators/BlockTagGenerator.java | 36 +++++++++++++------ .../generators/EnglishTagLangGenerator.java | 18 +++++++++- .../datagen/generators/ItemTagGenerator.java | 17 +++++---- .../convention/v2/ConventionalBlockTags.java | 12 +++++-- .../convention/v2/ConventionalItemTags.java | 10 +++++- 5 files changed, 72 insertions(+), 21 deletions(-) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java index e415f3c1ab..3d69871479 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java @@ -90,20 +90,36 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { .addOptionalTag(ConventionalBlockTags.NORMAL_OBSIDIANS) .addOptionalTag(ConventionalBlockTags.CRYING_OBSIDIANS); - getOrCreateTagBuilder(ConventionalBlockTags.QUARTZ_ORES) - .add(Blocks.NETHER_QUARTZ_ORE); + getOrCreateTagBuilder(ConventionalBlockTags.COAL_ORES) + .addOptionalTag(BlockTags.COAL_ORES); + getOrCreateTagBuilder(ConventionalBlockTags.COPPER_ORES) + .addOptionalTag(BlockTags.COPPER_ORES); + getOrCreateTagBuilder(ConventionalBlockTags.DIAMOND_ORES) + .addOptionalTag(BlockTags.DIAMOND_ORES); + getOrCreateTagBuilder(ConventionalBlockTags.EMERALD_ORES) + .addOptionalTag(BlockTags.EMERALD_ORES); + getOrCreateTagBuilder(ConventionalBlockTags.GOLD_ORES) + .addOptionalTag(BlockTags.GOLD_ORES); + getOrCreateTagBuilder(ConventionalBlockTags.IRON_ORES) + .addOptionalTag(BlockTags.IRON_ORES); + getOrCreateTagBuilder(ConventionalBlockTags.LAPIS_ORES) + .addOptionalTag(BlockTags.LAPIS_ORES); getOrCreateTagBuilder(ConventionalBlockTags.NETHERITE_SCRAP_ORES) .add(Blocks.ANCIENT_DEBRIS); + getOrCreateTagBuilder(ConventionalBlockTags.REDSTONE_ORES) + .addOptionalTag(BlockTags.REDSTONE_ORES); + getOrCreateTagBuilder(ConventionalBlockTags.QUARTZ_ORES) + .add(Blocks.NETHER_QUARTZ_ORE); getOrCreateTagBuilder(ConventionalBlockTags.ORES) - .addOptionalTag(BlockTags.COAL_ORES) - .addOptionalTag(BlockTags.COPPER_ORES) - .addOptionalTag(BlockTags.DIAMOND_ORES) - .addOptionalTag(BlockTags.EMERALD_ORES) - .addOptionalTag(BlockTags.GOLD_ORES) - .addOptionalTag(BlockTags.IRON_ORES) - .addOptionalTag(BlockTags.LAPIS_ORES) + .addOptionalTag(ConventionalBlockTags.COAL_ORES) + .addOptionalTag(ConventionalBlockTags.COPPER_ORES) + .addOptionalTag(ConventionalBlockTags.DIAMOND_ORES) + .addOptionalTag(ConventionalBlockTags.EMERALD_ORES) + .addOptionalTag(ConventionalBlockTags.GOLD_ORES) + .addOptionalTag(ConventionalBlockTags.IRON_ORES) + .addOptionalTag(ConventionalBlockTags.LAPIS_ORES) .addOptionalTag(ConventionalBlockTags.NETHERITE_SCRAP_ORES) - .addOptionalTag(BlockTags.REDSTONE_ORES) + .addOptionalTag(ConventionalBlockTags.REDSTONE_ORES) .addOptionalTag(ConventionalBlockTags.QUARTZ_ORES); getOrCreateTagBuilder(ConventionalBlockTags.WOODEN_CHESTS) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 54fd95325c..6760807554 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -51,8 +51,16 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalBlockTags.NORMAL_OBSIDIANS, "Normal Obsidians"); translationBuilder.add(ConventionalBlockTags.CRYING_OBSIDIANS, "Crying Obsidians"); translationBuilder.add(ConventionalBlockTags.ORES, "Ores"); - translationBuilder.add(ConventionalBlockTags.QUARTZ_ORES, "Quartz Ores"); + translationBuilder.add(ConventionalBlockTags.COAL_ORES, "Coal Ores"); + translationBuilder.add(ConventionalBlockTags.COPPER_ORES, "Copper Ores"); + translationBuilder.add(ConventionalBlockTags.DIAMOND_ORES, "Diamond Ores"); + translationBuilder.add(ConventionalBlockTags.EMERALD_ORES, "Emerald Ores"); + translationBuilder.add(ConventionalBlockTags.GOLD_ORES, "Gold Ores"); + translationBuilder.add(ConventionalBlockTags.IRON_ORES, "Iron Ores"); + translationBuilder.add(ConventionalBlockTags.LAPIS_ORES, "Lapis Ores"); translationBuilder.add(ConventionalBlockTags.NETHERITE_SCRAP_ORES, "Netherite Scrap Ores"); + translationBuilder.add(ConventionalBlockTags.REDSTONE_ORES, "Redstone Ores"); + translationBuilder.add(ConventionalBlockTags.QUARTZ_ORES, "Quartz Ores"); translationBuilder.add(ConventionalBlockTags.BARRELS, "Barrels"); translationBuilder.add(ConventionalBlockTags.WOODEN_BARRELS, "Wooden Barrels"); translationBuilder.add(ConventionalBlockTags.BOOKSHELVES, "Bookshelves"); @@ -184,7 +192,15 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.GOLD_INGOTS, "Gold Ingots"); translationBuilder.add(ConventionalItemTags.COPPER_INGOTS, "Copper Ingots"); translationBuilder.add(ConventionalItemTags.NETHERITE_INGOTS, "Netherite Ingots"); + translationBuilder.add(ConventionalItemTags.COAL_ORES, "Coal Ores"); + translationBuilder.add(ConventionalItemTags.COPPER_ORES, "Copper Ores"); + translationBuilder.add(ConventionalItemTags.DIAMOND_ORES, "Diamond Ores"); + translationBuilder.add(ConventionalItemTags.EMERALD_ORES, "Emerald Ores"); + translationBuilder.add(ConventionalItemTags.GOLD_ORES, "Gold Ores"); + translationBuilder.add(ConventionalItemTags.IRON_ORES, "Iron Ores"); + translationBuilder.add(ConventionalItemTags.LAPIS_ORES, "Lapis Ores"); translationBuilder.add(ConventionalItemTags.NETHERITE_SCRAP_ORES, "Netherite Scrap Ores"); + translationBuilder.add(ConventionalItemTags.REDSTONE_ORES, "Redstone Ores"); translationBuilder.add(ConventionalItemTags.QUARTZ_ORES, "Quartz Ores"); translationBuilder.add(ConventionalItemTags.QUARTZ_GEMS, "Quartz Gems"); translationBuilder.add(ConventionalItemTags.LAPIS_GEMS, "Lapis Gems"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index afffdb8ebb..34519fa529 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -462,9 +462,6 @@ private void generateOreAndRelatedTags() { .addOptionalTag(ConventionalItemTags.IRON_NUGGETS) .addOptionalTag(ConventionalItemTags.GOLD_NUGGETS); copy(ConventionalBlockTags.ORES, ConventionalItemTags.ORES); - getOrCreateTagBuilder(ConventionalItemTags.ORES) - .addOptionalTag(ConventionalItemTags.NETHERITE_SCRAP_ORES) - .addOptionalTag(ConventionalItemTags.QUARTZ_ORES); getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS) .addOptionalTag(ConventionalItemTags.COPPER_RAW_MATERIALS) .addOptionalTag(ConventionalItemTags.GOLD_RAW_MATERIALS) @@ -515,10 +512,16 @@ private void generateOreAndRelatedTags() { getOrCreateTagBuilder(ConventionalItemTags.COAL) .addOptionalTag(ItemTags.COALS); - getOrCreateTagBuilder(ConventionalItemTags.QUARTZ_ORES) - .add(Items.NETHER_QUARTZ_ORE); - getOrCreateTagBuilder(ConventionalItemTags.NETHERITE_SCRAP_ORES) - .add(Items.ANCIENT_DEBRIS); + copy(ConventionalBlockTags.COAL_ORES, ConventionalItemTags.COAL_ORES); + copy(ConventionalBlockTags.COPPER_ORES, ConventionalItemTags.COPPER_ORES); + copy(ConventionalBlockTags.DIAMOND_ORES, ConventionalItemTags.DIAMOND_ORES); + copy(ConventionalBlockTags.EMERALD_ORES, ConventionalItemTags.EMERALD_ORES); + copy(ConventionalBlockTags.GOLD_ORES, ConventionalItemTags.GOLD_ORES); + copy(ConventionalBlockTags.IRON_ORES, ConventionalItemTags.IRON_ORES); + copy(ConventionalBlockTags.LAPIS_ORES, ConventionalItemTags.LAPIS_ORES); + copy(ConventionalBlockTags.NETHERITE_SCRAP_ORES, ConventionalItemTags.NETHERITE_SCRAP_ORES); + copy(ConventionalBlockTags.REDSTONE_ORES, ConventionalItemTags.REDSTONE_ORES); + copy(ConventionalBlockTags.QUARTZ_ORES, ConventionalItemTags.QUARTZ_ORES); getOrCreateTagBuilder(ConventionalItemTags.QUARTZ_GEMS) .add(Items.QUARTZ); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java index 019d54d0fb..7a1f207a6a 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java @@ -53,9 +53,17 @@ private ConventionalBlockTags() { // Ores - broad categories public static final TagKey ORES = register("ores"); - // Ores - vanilla instances - public static final TagKey QUARTZ_ORES = register("ores/quartz"); + // Ores - vanilla instances (All ores consolidated here for consistency) + public static final TagKey COAL_ORES = register("ores/coal"); + public static final TagKey COPPER_ORES = register("ores/copper"); + public static final TagKey DIAMOND_ORES = register("ores/diamond"); + public static final TagKey EMERALD_ORES = register("ores/emerald"); + public static final TagKey GOLD_ORES = register("ores/gold"); + public static final TagKey IRON_ORES = register("ores/iron"); + public static final TagKey LAPIS_ORES = register("ores/lapis"); public static final TagKey NETHERITE_SCRAP_ORES = register("ores/netherite_scrap"); + public static final TagKey QUARTZ_ORES = register("ores/quartz"); + public static final TagKey REDSTONE_ORES = register("ores/redstone"); public static final TagKey BARRELS = register("barrels"); public static final TagKey WOODEN_BARRELS = register("barrels/wooden"); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index 8cffcc2299..a8b963d335 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -125,9 +125,17 @@ private ConventionalItemTags() { public static final TagKey COPPER_INGOTS = register("ingots/copper"); public static final TagKey NETHERITE_INGOTS = register("ingots/netherite"); - // Ores - vanilla instances + // Ores - vanilla instances (All ores consolidated here for consistency) + public static final TagKey COAL_ORES = register("ores/coal"); + public static final TagKey COPPER_ORES = register("ores/copper"); + public static final TagKey DIAMOND_ORES = register("ores/diamond"); + public static final TagKey EMERALD_ORES = register("ores/emerald"); + public static final TagKey GOLD_ORES = register("ores/gold"); + public static final TagKey IRON_ORES = register("ores/iron"); + public static final TagKey LAPIS_ORES = register("ores/lapis"); public static final TagKey NETHERITE_SCRAP_ORES = register("ores/netherite_scrap"); public static final TagKey QUARTZ_ORES = register("ores/quartz"); + public static final TagKey REDSTONE_ORES = register("ores/redstone"); // Gems - vanilla instances public static final TagKey QUARTZ_GEMS = register("gems/quartz"); From a07ebd69e58b07dc7f8dcbf420b02b33991dde6e Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 18:22:02 -0400 Subject: [PATCH 08/36] Ore rates, ore in ground, and ore bearing tags added --- .../datagen/generators/BlockTagGenerator.java | 50 +++++++++++++++++++ .../generators/EnglishTagLangGenerator.java | 18 +++++++ .../datagen/generators/ItemTagGenerator.java | 10 ++++ .../convention/v2/ConventionalBlockTags.java | 40 +++++++++++++++ .../convention/v2/ConventionalItemTags.java | 40 +++++++++++++++ 5 files changed, 158 insertions(+) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java index 3d69871479..0c38808c36 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java @@ -122,6 +122,56 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { .addOptionalTag(ConventionalBlockTags.REDSTONE_ORES) .addOptionalTag(ConventionalBlockTags.QUARTZ_ORES); + getOrCreateTagBuilder(ConventionalBlockTags.ORE_BEARING_GROUND_DEEPSLATE) + .add(Blocks.DEEPSLATE); + getOrCreateTagBuilder(ConventionalBlockTags.ORE_BEARING_GROUND_NETHERRACK) + .add(Blocks.NETHERRACK); + getOrCreateTagBuilder(ConventionalBlockTags.ORE_BEARING_GROUND_STONE) + .add(Blocks.STONE); + getOrCreateTagBuilder(ConventionalBlockTags.ORE_RATES_DENSE) + .add(Blocks.COPPER_ORE) + .add(Blocks.DEEPSLATE_COPPER_ORE) + .add(Blocks.DEEPSLATE_LAPIS_ORE) + .add(Blocks.DEEPSLATE_REDSTONE_ORE) + .add(Blocks.LAPIS_ORE) + .add(Blocks.REDSTONE_ORE); + getOrCreateTagBuilder(ConventionalBlockTags.ORE_RATES_SINGULAR) + .add(Blocks.ANCIENT_DEBRIS) + .add(Blocks.COAL_ORE) + .add(Blocks.DEEPSLATE_COAL_ORE) + .add(Blocks.DEEPSLATE_DIAMOND_ORE) + .add(Blocks.DEEPSLATE_EMERALD_ORE) + .add(Blocks.DEEPSLATE_GOLD_ORE) + .add(Blocks.DEEPSLATE_IRON_ORE) + .add(Blocks.DIAMOND_ORE) + .add(Blocks.EMERALD_ORE) + .add(Blocks.GOLD_ORE) + .add(Blocks.IRON_ORE) + .add(Blocks.NETHER_QUARTZ_ORE); + getOrCreateTagBuilder(ConventionalBlockTags.ORE_RATES_SPARSE) + .add(Blocks.NETHER_GOLD_ORE); + getOrCreateTagBuilder(ConventionalBlockTags.ORES_IN_GROUND_DEEPSLATE) + .add(Blocks.DEEPSLATE_COAL_ORE) + .add(Blocks.DEEPSLATE_COPPER_ORE) + .add(Blocks.DEEPSLATE_DIAMOND_ORE) + .add(Blocks.DEEPSLATE_EMERALD_ORE) + .add(Blocks.DEEPSLATE_GOLD_ORE) + .add(Blocks.DEEPSLATE_IRON_ORE) + .add(Blocks.DEEPSLATE_LAPIS_ORE) + .add(Blocks.DEEPSLATE_REDSTONE_ORE); + getOrCreateTagBuilder(ConventionalBlockTags.ORES_IN_GROUND_NETHERRACK) + .add(Blocks.NETHER_GOLD_ORE) + .add(Blocks.NETHER_QUARTZ_ORE); + getOrCreateTagBuilder(ConventionalBlockTags.ORES_IN_GROUND_STONE) + .add(Blocks.COAL_ORE) + .add(Blocks.COPPER_ORE) + .add(Blocks.DIAMOND_ORE) + .add(Blocks.EMERALD_ORE) + .add(Blocks.GOLD_ORE) + .add(Blocks.IRON_ORE) + .add(Blocks.LAPIS_ORE) + .add(Blocks.REDSTONE_ORE); + getOrCreateTagBuilder(ConventionalBlockTags.WOODEN_CHESTS) .add(Blocks.CHEST) .add(Blocks.TRAPPED_CHEST); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 6760807554..2b07d46900 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -61,6 +61,15 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalBlockTags.NETHERITE_SCRAP_ORES, "Netherite Scrap Ores"); translationBuilder.add(ConventionalBlockTags.REDSTONE_ORES, "Redstone Ores"); translationBuilder.add(ConventionalBlockTags.QUARTZ_ORES, "Quartz Ores"); + translationBuilder.add(ConventionalBlockTags.ORE_BEARING_GROUND_DEEPSLATE, "Deepslate Ore Bearing Ground"); + translationBuilder.add(ConventionalBlockTags.ORE_BEARING_GROUND_NETHERRACK, "Netherrack Ore Bearing Ground"); + translationBuilder.add(ConventionalBlockTags.ORE_BEARING_GROUND_STONE, "Stone Ore Bearing Ground"); + translationBuilder.add(ConventionalBlockTags.ORE_RATES_DENSE, "Dense Ore Rates"); + translationBuilder.add(ConventionalBlockTags.ORE_RATES_SINGULAR, "Singular Ore Rates"); + translationBuilder.add(ConventionalBlockTags.ORE_RATES_SPARSE, "Sparse Ore Rates"); + translationBuilder.add(ConventionalBlockTags.ORES_IN_GROUND_DEEPSLATE, "Deepslate Ores In Ground"); + translationBuilder.add(ConventionalBlockTags.ORES_IN_GROUND_NETHERRACK, "Netherrack Ores In Ground"); + translationBuilder.add(ConventionalBlockTags.ORES_IN_GROUND_STONE, "Stone Ores In Ground"); translationBuilder.add(ConventionalBlockTags.BARRELS, "Barrels"); translationBuilder.add(ConventionalBlockTags.WOODEN_BARRELS, "Wooden Barrels"); translationBuilder.add(ConventionalBlockTags.BOOKSHELVES, "Bookshelves"); @@ -202,6 +211,15 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.NETHERITE_SCRAP_ORES, "Netherite Scrap Ores"); translationBuilder.add(ConventionalItemTags.REDSTONE_ORES, "Redstone Ores"); translationBuilder.add(ConventionalItemTags.QUARTZ_ORES, "Quartz Ores"); + translationBuilder.add(ConventionalItemTags.ORE_BEARING_GROUND_DEEPSLATE, "Deepslate Ore Bearing Ground"); + translationBuilder.add(ConventionalItemTags.ORE_BEARING_GROUND_NETHERRACK, "Netherrack Ore Bearing Ground"); + translationBuilder.add(ConventionalItemTags.ORE_BEARING_GROUND_STONE, "Stone Ore Bearing Ground"); + translationBuilder.add(ConventionalItemTags.ORE_RATES_DENSE, "Dense Ore Rates"); + translationBuilder.add(ConventionalItemTags.ORE_RATES_SINGULAR, "Singular Ore Rates"); + translationBuilder.add(ConventionalItemTags.ORE_RATES_SPARSE, "Sparse Ore Rates"); + translationBuilder.add(ConventionalItemTags.ORES_IN_GROUND_DEEPSLATE, "Deepslate Ores In Ground"); + translationBuilder.add(ConventionalItemTags.ORES_IN_GROUND_NETHERRACK, "Netherrack Ores In Ground"); + translationBuilder.add(ConventionalItemTags.ORES_IN_GROUND_STONE, "Stone Ores In Ground"); translationBuilder.add(ConventionalItemTags.QUARTZ_GEMS, "Quartz Gems"); translationBuilder.add(ConventionalItemTags.LAPIS_GEMS, "Lapis Gems"); translationBuilder.add(ConventionalItemTags.DIAMOND_GEMS, "Diamond Gems"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index 34519fa529..d9ed2bb4f3 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -540,6 +540,16 @@ private void generateOreAndRelatedTags() { .add(Items.IRON_NUGGET); getOrCreateTagBuilder(ConventionalItemTags.GOLD_NUGGETS) .add(Items.GOLD_NUGGET); + + copy(ConventionalBlockTags.ORE_BEARING_GROUND_DEEPSLATE, ConventionalItemTags.ORE_BEARING_GROUND_DEEPSLATE); + copy(ConventionalBlockTags.ORE_BEARING_GROUND_NETHERRACK, ConventionalItemTags.ORE_BEARING_GROUND_NETHERRACK); + copy(ConventionalBlockTags.ORE_BEARING_GROUND_STONE, ConventionalItemTags.ORE_BEARING_GROUND_STONE); + copy(ConventionalBlockTags.ORE_RATES_DENSE, ConventionalItemTags.ORE_RATES_DENSE); + copy(ConventionalBlockTags.ORE_RATES_SINGULAR, ConventionalItemTags.ORE_RATES_SINGULAR); + copy(ConventionalBlockTags.ORE_RATES_SPARSE, ConventionalItemTags.ORE_RATES_SPARSE); + copy(ConventionalBlockTags.ORES_IN_GROUND_DEEPSLATE, ConventionalItemTags.ORES_IN_GROUND_DEEPSLATE); + copy(ConventionalBlockTags.ORES_IN_GROUND_NETHERRACK, ConventionalItemTags.ORES_IN_GROUND_NETHERRACK); + copy(ConventionalBlockTags.ORES_IN_GROUND_STONE, ConventionalItemTags.ORES_IN_GROUND_STONE); } private void generateToolTags() { diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java index 7a1f207a6a..619dd3a3e9 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java @@ -183,6 +183,46 @@ private ConventionalBlockTags() { */ public static final TagKey HIDDEN_FROM_RECIPE_VIEWERS = register("hidden_from_recipe_viewers"); + /** + * Blocks which are often replaced by deepslate ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_DEEPSLATE}, during world generation + */ + public static final TagKey ORE_BEARING_GROUND_DEEPSLATE = register("ore_bearing_ground/deepslate"); + /** + * Blocks which are often replaced by netherrack ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_NETHERRACK}, during world generation + */ + public static final TagKey ORE_BEARING_GROUND_NETHERRACK = register("ore_bearing_ground/netherrack"); + /** + * Blocks which are often replaced by stone ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_STONE}, during world generation + */ + public static final TagKey ORE_BEARING_GROUND_STONE = register("ore_bearing_ground/stone"); + /** + * Ores which on average result in more than one resource worth of materials ignoring fortune and other modifiers. + * (example, Redstone Ore) + */ + public static final TagKey ORE_RATES_DENSE = register("ore_rates/dense"); + /** + * Ores which on average result in one resource worth of materials ignoring fortune and other modifiers. + * (Example, Coal Ore) + */ + public static final TagKey ORE_RATES_SINGULAR = register("ore_rates/singular"); + /** + * Ores which on average result in less than one resource worth of materials ignoring fortune and other modifiers. + * (Example, Nether Gold Ore as it drops 2 to 6 Gold Nuggets which is less than normal Gold Ore's Raw Gold drop) + */ + public static final TagKey ORE_RATES_SPARSE = register("ore_rates/sparse"); + /** + * Ores in deepslate (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_DEEPSLATE}) which could logically use deepslate as recipe input or output. + */ + public static final TagKey ORES_IN_GROUND_DEEPSLATE = register("ores_in_ground/deepslate"); + /** + * Ores in netherrack (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_NETHERRACK}) which could logically use netherrack as recipe input or output. + */ + public static final TagKey ORES_IN_GROUND_NETHERRACK = register("ores_in_ground/netherrack"); + /** + * Ores in stone (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_STONE}) which could logically use stone as recipe input or output. + */ + public static final TagKey ORES_IN_GROUND_STONE = register("ores_in_ground/stone"); + /** * This tag is redundant. Please use {@link net.minecraft.registry.tag.BlockTags#SHULKER_BOXES} tag instead. */ diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index a8b963d335..5ee7438434 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -388,6 +388,46 @@ private ConventionalItemTags() { */ public static final TagKey HIDDEN_FROM_RECIPE_VIEWERS = register("hidden_from_recipe_viewers"); + /** + * Blocks which are often replaced by deepslate ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_DEEPSLATE}, during world generation + */ + public static final TagKey ORE_BEARING_GROUND_DEEPSLATE = register("ore_bearing_ground/deepslate"); + /** + * Blocks which are often replaced by netherrack ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_NETHERRACK}, during world generation + */ + public static final TagKey ORE_BEARING_GROUND_NETHERRACK = register("ore_bearing_ground/netherrack"); + /** + * Blocks which are often replaced by stone ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_STONE}, during world generation + */ + public static final TagKey ORE_BEARING_GROUND_STONE = register("ore_bearing_ground/stone"); + /** + * Ores which on average result in more than one resource worth of materials ignoring fortune and other modifiers. + * (example, Redstone Ore) + */ + public static final TagKey ORE_RATES_DENSE = register("ore_rates/dense"); + /** + * Ores which on average result in one resource worth of materials ignoring fortune and other modifiers. + * (Example, Coal Ore) + */ + public static final TagKey ORE_RATES_SINGULAR = register("ore_rates/singular"); + /** + * Ores which on average result in less than one resource worth of materials ignoring fortune and other modifiers. + * (Example, Nether Gold Ore as it drops 2 to 6 Gold Nuggets which is less than normal Gold Ore's Raw Gold drop) + */ + public static final TagKey ORE_RATES_SPARSE = register("ore_rates/sparse"); + /** + * Ores in deepslate (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_DEEPSLATE}) which could logically use deepslate as recipe input or output. + */ + public static final TagKey ORES_IN_GROUND_DEEPSLATE = register("ores_in_ground/deepslate"); + /** + * Ores in netherrack (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_NETHERRACK}) which could logically use netherrack as recipe input or output. + */ + public static final TagKey ORES_IN_GROUND_NETHERRACK = register("ores_in_ground/netherrack"); + /** + * Ores in stone (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_STONE}) which could logically use stone as recipe input or output. + */ + public static final TagKey ORES_IN_GROUND_STONE = register("ores_in_ground/stone"); + /** * This tag is redundant. Please use {@link ConventionalItemTags#STORAGE_BLOCKS} tag instead. */ From cff626f9f49f39114dd4b358906600c1497fde2e Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 18:31:26 -0400 Subject: [PATCH 09/36] Added sands tags --- .../convention/datagen/generators/BlockTagGenerator.java | 8 ++++++++ .../datagen/generators/EnglishTagLangGenerator.java | 6 ++++++ .../convention/datagen/generators/ItemTagGenerator.java | 4 ++++ .../api/tag/convention/v2/ConventionalBlockTags.java | 5 +++++ .../api/tag/convention/v2/ConventionalItemTags.java | 5 +++++ 5 files changed, 28 insertions(+) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java index 0c38808c36..e35415829f 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java @@ -227,6 +227,14 @@ private void generateMiscTags() { } private void generateSandstoneTags() { + getOrCreateTagBuilder(ConventionalBlockTags.COLORLESS_SANDS) + .add(Blocks.SAND); + getOrCreateTagBuilder(ConventionalBlockTags.RED_SANDS) + .add(Blocks.RED_SAND); + getOrCreateTagBuilder(ConventionalBlockTags.SANDS) + .addOptionalTag(ConventionalBlockTags.COLORLESS_SANDS) + .addOptionalTag(ConventionalBlockTags.RED_SANDS); + getOrCreateTagBuilder(ConventionalBlockTags.SANDSTONE_BLOCKS) .addOptionalTag(ConventionalBlockTags.UNCOLORED_SANDSTONE_BLOCKS) .addOptionalTag(ConventionalBlockTags.RED_SANDSTONE_BLOCKS); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 2b07d46900..a3c350c0ea 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -92,6 +92,9 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalBlockTags.BUDS, "Buds"); translationBuilder.add(ConventionalBlockTags.CLUSTERS, "Clusters"); translationBuilder.add(ConventionalBlockTags.VILLAGER_JOB_SITES, "Villager Job Sites"); + translationBuilder.add(ConventionalBlockTags.SANDS, "Sands"); + translationBuilder.add(ConventionalBlockTags.RED_SANDS, "Red Sands"); + translationBuilder.add(ConventionalBlockTags.COLORLESS_SANDS, "Colorless Sands"); translationBuilder.add(ConventionalBlockTags.SANDSTONE_BLOCKS, "Sandstone Blocks"); translationBuilder.add(ConventionalBlockTags.SANDSTONE_SLABS, "Sandstone Slabs"); translationBuilder.add(ConventionalBlockTags.SANDSTONE_STAIRS, "Sandstone Stairs"); @@ -290,6 +293,9 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.BUDS, "Buds"); translationBuilder.add(ConventionalItemTags.CLUSTERS, "Clusters"); translationBuilder.add(ConventionalItemTags.VILLAGER_JOB_SITES, "Villager Job Sites"); + translationBuilder.add(ConventionalItemTags.SANDS, "Sands"); + translationBuilder.add(ConventionalItemTags.RED_SANDS, "Red Sands"); + translationBuilder.add(ConventionalItemTags.COLORLESS_SANDS, "Colorless Sands"); translationBuilder.add(ConventionalItemTags.SANDSTONE_BLOCKS, "Sandstone Blocks"); translationBuilder.add(ConventionalItemTags.SANDSTONE_SLABS, "Sandstone Slabs"); translationBuilder.add(ConventionalItemTags.SANDSTONE_STAIRS, "Sandstone Stairs"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index d9ed2bb4f3..515c8248f5 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -138,6 +138,10 @@ private void copyItemTags() { copy(ConventionalBlockTags.BUDS, ConventionalItemTags.BUDS); copy(ConventionalBlockTags.CLUSTERS, ConventionalItemTags.CLUSTERS); + copy(ConventionalBlockTags.COLORLESS_SANDS, ConventionalItemTags.COLORLESS_SANDS); + copy(ConventionalBlockTags.RED_SANDS, ConventionalItemTags.RED_SANDS); + copy(ConventionalBlockTags.SANDS, ConventionalItemTags.SANDS); + copy(ConventionalBlockTags.SANDSTONE_BLOCKS, ConventionalItemTags.SANDSTONE_BLOCKS); copy(ConventionalBlockTags.SANDSTONE_SLABS, ConventionalItemTags.SANDSTONE_SLABS); copy(ConventionalBlockTags.SANDSTONE_STAIRS, ConventionalItemTags.SANDSTONE_STAIRS); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java index 619dd3a3e9..df7cb37c06 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java @@ -100,6 +100,11 @@ private ConventionalBlockTags() { public static final TagKey VILLAGER_JOB_SITES = register("villager_job_sites"); + // Sand + public static final TagKey SANDS = register("sands"); + public static final TagKey RED_SANDS = register("sands/red"); + public static final TagKey COLORLESS_SANDS = register("sands/colorless"); + // Sandstone public static final TagKey SANDSTONE_BLOCKS = register("sandstone/blocks"); public static final TagKey SANDSTONE_SLABS = register("sandstone/slabs"); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index 5ee7438434..6e6a1e915c 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -250,6 +250,11 @@ private ConventionalItemTags() { public static final TagKey VILLAGER_JOB_SITES = register("villager_job_sites"); + // Sands + public static final TagKey SANDS = register("sands"); + public static final TagKey RED_SANDS = register("sands/red"); + public static final TagKey COLORLESS_SANDS = register("sands/colorless"); + // Sandstone public static final TagKey SANDSTONE_BLOCKS = register("sandstone/blocks"); public static final TagKey SANDSTONE_SLABS = register("sandstone/slabs"); From 2f6001a457410d8b7985502fcee4acc9648f4654 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 18:35:13 -0400 Subject: [PATCH 10/36] added bones tag --- .../convention/datagen/generators/EnglishTagLangGenerator.java | 1 + .../tag/convention/datagen/generators/ItemTagGenerator.java | 3 +++ .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 1 + 3 files changed, 5 insertions(+) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index a3c350c0ea..f2d92f7580 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -371,6 +371,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.PLAYER_WORKSTATIONS_FURNACES, "Furnaces"); translationBuilder.add(ConventionalItemTags.STRINGS, "Strings"); translationBuilder.add(ConventionalItemTags.LEATHERS, "Leathers"); + translationBuilder.add(ConventionalItemTags.BONES, "Bones"); translationBuilder.add(ConventionalItemTags.MUSIC_DISCS, "Music Discs"); translationBuilder.add(ConventionalItemTags.RODS, "Rods"); translationBuilder.add(ConventionalItemTags.WOODEN_RODS, "Wooden Rods"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index 515c8248f5..76bb3c073f 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -755,6 +755,9 @@ private void generateOtherTags() { getOrCreateTagBuilder(ConventionalItemTags.LEATHERS) .add(Items.LEATHER); + getOrCreateTagBuilder(ConventionalItemTags.BONES) + .add(Items.BONE); + getOrCreateTagBuilder(ConventionalItemTags.MUSIC_DISCS) .add(Items.MUSIC_DISC_13, Items.MUSIC_DISC_CAT, Items.MUSIC_DISC_BLOCKS, Items.MUSIC_DISC_CHIRP, Items.MUSIC_DISC_FAR, Items.MUSIC_DISC_MALL, Items.MUSIC_DISC_MELLOHI, Items.MUSIC_DISC_STAL, Items.MUSIC_DISC_STRAD, Items.MUSIC_DISC_WARD, diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index 6e6a1e915c..251e2a742f 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -362,6 +362,7 @@ private ConventionalItemTags() { public static final TagKey PLAYER_WORKSTATIONS_FURNACES = register("player_workstations/furnaces"); public static final TagKey STRINGS = register("strings"); public static final TagKey LEATHERS = register("leathers"); + public static final TagKey BONES = register("bones"); /** * For music disc-like materials to be used in recipes. * A pancake with a JUKEBOX_PLAYABLE component attached to play in Jukeboxes as an Easter Egg is not a music disc and would not go in this tag. From 62e1be5d56ae4d480615c8ed4aab8f606c298693 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 18:35:48 -0400 Subject: [PATCH 11/36] Added eggs tag --- .../convention/datagen/generators/EnglishTagLangGenerator.java | 1 + .../tag/convention/datagen/generators/ItemTagGenerator.java | 3 +++ .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 1 + 3 files changed, 5 insertions(+) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index f2d92f7580..a5f9a3b238 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -372,6 +372,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.STRINGS, "Strings"); translationBuilder.add(ConventionalItemTags.LEATHERS, "Leathers"); translationBuilder.add(ConventionalItemTags.BONES, "Bones"); + translationBuilder.add(ConventionalItemTags.EGGS, "Eggs"); translationBuilder.add(ConventionalItemTags.MUSIC_DISCS, "Music Discs"); translationBuilder.add(ConventionalItemTags.RODS, "Rods"); translationBuilder.add(ConventionalItemTags.WOODEN_RODS, "Wooden Rods"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index 76bb3c073f..b1c0fab1d5 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -758,6 +758,9 @@ private void generateOtherTags() { getOrCreateTagBuilder(ConventionalItemTags.BONES) .add(Items.BONE); + getOrCreateTagBuilder(ConventionalItemTags.EGGS) + .add(Items.EGG); + getOrCreateTagBuilder(ConventionalItemTags.MUSIC_DISCS) .add(Items.MUSIC_DISC_13, Items.MUSIC_DISC_CAT, Items.MUSIC_DISC_BLOCKS, Items.MUSIC_DISC_CHIRP, Items.MUSIC_DISC_FAR, Items.MUSIC_DISC_MALL, Items.MUSIC_DISC_MELLOHI, Items.MUSIC_DISC_STAL, Items.MUSIC_DISC_STRAD, Items.MUSIC_DISC_WARD, diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index 251e2a742f..41158a53f5 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -363,6 +363,7 @@ private ConventionalItemTags() { public static final TagKey STRINGS = register("strings"); public static final TagKey LEATHERS = register("leathers"); public static final TagKey BONES = register("bones"); + public static final TagKey EGGS = register("eggs"); /** * For music disc-like materials to be used in recipes. * A pancake with a JUKEBOX_PLAYABLE component attached to play in Jukeboxes as an Easter Egg is not a music disc and would not go in this tag. From 1508cc6ee112830af5ec624b3f05f5fe90e25a56 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 18:36:31 -0400 Subject: [PATCH 12/36] Added feathers tag --- .../convention/datagen/generators/EnglishTagLangGenerator.java | 1 + .../tag/convention/datagen/generators/ItemTagGenerator.java | 3 +++ .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 1 + 3 files changed, 5 insertions(+) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index a5f9a3b238..ad75876d79 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -373,6 +373,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.LEATHERS, "Leathers"); translationBuilder.add(ConventionalItemTags.BONES, "Bones"); translationBuilder.add(ConventionalItemTags.EGGS, "Eggs"); + translationBuilder.add(ConventionalItemTags.FEATHERS, "Feathers"); translationBuilder.add(ConventionalItemTags.MUSIC_DISCS, "Music Discs"); translationBuilder.add(ConventionalItemTags.RODS, "Rods"); translationBuilder.add(ConventionalItemTags.WOODEN_RODS, "Wooden Rods"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index b1c0fab1d5..2128db3241 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -761,6 +761,9 @@ private void generateOtherTags() { getOrCreateTagBuilder(ConventionalItemTags.EGGS) .add(Items.EGG); + getOrCreateTagBuilder(ConventionalItemTags.FEATHERS) + .add(Items.FEATHER); + getOrCreateTagBuilder(ConventionalItemTags.MUSIC_DISCS) .add(Items.MUSIC_DISC_13, Items.MUSIC_DISC_CAT, Items.MUSIC_DISC_BLOCKS, Items.MUSIC_DISC_CHIRP, Items.MUSIC_DISC_FAR, Items.MUSIC_DISC_MALL, Items.MUSIC_DISC_MELLOHI, Items.MUSIC_DISC_STAL, Items.MUSIC_DISC_STRAD, Items.MUSIC_DISC_WARD, diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index 41158a53f5..bebda784d3 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -364,6 +364,7 @@ private ConventionalItemTags() { public static final TagKey LEATHERS = register("leathers"); public static final TagKey BONES = register("bones"); public static final TagKey EGGS = register("eggs"); + public static final TagKey FEATHERS = register("feathers"); /** * For music disc-like materials to be used in recipes. * A pancake with a JUKEBOX_PLAYABLE component attached to play in Jukeboxes as an Easter Egg is not a music disc and would not go in this tag. From 117c8cabd72597174c9ed496026d6e9ea8fb3876 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 18:39:59 -0400 Subject: [PATCH 13/36] Added gunpowders tag --- .../convention/datagen/generators/EnglishTagLangGenerator.java | 1 + .../tag/convention/datagen/generators/ItemTagGenerator.java | 3 +++ .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 1 + 3 files changed, 5 insertions(+) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index ad75876d79..af28aa6f6c 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -374,6 +374,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.BONES, "Bones"); translationBuilder.add(ConventionalItemTags.EGGS, "Eggs"); translationBuilder.add(ConventionalItemTags.FEATHERS, "Feathers"); + translationBuilder.add(ConventionalItemTags.GUNPOWDERS, "Gunpowders"); translationBuilder.add(ConventionalItemTags.MUSIC_DISCS, "Music Discs"); translationBuilder.add(ConventionalItemTags.RODS, "Rods"); translationBuilder.add(ConventionalItemTags.WOODEN_RODS, "Wooden Rods"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index 2128db3241..2e4de3fab0 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -764,6 +764,9 @@ private void generateOtherTags() { getOrCreateTagBuilder(ConventionalItemTags.FEATHERS) .add(Items.FEATHER); + getOrCreateTagBuilder(ConventionalItemTags.GUNPOWDERS) + .add(Items.GUNPOWDER); + getOrCreateTagBuilder(ConventionalItemTags.MUSIC_DISCS) .add(Items.MUSIC_DISC_13, Items.MUSIC_DISC_CAT, Items.MUSIC_DISC_BLOCKS, Items.MUSIC_DISC_CHIRP, Items.MUSIC_DISC_FAR, Items.MUSIC_DISC_MALL, Items.MUSIC_DISC_MELLOHI, Items.MUSIC_DISC_STAL, Items.MUSIC_DISC_STRAD, Items.MUSIC_DISC_WARD, diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index bebda784d3..aa47c6f3e3 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -365,6 +365,7 @@ private ConventionalItemTags() { public static final TagKey BONES = register("bones"); public static final TagKey EGGS = register("eggs"); public static final TagKey FEATHERS = register("feathers"); + public static final TagKey GUNPOWDERS = register("gunpowders"); /** * For music disc-like materials to be used in recipes. * A pancake with a JUKEBOX_PLAYABLE component attached to play in Jukeboxes as an Easter Egg is not a music disc and would not go in this tag. From 710fec607af6234004ad04418d837c75c224377e Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 18:40:24 -0400 Subject: [PATCH 14/36] Added mushrooms tag --- .../datagen/generators/EnglishTagLangGenerator.java | 1 + .../tag/convention/datagen/generators/ItemTagGenerator.java | 4 ++++ .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index af28aa6f6c..88319b9b75 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -375,6 +375,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.EGGS, "Eggs"); translationBuilder.add(ConventionalItemTags.FEATHERS, "Feathers"); translationBuilder.add(ConventionalItemTags.GUNPOWDERS, "Gunpowders"); + translationBuilder.add(ConventionalItemTags.MUSHROOMS, "Mushrooms"); translationBuilder.add(ConventionalItemTags.MUSIC_DISCS, "Music Discs"); translationBuilder.add(ConventionalItemTags.RODS, "Rods"); translationBuilder.add(ConventionalItemTags.WOODEN_RODS, "Wooden Rods"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index 2e4de3fab0..b4af85bd91 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -767,6 +767,10 @@ private void generateOtherTags() { getOrCreateTagBuilder(ConventionalItemTags.GUNPOWDERS) .add(Items.GUNPOWDER); + getOrCreateTagBuilder(ConventionalItemTags.MUSHROOMS) + .add(Items.RED_MUSHROOM) + .add(Items.BROWN_MUSHROOM); + getOrCreateTagBuilder(ConventionalItemTags.MUSIC_DISCS) .add(Items.MUSIC_DISC_13, Items.MUSIC_DISC_CAT, Items.MUSIC_DISC_BLOCKS, Items.MUSIC_DISC_CHIRP, Items.MUSIC_DISC_FAR, Items.MUSIC_DISC_MALL, Items.MUSIC_DISC_MELLOHI, Items.MUSIC_DISC_STAL, Items.MUSIC_DISC_STRAD, Items.MUSIC_DISC_WARD, diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index aa47c6f3e3..63de5138e5 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -366,6 +366,10 @@ private ConventionalItemTags() { public static final TagKey EGGS = register("eggs"); public static final TagKey FEATHERS = register("feathers"); public static final TagKey GUNPOWDERS = register("gunpowders"); + /** + * Small mushroom items. Not the full block forms. + */ + public static final TagKey MUSHROOMS = register("mushrooms"); /** * For music disc-like materials to be used in recipes. * A pancake with a JUKEBOX_PLAYABLE component attached to play in Jukeboxes as an Easter Egg is not a music disc and would not go in this tag. From c4af34a6d96fb7f9f2ef650b07ed558b38c61d89 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 18:41:33 -0400 Subject: [PATCH 15/36] Added nether stars tag --- .../convention/datagen/generators/EnglishTagLangGenerator.java | 1 + .../tag/convention/datagen/generators/ItemTagGenerator.java | 3 +++ .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 1 + 3 files changed, 5 insertions(+) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 88319b9b75..5f77218a93 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -376,6 +376,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.FEATHERS, "Feathers"); translationBuilder.add(ConventionalItemTags.GUNPOWDERS, "Gunpowders"); translationBuilder.add(ConventionalItemTags.MUSHROOMS, "Mushrooms"); + translationBuilder.add(ConventionalItemTags.NETHER_STARS, "Nether Stars"); translationBuilder.add(ConventionalItemTags.MUSIC_DISCS, "Music Discs"); translationBuilder.add(ConventionalItemTags.RODS, "Rods"); translationBuilder.add(ConventionalItemTags.WOODEN_RODS, "Wooden Rods"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index b4af85bd91..d04577fcd5 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -771,6 +771,9 @@ private void generateOtherTags() { .add(Items.RED_MUSHROOM) .add(Items.BROWN_MUSHROOM); + getOrCreateTagBuilder(ConventionalItemTags.NETHER_STARS) + .add(Items.NETHER_STAR); + getOrCreateTagBuilder(ConventionalItemTags.MUSIC_DISCS) .add(Items.MUSIC_DISC_13, Items.MUSIC_DISC_CAT, Items.MUSIC_DISC_BLOCKS, Items.MUSIC_DISC_CHIRP, Items.MUSIC_DISC_FAR, Items.MUSIC_DISC_MALL, Items.MUSIC_DISC_MELLOHI, Items.MUSIC_DISC_STAL, Items.MUSIC_DISC_STRAD, Items.MUSIC_DISC_WARD, diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index 63de5138e5..5a851fa75e 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -370,6 +370,7 @@ private ConventionalItemTags() { * Small mushroom items. Not the full block forms. */ public static final TagKey MUSHROOMS = register("mushrooms"); + public static final TagKey NETHER_STARS = register("nether_stars"); /** * For music disc-like materials to be used in recipes. * A pancake with a JUKEBOX_PLAYABLE component attached to play in Jukeboxes as an Easter Egg is not a music disc and would not go in this tag. From 43c619841e4f12fe9935013cf817e8fa05eff546 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 18:47:26 -0400 Subject: [PATCH 16/36] Added seeds tags --- .../generators/EnglishTagLangGenerator.java | 6 ++++++ .../datagen/generators/ItemTagGenerator.java | 21 +++++++++++++++++-- .../convention/v2/ConventionalItemTags.java | 11 ++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 5f77218a93..733cd9ebe5 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -367,6 +367,12 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.PUMPKIN_CROPS, "Pumpkin Crops"); translationBuilder.add(ConventionalItemTags.SUGAR_CANE_CROPS, "Sugar Cane Crops"); translationBuilder.add(ConventionalItemTags.WHEAT_CROPS, "Wheat Crops"); + translationBuilder.add(ConventionalItemTags.SEEDS, "Seeds"); + translationBuilder.add(ConventionalItemTags.BEETROOT_SEEDS, "Beetroot Seeds"); + translationBuilder.add(ConventionalItemTags.MELON_SEEDS, "Melon Seeds"); + translationBuilder.add(ConventionalItemTags.PUMPKIN_SEEDS, "Pumpkin Seeds"); + translationBuilder.add(ConventionalItemTags.TORCHFLOWER_SEEDS, "Torchflower Seeds"); + translationBuilder.add(ConventionalItemTags.WHEAT_SEEDS, "Wheat Seeds"); translationBuilder.add(ConventionalItemTags.PLAYER_WORKSTATIONS_CRAFTING_TABLES, "Crafting Tables"); translationBuilder.add(ConventionalItemTags.PLAYER_WORKSTATIONS_FURNACES, "Furnaces"); translationBuilder.add(ConventionalItemTags.STRINGS, "Strings"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index d04577fcd5..70cca77db0 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -44,7 +44,7 @@ protected void configure(RegistryWrapper.WrapperLookup arg) { generateFoodTags(); generateDyeTags(); generateDyedTags(); - generateCropTags(); + generateCropAndSeedsTags(); generateVillagerJobSites(); generateOtherTags(); copyItemTags(); @@ -707,7 +707,7 @@ private void generateVillagerJobSites() { .forEach(getOrCreateTagBuilder(ConventionalItemTags.VILLAGER_JOB_SITES)::add); } - private void generateCropTags() { + private void generateCropAndSeedsTags() { getOrCreateTagBuilder(ConventionalItemTags.CROPS) .addOptionalTag(ConventionalItemTags.BEETROOT_CROPS) .addOptionalTag(ConventionalItemTags.CACTUS_CROPS) @@ -740,6 +740,23 @@ private void generateCropTags() { .add(Items.SUGAR_CANE); getOrCreateTagBuilder(ConventionalItemTags.WHEAT_CROPS) .add(Items.WHEAT); + + getOrCreateTagBuilder(ConventionalItemTags.SEEDS) + .addOptionalTag(ConventionalItemTags.BEETROOT_SEEDS) + .addOptionalTag(ConventionalItemTags.MELON_SEEDS) + .addOptionalTag(ConventionalItemTags.PUMPKIN_SEEDS) + .addOptionalTag(ConventionalItemTags.TORCHFLOWER_SEEDS) + .addOptionalTag(ConventionalItemTags.WHEAT_SEEDS); + getOrCreateTagBuilder(ConventionalItemTags.BEETROOT_SEEDS) + .add(Items.BEETROOT_SEEDS); + getOrCreateTagBuilder(ConventionalItemTags.MELON_SEEDS) + .add(Items.MELON_SEEDS); + getOrCreateTagBuilder(ConventionalItemTags.PUMPKIN_SEEDS) + .add(Items.PUMPKIN_SEEDS); + getOrCreateTagBuilder(ConventionalItemTags.TORCHFLOWER_SEEDS) + .add(Items.TORCHFLOWER_SEEDS); + getOrCreateTagBuilder(ConventionalItemTags.WHEAT_SEEDS) + .add(Items.WHEAT_SEEDS); } private void generateOtherTags() { diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index 5a851fa75e..d8dd25cb61 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -357,6 +357,17 @@ private ConventionalItemTags() { public static final TagKey SUGAR_CANE_CROPS = register("crops/sugar_cane"); public static final TagKey WHEAT_CROPS = register("crops/wheat"); + // Seeds + /** + * For items that are explicitly seeds for use cases such as refilling a bird feeder block or certain seed-based recipes. + */ + public static final TagKey SEEDS = register("seeds"); + public static final TagKey BEETROOT_SEEDS = register("seeds/beetroot"); + public static final TagKey MELON_SEEDS = register("seeds/melon"); + public static final TagKey PUMPKIN_SEEDS = register("seeds/pumpkin"); + public static final TagKey TORCHFLOWER_SEEDS = register("seeds/torchflower"); + public static final TagKey WHEAT_SEEDS = register("seeds/wheat"); + // Other public static final TagKey PLAYER_WORKSTATIONS_CRAFTING_TABLES = register("player_workstations/crafting_tables"); public static final TagKey PLAYER_WORKSTATIONS_FURNACES = register("player_workstations/furnaces"); From d5f8cfba9751b85d7f045dd783439baf448a61d8 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 18:57:42 -0400 Subject: [PATCH 17/36] Added fence and fence gate tags --- .../datagen/generators/BlockTagGenerator.java | 36 +++++++++++++++++++ .../generators/EnglishTagLangGenerator.java | 10 ++++++ .../datagen/generators/ItemTagGenerator.java | 6 ++++ .../convention/v2/ConventionalBlockTags.java | 7 ++++ .../convention/v2/ConventionalItemTags.java | 7 ++++ 5 files changed, 66 insertions(+) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java index e35415829f..f23f413b15 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java @@ -197,6 +197,8 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { generateSandstoneTags(); + generateFenceAndFenceGateTags(); + generateDyedTags(); generateStorageTags(); @@ -226,6 +228,40 @@ private void generateMiscTags() { getOrCreateTagBuilder(ConventionalBlockTags.HIDDEN_FROM_RECIPE_VIEWERS); // Generate tag so others can see it exists through JSON. } + private void generateFenceAndFenceGateTags() { + getOrCreateTagBuilder(ConventionalBlockTags.WOODEN_FENCES) + .add(Blocks.OAK_FENCE) + .add(Blocks.SPRUCE_FENCE) + .add(Blocks.BIRCH_FENCE) + .add(Blocks.JUNGLE_FENCE) + .add(Blocks.ACACIA_FENCE) + .add(Blocks.DARK_OAK_FENCE) + .add(Blocks.CRIMSON_FENCE) + .add(Blocks.WARPED_FENCE) + .add(Blocks.MANGROVE_FENCE) + .add(Blocks.BAMBOO_FENCE) + .add(Blocks.CHERRY_FENCE); + getOrCreateTagBuilder(ConventionalBlockTags.NETHER_BRICK_FENCES) + .add(Blocks.NETHER_BRICK_FENCE); + getOrCreateTagBuilder(ConventionalBlockTags.FENCES) + .addOptionalTag(ConventionalBlockTags.WOODEN_FENCES) + .addOptionalTag(ConventionalBlockTags.NETHER_BRICK_FENCES); + getOrCreateTagBuilder(ConventionalBlockTags.WOODEN_FENCE_GATES) + .add(Blocks.OAK_FENCE_GATE) + .add(Blocks.SPRUCE_FENCE_GATE) + .add(Blocks.BIRCH_FENCE_GATE) + .add(Blocks.JUNGLE_FENCE_GATE) + .add(Blocks.ACACIA_FENCE_GATE) + .add(Blocks.DARK_OAK_FENCE_GATE) + .add(Blocks.CRIMSON_FENCE_GATE) + .add(Blocks.WARPED_FENCE_GATE) + .add(Blocks.MANGROVE_FENCE_GATE) + .add(Blocks.BAMBOO_FENCE_GATE) + .add(Blocks.CHERRY_FENCE_GATE); + getOrCreateTagBuilder(ConventionalBlockTags.FENCE_GATES) + .addOptionalTag(ConventionalBlockTags.WOODEN_FENCE_GATES); + } + private void generateSandstoneTags() { getOrCreateTagBuilder(ConventionalBlockTags.COLORLESS_SANDS) .add(Blocks.SAND); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 733cd9ebe5..0b7b332e6a 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -104,6 +104,11 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalBlockTags.UNCOLORED_SANDSTONE_BLOCKS, "Uncolored Sandstone Blocks"); translationBuilder.add(ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS, "Uncolored Sandstone Slabs"); translationBuilder.add(ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS, "Uncolored Sandstone Stairs"); + translationBuilder.add(ConventionalBlockTags.FENCES, "Fences"); + translationBuilder.add(ConventionalBlockTags.WOODEN_FENCES, "Wooden Fences"); + translationBuilder.add(ConventionalBlockTags.NETHER_BRICK_FENCES, "Nether Brick Fences"); + translationBuilder.add(ConventionalBlockTags.FENCE_GATES, "Fence Gates"); + translationBuilder.add(ConventionalBlockTags.WOODEN_FENCE_GATES, "Wooden Fence Gates"); translationBuilder.add(ConventionalBlockTags.DYED, "Dyed Blocks"); translationBuilder.add(ConventionalBlockTags.BLACK_DYED, "Black Dyed Blocks"); translationBuilder.add(ConventionalBlockTags.BLUE_DYED, "Blue Dyed Blocks"); @@ -305,6 +310,11 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.UNCOLORED_SANDSTONE_BLOCKS, "Uncolored Sandstone Blocks"); translationBuilder.add(ConventionalItemTags.UNCOLORED_SANDSTONE_SLABS, "Uncolored Sandstone Slabs"); translationBuilder.add(ConventionalItemTags.UNCOLORED_SANDSTONE_STAIRS, "Uncolored Sandstone Stairs"); + translationBuilder.add(ConventionalItemTags.FENCES, "Fences"); + translationBuilder.add(ConventionalItemTags.WOODEN_FENCES, "Wooden Fences"); + translationBuilder.add(ConventionalItemTags.NETHER_BRICK_FENCES, "Nether Brick Fences"); + translationBuilder.add(ConventionalItemTags.FENCE_GATES, "Fence Gates"); + translationBuilder.add(ConventionalItemTags.WOODEN_FENCE_GATES, "Wooden Fence Gates"); translationBuilder.add(ConventionalItemTags.DYES, "Dyes"); translationBuilder.add(ConventionalItemTags.BLACK_DYES, "Black Dyes"); translationBuilder.add(ConventionalItemTags.BLUE_DYES, "Blue Dyes"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index 70cca77db0..d38002f90f 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -169,6 +169,12 @@ private void copyItemTags() { copy(ConventionalBlockTags.STORAGE_BLOCKS_REDSTONE, ConventionalItemTags.STORAGE_BLOCKS_REDSTONE); copy(ConventionalBlockTags.STORAGE_BLOCKS_SLIME, ConventionalItemTags.STORAGE_BLOCKS_SLIME); copy(ConventionalBlockTags.STORAGE_BLOCKS_WHEAT, ConventionalItemTags.STORAGE_BLOCKS_WHEAT); + + copy(ConventionalBlockTags.FENCES, ConventionalItemTags.FENCES); + copy(ConventionalBlockTags.WOODEN_FENCES, ConventionalItemTags.WOODEN_FENCES); + copy(ConventionalBlockTags.NETHER_BRICK_FENCES, ConventionalItemTags.NETHER_BRICK_FENCES); + copy(ConventionalBlockTags.FENCE_GATES, ConventionalItemTags.FENCE_GATES); + copy(ConventionalBlockTags.WOODEN_FENCE_GATES, ConventionalItemTags.WOODEN_FENCE_GATES); } private void generateDyeTags() { diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java index df7cb37c06..fe8dd6b27d 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java @@ -116,6 +116,13 @@ private ConventionalBlockTags() { public static final TagKey UNCOLORED_SANDSTONE_SLABS = register("sandstone/uncolored_slabs"); public static final TagKey UNCOLORED_SANDSTONE_STAIRS = register("sandstone/uncolored_stairs"); + // Fences and Fence Gates + public static final TagKey FENCES = register("fences"); + public static final TagKey WOODEN_FENCES = register("fences/wooden"); + public static final TagKey NETHER_BRICK_FENCES = register("fences/nether_brick"); + public static final TagKey FENCE_GATES = register("fence_gates"); + public static final TagKey WOODEN_FENCE_GATES = register("fence_gates/wooden"); + // Blocks created with dyes /** * Tag that holds all blocks that can be dyed a specific color. diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index d8dd25cb61..e0c9d3a0ae 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -266,6 +266,13 @@ private ConventionalItemTags() { public static final TagKey UNCOLORED_SANDSTONE_SLABS = register("sandstone/uncolored_slabs"); public static final TagKey UNCOLORED_SANDSTONE_STAIRS = register("sandstone/uncolored_stairs"); + // Fences and Fence Gates + public static final TagKey FENCES = register("fences"); + public static final TagKey WOODEN_FENCES = register("fences/wooden"); + public static final TagKey NETHER_BRICK_FENCES = register("fences/nether_brick"); + public static final TagKey FENCE_GATES = register("fence_gates"); + public static final TagKey WOODEN_FENCE_GATES = register("fence_gates/wooden"); + // Dyes public static final TagKey DYES = register("dyes"); public static final TagKey BLACK_DYES = register("dyes/black"); From 88e8adc2828326369a438644f6febb0cfa6865be Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 19:12:52 -0400 Subject: [PATCH 18/36] Added nether and end empty category tags --- .../datagen/generators/BiomeTagGenerator.java | 33 +++++++++++++++---- .../generators/EnglishTagLangGenerator.java | 10 ++++++ .../convention/v2/ConventionalBiomeTags.java | 17 ++++++++++ 3 files changed, 54 insertions(+), 6 deletions(-) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java index b12a951e13..63b79f508b 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java @@ -166,8 +166,11 @@ private void generateClimateAndVegetationTags() { .add(BiomeKeys.END_MIDLANDS) .add(BiomeKeys.END_HIGHLANDS) .add(BiomeKeys.END_BARRENS); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD_NETHER); getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD) - .addTag(ConventionalBiomeTags.IS_COLD_OVERWORLD); + .addTag(ConventionalBiomeTags.IS_COLD_OVERWORLD) + .addTag(ConventionalBiomeTags.IS_COLD_NETHER) + .addTag(ConventionalBiomeTags.IS_COLD_END); getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD) .add(BiomeKeys.PLAINS) @@ -183,8 +186,12 @@ private void generateClimateAndVegetationTags() { .add(BiomeKeys.BEACH) .add(BiomeKeys.OCEAN) .add(BiomeKeys.DEEP_OCEAN); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE_NETHER); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE_END); getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE) - .addTag(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD); + .addTag(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD) + .addTag(ConventionalBiomeTags.IS_TEMPERATE_NETHER) + .addTag(ConventionalBiomeTags.IS_TEMPERATE_END); getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT_OVERWORLD) .add(BiomeKeys.MANGROVE_SWAMP) @@ -206,9 +213,11 @@ private void generateClimateAndVegetationTags() { .add(BiomeKeys.WARPED_FOREST) .add(BiomeKeys.SOUL_SAND_VALLEY) .add(BiomeKeys.BASALT_DELTAS); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT_END); getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT) .addTag(ConventionalBiomeTags.IS_HOT_OVERWORLD) - .addTag(ConventionalBiomeTags.IS_HOT_NETHER); + .addTag(ConventionalBiomeTags.IS_HOT_NETHER) + .addTag(ConventionalBiomeTags.IS_HOT_END); getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET_OVERWORLD) .add(BiomeKeys.SWAMP) @@ -219,8 +228,12 @@ private void generateClimateAndVegetationTags() { .add(BiomeKeys.BEACH) .add(BiomeKeys.LUSH_CAVES) .add(BiomeKeys.DRIPSTONE_CAVES); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET_NETHER); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET_END); getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET) - .addTag(ConventionalBiomeTags.IS_WET_OVERWORLD); + .addTag(ConventionalBiomeTags.IS_WET_OVERWORLD) + .addTag(ConventionalBiomeTags.IS_WET_NETHER) + .addTag(ConventionalBiomeTags.IS_WET_END); getOrCreateTagBuilder(ConventionalBiomeTags.IS_DRY_OVERWORLD) .add(BiomeKeys.DESERT) @@ -254,8 +267,12 @@ private void generateClimateAndVegetationTags() { .add(BiomeKeys.JUNGLE) .add(BiomeKeys.BAMBOO_JUNGLE) .add(BiomeKeys.MANGROVE_SWAMP); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE_NETHER); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE_END); getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE) - .addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD); + .addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD) + .addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_DENSE_NETHER) + .addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_DENSE_END); getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD) .add(BiomeKeys.WOODED_BADLANDS) @@ -269,8 +286,12 @@ private void generateClimateAndVegetationTags() { .add(BiomeKeys.SNOWY_SLOPES) .add(BiomeKeys.JAGGED_PEAKS) .add(BiomeKeys.FROZEN_PEAKS); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE_NETHER); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE_END); getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE) - .addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD); + .addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD) + .addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_SPARSE_NETHER) + .addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_SPARSE_END); getOrCreateTagBuilder(ConventionalBiomeTags.IS_CONIFEROUS_TREE) .addOptionalTag(ConventionalBiomeTags.IS_TAIGA) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 0b7b332e6a..74ee3679a0 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -439,21 +439,31 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalBiomeTags.IS_HOT, "Hot"); translationBuilder.add(ConventionalBiomeTags.IS_HOT_OVERWORLD, "Hot Overworld"); translationBuilder.add(ConventionalBiomeTags.IS_HOT_NETHER, "Hot Nether"); + translationBuilder.add(ConventionalBiomeTags.IS_HOT_END, "Hot End"); translationBuilder.add(ConventionalBiomeTags.IS_TEMPERATE, "Temperate"); translationBuilder.add(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD, "Temperate Overworld"); + translationBuilder.add(ConventionalBiomeTags.IS_TEMPERATE_NETHER, "Temperate Nether"); + translationBuilder.add(ConventionalBiomeTags.IS_TEMPERATE_END, "Temperate End"); translationBuilder.add(ConventionalBiomeTags.IS_COLD, "Cold"); translationBuilder.add(ConventionalBiomeTags.IS_COLD_OVERWORLD, "Cold Overworld"); + translationBuilder.add(ConventionalBiomeTags.IS_COLD_NETHER, "Cold Nether"); translationBuilder.add(ConventionalBiomeTags.IS_COLD_END, "Cold End"); translationBuilder.add(ConventionalBiomeTags.IS_WET, "Wet"); translationBuilder.add(ConventionalBiomeTags.IS_WET_OVERWORLD, "Wet Overworld"); + translationBuilder.add(ConventionalBiomeTags.IS_WET_NETHER, "Wet Nether"); + translationBuilder.add(ConventionalBiomeTags.IS_WET_END, "Wet End"); translationBuilder.add(ConventionalBiomeTags.IS_DRY, "Dry"); translationBuilder.add(ConventionalBiomeTags.IS_DRY_OVERWORLD, "Dry Overworld"); translationBuilder.add(ConventionalBiomeTags.IS_DRY_NETHER, "Dry Nether"); translationBuilder.add(ConventionalBiomeTags.IS_DRY_END, "Dry End"); translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_SPARSE, "Sparse Vegetation"); translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD, "Sparse Overworld Vegetation"); + translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_SPARSE_NETHER, "Sparse Nether Vegetation"); + translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_SPARSE_END, "Sparse End Vegetation"); translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_DENSE, "Dense Vegetation"); translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD, "Dense Overworld Vegetation"); + translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_DENSE_NETHER, "Dense Nether Vegetation"); + translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_DENSE_END, "Dense End Vegetation"); translationBuilder.add(ConventionalBiomeTags.IS_CONIFEROUS_TREE, "Coniferous Tree"); translationBuilder.add(ConventionalBiomeTags.IS_SAVANNA_TREE, "Savanna Tree"); translationBuilder.add(ConventionalBiomeTags.IS_JUNGLE_TREE, "Jungle Tree"); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java index a05b7d9ead..9b37e32e77 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java @@ -58,27 +58,44 @@ private ConventionalBiomeTags() { public static final TagKey IS_HOT = register("is_hot"); public static final TagKey IS_HOT_OVERWORLD = register("is_hot/overworld"); public static final TagKey IS_HOT_NETHER = register("is_hot/nether"); + public static final TagKey IS_HOT_END = register("is_hot/end"); public static final TagKey IS_TEMPERATE = register("is_temperate"); public static final TagKey IS_TEMPERATE_OVERWORLD = register("is_temperate/overworld"); + public static final TagKey IS_TEMPERATE_NETHER = register("is_temperate/nether"); + public static final TagKey IS_TEMPERATE_END = register("is_temperate/end"); public static final TagKey IS_COLD = register("is_cold"); public static final TagKey IS_COLD_OVERWORLD = register("is_cold/overworld"); + public static final TagKey IS_COLD_NETHER = register("is_cold/nether"); public static final TagKey IS_COLD_END = register("is_cold/end"); public static final TagKey IS_WET = register("is_wet"); public static final TagKey IS_WET_OVERWORLD = register("is_wet/overworld"); + public static final TagKey IS_WET_NETHER = register("is_wet/nether"); + public static final TagKey IS_WET_END = register("is_wet/end"); public static final TagKey IS_DRY = register("is_dry"); public static final TagKey IS_DRY_OVERWORLD = register("is_dry/overworld"); public static final TagKey IS_DRY_NETHER = register("is_dry/nether"); public static final TagKey IS_DRY_END = register("is_dry/end"); + /** + * If a biome has trees but spawn infrequently like a Savanna or Sparse Jungle, then the biome is considered having sparse vegetation. It does NOT mean no trees. + */ public static final TagKey IS_VEGETATION_SPARSE = register("is_sparse_vegetation"); public static final TagKey IS_VEGETATION_SPARSE_OVERWORLD = register("is_sparse_vegetation/overworld"); + public static final TagKey IS_VEGETATION_SPARSE_NETHER = register("is_sparse_vegetation/nether"); + public static final TagKey IS_VEGETATION_SPARSE_END = register("is_sparse_vegetation/end"); + /** + * If a biome has more vegetation than a regular Forest biome, then it is considered having dense vegetation. + * This is more subjective so simply do your best with classifying your biomes. + */ public static final TagKey IS_VEGETATION_DENSE = register("is_dense_vegetation"); public static final TagKey IS_VEGETATION_DENSE_OVERWORLD = register("is_dense_vegetation/overworld"); + public static final TagKey IS_VEGETATION_DENSE_NETHER = register("is_dense_vegetation/nether"); + public static final TagKey IS_VEGETATION_DENSE_END = register("is_dense_vegetation/end"); public static final TagKey IS_CONIFEROUS_TREE = register("is_tree/coniferous"); public static final TagKey IS_SAVANNA_TREE = register("is_tree/savanna"); From b70872981d3befa967fdfed4b75a1c3f3cb28f71 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 19:19:30 -0400 Subject: [PATCH 19/36] Added lush biome tag --- .../tag/convention/datagen/generators/BiomeTagGenerator.java | 2 ++ .../datagen/generators/EnglishTagLangGenerator.java | 1 + .../fabric/api/tag/convention/v2/ConventionalBiomeTags.java | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java index 63b79f508b..4d90aeccf7 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java @@ -308,6 +308,8 @@ private void generateClimateAndVegetationTags() { getOrCreateTagBuilder(ConventionalBiomeTags.IS_SAVANNA_TREE) .addOptionalTag(ConventionalBiomeTags.IS_SAVANNA); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_LUSH) + .add(BiomeKeys.LUSH_CAVES); getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLORAL) .add(BiomeKeys.SUNFLOWER_PLAINS) .add(BiomeKeys.MEADOW) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 74ee3679a0..0ad8956341 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -496,6 +496,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalBiomeTags.IS_CAVE, "Cave"); translationBuilder.add(ConventionalBiomeTags.IS_WASTELAND, "Wasteland"); translationBuilder.add(ConventionalBiomeTags.IS_DEAD, "Dead"); + translationBuilder.add(ConventionalBiomeTags.IS_LUSH, "Lush"); translationBuilder.add(ConventionalBiomeTags.IS_FLORAL, "Floral"); translationBuilder.add(ConventionalBiomeTags.IS_SNOWY, "Snowy"); translationBuilder.add(ConventionalBiomeTags.IS_ICY, "Icy"); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java index 9b37e32e77..7b41f8729f 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java @@ -158,6 +158,10 @@ private ConventionalBiomeTags() { * Biomes whose flora primarily consists of dead or decaying vegetation. */ public static final TagKey IS_DEAD = register("is_dead"); + /** + * Biomes whose flora primarily consists of vibrant thick vegetation and pools of water. Think of Lush Caves as an example. + */ + public static final TagKey IS_LUSH = register("is_lush"); /** * Biomes with a large amount of flowers. */ From 19948203dca73e0d6bc3235d98a7ff3be207ecbd Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 19:22:16 -0400 Subject: [PATCH 20/36] Added magical tag --- .../tag/convention/datagen/generators/BiomeTagGenerator.java | 1 + .../datagen/generators/EnglishTagLangGenerator.java | 1 + .../fabric/api/tag/convention/v2/ConventionalBiomeTags.java | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java index 4d90aeccf7..e5094a44d5 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java @@ -310,6 +310,7 @@ private void generateClimateAndVegetationTags() { getOrCreateTagBuilder(ConventionalBiomeTags.IS_LUSH) .add(BiomeKeys.LUSH_CAVES); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_MAGICAL); getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLORAL) .add(BiomeKeys.SUNFLOWER_PLAINS) .add(BiomeKeys.MEADOW) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 0ad8956341..3a71ba9b2e 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -497,6 +497,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalBiomeTags.IS_WASTELAND, "Wasteland"); translationBuilder.add(ConventionalBiomeTags.IS_DEAD, "Dead"); translationBuilder.add(ConventionalBiomeTags.IS_LUSH, "Lush"); + translationBuilder.add(ConventionalBiomeTags.IS_MAGICAL, "Magical"); translationBuilder.add(ConventionalBiomeTags.IS_FLORAL, "Floral"); translationBuilder.add(ConventionalBiomeTags.IS_SNOWY, "Snowy"); translationBuilder.add(ConventionalBiomeTags.IS_ICY, "Icy"); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java index 7b41f8729f..054c582e51 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java @@ -162,6 +162,10 @@ private ConventionalBiomeTags() { * Biomes whose flora primarily consists of vibrant thick vegetation and pools of water. Think of Lush Caves as an example. */ public static final TagKey IS_LUSH = register("is_lush"); + /** + * Biomes whose theme revolves around magic. Like a forest full of fairies or plants of magical abilities. + */ + public static final TagKey IS_MAGICAL = register("is_magical"); /** * Biomes with a large amount of flowers. */ From 025acf811fd13188b64da68b3ed6d9058abc7519 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 19:25:14 -0400 Subject: [PATCH 21/36] Added rare biome tag --- .../datagen/generators/BiomeTagGenerator.java | 14 ++++++++++++++ .../generators/EnglishTagLangGenerator.java | 1 + .../tag/convention/v2/ConventionalBiomeTags.java | 4 ++++ 3 files changed, 19 insertions(+) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java index e5094a44d5..34cb20b164 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java @@ -311,6 +311,20 @@ private void generateClimateAndVegetationTags() { getOrCreateTagBuilder(ConventionalBiomeTags.IS_LUSH) .add(BiomeKeys.LUSH_CAVES); getOrCreateTagBuilder(ConventionalBiomeTags.IS_MAGICAL); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_RARE) + .add(BiomeKeys.SUNFLOWER_PLAINS) + .add(BiomeKeys.FLOWER_FOREST) + .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST) + .add(BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA) + .add(BiomeKeys.BAMBOO_JUNGLE) + .add(BiomeKeys.SPARSE_JUNGLE) + .add(BiomeKeys.ERODED_BADLANDS) + .add(BiomeKeys.SAVANNA_PLATEAU) + .add(BiomeKeys.WINDSWEPT_SAVANNA) + .add(BiomeKeys.ICE_SPIKES) + .add(BiomeKeys.WINDSWEPT_GRAVELLY_HILLS) + .add(BiomeKeys.MUSHROOM_FIELDS) + .add(BiomeKeys.DEEP_DARK); getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLORAL) .add(BiomeKeys.SUNFLOWER_PLAINS) .add(BiomeKeys.MEADOW) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 3a71ba9b2e..9601143cc5 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -498,6 +498,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalBiomeTags.IS_DEAD, "Dead"); translationBuilder.add(ConventionalBiomeTags.IS_LUSH, "Lush"); translationBuilder.add(ConventionalBiomeTags.IS_MAGICAL, "Magical"); + translationBuilder.add(ConventionalBiomeTags.IS_RARE, "Rare"); translationBuilder.add(ConventionalBiomeTags.IS_FLORAL, "Floral"); translationBuilder.add(ConventionalBiomeTags.IS_SNOWY, "Snowy"); translationBuilder.add(ConventionalBiomeTags.IS_ICY, "Icy"); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java index 054c582e51..012f5a23a8 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java @@ -166,6 +166,10 @@ private ConventionalBiomeTags() { * Biomes whose theme revolves around magic. Like a forest full of fairies or plants of magical abilities. */ public static final TagKey IS_MAGICAL = register("is_magical"); + /** + * Intended for biomes that spawns infrequently and can be difficult to find. + */ + public static final TagKey IS_RARE = register("is_rare"); /** * Biomes with a large amount of flowers. */ From 2fcd4d7b4c61cd0c8053e5fa285a2172afc8d586 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 19:27:28 -0400 Subject: [PATCH 22/36] Added plateau tag --- .../tag/convention/datagen/generators/BiomeTagGenerator.java | 5 +++++ .../datagen/generators/EnglishTagLangGenerator.java | 1 + .../fabric/api/tag/convention/v2/ConventionalBiomeTags.java | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java index 34cb20b164..517bc77d6b 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java @@ -325,6 +325,11 @@ private void generateClimateAndVegetationTags() { .add(BiomeKeys.WINDSWEPT_GRAVELLY_HILLS) .add(BiomeKeys.MUSHROOM_FIELDS) .add(BiomeKeys.DEEP_DARK); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_PLATEAU) + .add(BiomeKeys.WOODED_BADLANDS) + .add(BiomeKeys.SAVANNA_PLATEAU) + .add(BiomeKeys.CHERRY_GROVE) + .add(BiomeKeys.MEADOW); getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLORAL) .add(BiomeKeys.SUNFLOWER_PLAINS) .add(BiomeKeys.MEADOW) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 9601143cc5..793d9eff84 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -499,6 +499,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalBiomeTags.IS_LUSH, "Lush"); translationBuilder.add(ConventionalBiomeTags.IS_MAGICAL, "Magical"); translationBuilder.add(ConventionalBiomeTags.IS_RARE, "Rare"); + translationBuilder.add(ConventionalBiomeTags.IS_PLATEAU, "Plateau"); translationBuilder.add(ConventionalBiomeTags.IS_FLORAL, "Floral"); translationBuilder.add(ConventionalBiomeTags.IS_SNOWY, "Snowy"); translationBuilder.add(ConventionalBiomeTags.IS_ICY, "Icy"); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java index 012f5a23a8..e07ae2da0f 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java @@ -170,6 +170,10 @@ private ConventionalBiomeTags() { * Intended for biomes that spawns infrequently and can be difficult to find. */ public static final TagKey IS_RARE = register("is_rare"); + /** + * Biomes that spawn as a flat-topped hill often. + */ + public static final TagKey IS_PLATEAU = register("is_plateau"); /** * Biomes with a large amount of flowers. */ From 38efc6b8bc5a539d8f817c6570229e820d9f63b6 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 19:35:29 -0400 Subject: [PATCH 23/36] added spooky biome tag --- .../tag/convention/datagen/generators/BiomeTagGenerator.java | 3 +++ .../datagen/generators/EnglishTagLangGenerator.java | 1 + .../fabric/api/tag/convention/v2/ConventionalBiomeTags.java | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java index 517bc77d6b..9fc3d4b61e 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java @@ -330,6 +330,9 @@ private void generateClimateAndVegetationTags() { .add(BiomeKeys.SAVANNA_PLATEAU) .add(BiomeKeys.CHERRY_GROVE) .add(BiomeKeys.MEADOW); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_SPOOKY) + .add(BiomeKeys.DARK_FOREST) + .add(BiomeKeys.DEEP_DARK); getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLORAL) .add(BiomeKeys.SUNFLOWER_PLAINS) .add(BiomeKeys.MEADOW) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 793d9eff84..bfa7235ea3 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -500,6 +500,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalBiomeTags.IS_MAGICAL, "Magical"); translationBuilder.add(ConventionalBiomeTags.IS_RARE, "Rare"); translationBuilder.add(ConventionalBiomeTags.IS_PLATEAU, "Plateau"); + translationBuilder.add(ConventionalBiomeTags.IS_SPOOKY, "Spooky"); translationBuilder.add(ConventionalBiomeTags.IS_FLORAL, "Floral"); translationBuilder.add(ConventionalBiomeTags.IS_SNOWY, "Snowy"); translationBuilder.add(ConventionalBiomeTags.IS_ICY, "Icy"); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java index e07ae2da0f..0bec7a6d34 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java @@ -174,6 +174,10 @@ private ConventionalBiomeTags() { * Biomes that spawn as a flat-topped hill often. */ public static final TagKey IS_PLATEAU = register("is_plateau"); + /** + * For biomes that are intended to be creepy or scary. For example, see Deep Dark biome or Dark Forest biome. + */ + public static final TagKey IS_SPOOKY = register("is_spooky"); /** * Biomes with a large amount of flowers. */ From 7653b61872c8f5e78fbfed084bd82ffd9948612b Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 19:37:52 -0400 Subject: [PATCH 24/36] Added sandy tag --- .../convention/datagen/generators/BiomeTagGenerator.java | 6 ++++++ .../datagen/generators/EnglishTagLangGenerator.java | 1 + .../fabric/api/tag/convention/v2/ConventionalBiomeTags.java | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java index 9fc3d4b61e..c9740a14a5 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java @@ -78,6 +78,12 @@ private void generateCategoryTags() { .add(BiomeKeys.FROZEN_RIVER) .add(BiomeKeys.DEEP_FROZEN_OCEAN) .add(BiomeKeys.FROZEN_OCEAN); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_SANDY) + .add(BiomeKeys.DESERT) + .add(BiomeKeys.BADLANDS) + .add(BiomeKeys.WOODED_BADLANDS) + .add(BiomeKeys.ERODED_BADLANDS) + .add(BiomeKeys.BEACH); getOrCreateTagBuilder(ConventionalBiomeTags.IS_SNOWY) .add(BiomeKeys.SNOWY_BEACH) .add(BiomeKeys.SNOWY_PLAINS) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index bfa7235ea3..4a2ce25d96 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -502,6 +502,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalBiomeTags.IS_PLATEAU, "Plateau"); translationBuilder.add(ConventionalBiomeTags.IS_SPOOKY, "Spooky"); translationBuilder.add(ConventionalBiomeTags.IS_FLORAL, "Floral"); + translationBuilder.add(ConventionalBiomeTags.IS_SANDY, "Sandy"); translationBuilder.add(ConventionalBiomeTags.IS_SNOWY, "Snowy"); translationBuilder.add(ConventionalBiomeTags.IS_ICY, "Icy"); translationBuilder.add(ConventionalBiomeTags.IS_AQUATIC, "Aquatic"); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java index 0bec7a6d34..412dd5e281 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java @@ -182,6 +182,10 @@ private ConventionalBiomeTags() { * Biomes with a large amount of flowers. */ public static final TagKey IS_FLORAL = register("is_floral"); + /** + * Biomes that are able to spawn sand-based blocks on the surface. + */ + public static final TagKey IS_SANDY = register("is_sandy"); /** * For biomes that contains lots of naturally spawned snow. * For biomes where lot of ice is present, see {@link ConventionalBiomeTags#IS_ICY}. From 60a6414f87606a7e2fb60f8a2a00071e183241c0 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 19:41:20 -0400 Subject: [PATCH 25/36] Fixed checkstyle issues --- .../fabric/api/tag/convention/v2/ConventionalBiomeTags.java | 4 ++-- .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java index 412dd5e281..438df5684a 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java @@ -86,7 +86,7 @@ private ConventionalBiomeTags() { public static final TagKey IS_VEGETATION_SPARSE = register("is_sparse_vegetation"); public static final TagKey IS_VEGETATION_SPARSE_OVERWORLD = register("is_sparse_vegetation/overworld"); public static final TagKey IS_VEGETATION_SPARSE_NETHER = register("is_sparse_vegetation/nether"); - public static final TagKey IS_VEGETATION_SPARSE_END = register("is_sparse_vegetation/end"); + public static final TagKey IS_VEGETATION_SPARSE_END = register("is_sparse_vegetation/end"); /** * If a biome has more vegetation than a regular Forest biome, then it is considered having dense vegetation. @@ -95,7 +95,7 @@ private ConventionalBiomeTags() { public static final TagKey IS_VEGETATION_DENSE = register("is_dense_vegetation"); public static final TagKey IS_VEGETATION_DENSE_OVERWORLD = register("is_dense_vegetation/overworld"); public static final TagKey IS_VEGETATION_DENSE_NETHER = register("is_dense_vegetation/nether"); - public static final TagKey IS_VEGETATION_DENSE_END = register("is_dense_vegetation/end"); + public static final TagKey IS_VEGETATION_DENSE_END = register("is_dense_vegetation/end"); public static final TagKey IS_CONIFEROUS_TREE = register("is_tree/coniferous"); public static final TagKey IS_SAVANNA_TREE = register("is_tree/savanna"); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index e0c9d3a0ae..c8107e4b58 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -16,7 +16,6 @@ package net.fabricmc.fabric.api.tag.convention.v2; -import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.registry.tag.BlockTags; import net.minecraft.registry.tag.ItemTags; From 611b66e57895d3ead878f61126830c79a6d2ef0d Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 19:54:42 -0400 Subject: [PATCH 26/36] Run datagen --- .../fabric-convention-tags-v2/lang/en_us.json | 96 +++++++++++++++++++ .../resources/data/c/tags/block/chests.json | 3 +- .../data/c/tags/block/chests/ender.json | 5 + .../data/c/tags/block/chests/trapped.json | 5 + .../data/c/tags/block/cobblestones.json | 20 +++- .../c/tags/block/cobblestones/deepslate.json | 5 + .../c/tags/block/cobblestones/infested.json | 5 + .../data/c/tags/block/cobblestones/mossy.json | 5 + .../c/tags/block/cobblestones/normal.json | 5 + .../data/c/tags/block/end_stones.json | 5 + .../data/c/tags/block/fence_gates.json | 8 ++ .../data/c/tags/block/fence_gates/wooden.json | 15 +++ .../resources/data/c/tags/block/fences.json | 12 +++ .../c/tags/block/fences/nether_brick.json | 5 + .../data/c/tags/block/fences/wooden.json | 15 +++ .../resources/data/c/tags/block/gravels.json | 5 + .../data/c/tags/block/netherracks.json | 5 + .../block/ore_bearing_ground/deepslate.json | 5 + .../block/ore_bearing_ground/netherrack.json | 5 + .../tags/block/ore_bearing_ground/stone.json | 5 + .../data/c/tags/block/ore_rates/dense.json | 10 ++ .../data/c/tags/block/ore_rates/singular.json | 16 ++++ .../data/c/tags/block/ore_rates/sparse.json | 5 + .../resources/data/c/tags/block/ores.json | 16 ++-- .../data/c/tags/block/ores/coal.json | 8 ++ .../data/c/tags/block/ores/copper.json | 8 ++ .../data/c/tags/block/ores/diamond.json | 8 ++ .../data/c/tags/block/ores/emerald.json | 8 ++ .../data/c/tags/block/ores/gold.json | 8 ++ .../data/c/tags/block/ores/iron.json | 8 ++ .../data/c/tags/block/ores/lapis.json | 8 ++ .../data/c/tags/block/ores/redstone.json | 8 ++ .../tags/block/ores_in_ground/deepslate.json | 12 +++ .../tags/block/ores_in_ground/netherrack.json | 6 ++ .../c/tags/block/ores_in_ground/stone.json | 12 +++ .../resources/data/c/tags/block/sands.json | 12 +++ .../data/c/tags/block/sands/colorless.json | 5 + .../data/c/tags/block/sands/red.json | 5 + .../resources/data/c/tags/item/bones.json | 5 + .../resources/data/c/tags/item/chests.json | 3 +- .../data/c/tags/item/chests/ender.json | 5 + .../data/c/tags/item/chests/trapped.json | 5 + .../data/c/tags/item/cobblestones.json | 20 +++- .../c/tags/item/cobblestones/deepslate.json | 5 + .../c/tags/item/cobblestones/infested.json | 5 + .../data/c/tags/item/cobblestones/mossy.json | 5 + .../data/c/tags/item/cobblestones/normal.json | 5 + .../resources/data/c/tags/item/eggs.json | 5 + .../data/c/tags/item/end_stones.json | 5 + .../resources/data/c/tags/item/feathers.json | 5 + .../data/c/tags/item/fence_gates.json | 8 ++ .../data/c/tags/item/fence_gates/wooden.json | 15 +++ .../resources/data/c/tags/item/fences.json | 12 +++ .../data/c/tags/item/fences/nether_brick.json | 5 + .../data/c/tags/item/fences/wooden.json | 15 +++ .../resources/data/c/tags/item/gravels.json | 5 + .../data/c/tags/item/gunpowders.json | 5 + .../resources/data/c/tags/item/mushrooms.json | 6 ++ .../data/c/tags/item/nether_stars.json | 5 + .../data/c/tags/item/netherracks.json | 5 + .../item/ore_bearing_ground/deepslate.json | 5 + .../item/ore_bearing_ground/netherrack.json | 5 + .../c/tags/item/ore_bearing_ground/stone.json | 5 + .../data/c/tags/item/ore_rates/dense.json | 10 ++ .../data/c/tags/item/ore_rates/singular.json | 16 ++++ .../data/c/tags/item/ore_rates/sparse.json | 5 + .../resources/data/c/tags/item/ores.json | 24 ++--- .../resources/data/c/tags/item/ores/coal.json | 8 ++ .../data/c/tags/item/ores/copper.json | 8 ++ .../data/c/tags/item/ores/diamond.json | 8 ++ .../data/c/tags/item/ores/emerald.json | 8 ++ .../resources/data/c/tags/item/ores/gold.json | 8 ++ .../resources/data/c/tags/item/ores/iron.json | 8 ++ .../data/c/tags/item/ores/lapis.json | 8 ++ .../data/c/tags/item/ores/quartz.json | 6 +- .../data/c/tags/item/ores/redstone.json | 8 ++ .../c/tags/item/ores_in_ground/deepslate.json | 12 +++ .../tags/item/ores_in_ground/netherrack.json | 6 ++ .../c/tags/item/ores_in_ground/stone.json | 12 +++ .../resources/data/c/tags/item/sands.json | 12 +++ .../data/c/tags/item/sands/colorless.json | 5 + .../resources/data/c/tags/item/sands/red.json | 5 + .../resources/data/c/tags/item/seeds.json | 24 +++++ .../data/c/tags/item/seeds/beetroot.json | 5 + .../data/c/tags/item/seeds/melon.json | 5 + .../data/c/tags/item/seeds/pumpkin.json | 5 + .../data/c/tags/item/seeds/torchflower.json | 5 + .../data/c/tags/item/seeds/wheat.json | 5 + .../data/c/tags/worldgen/biome/is_cold.json | 4 +- .../c/tags/worldgen/biome/is_cold/nether.json | 3 + .../worldgen/biome/is_dense_vegetation.json | 8 ++ .../biome/is_dense_vegetation/end.json | 3 + .../biome/is_dense_vegetation/nether.json | 3 + .../data/c/tags/worldgen/biome/is_hot.json | 3 +- .../c/tags/worldgen/biome/is_hot/end.json | 3 + .../tags/worldgen/biome/is_hot/overworld.json | 1 - .../data/c/tags/worldgen/biome/is_lush.json | 5 + .../c/tags/worldgen/biome/is_magical.json | 3 + .../c/tags/worldgen/biome/is_plateau.json | 8 ++ .../data/c/tags/worldgen/biome/is_rare.json | 17 ++++ .../data/c/tags/worldgen/biome/is_sandy.json | 9 ++ .../worldgen/biome/is_sparse_vegetation.json | 8 ++ .../biome/is_sparse_vegetation/end.json | 3 + .../biome/is_sparse_vegetation/nether.json | 3 + .../data/c/tags/worldgen/biome/is_spooky.json | 6 ++ .../c/tags/worldgen/biome/is_temperate.json | 4 +- .../tags/worldgen/biome/is_temperate/end.json | 3 + .../worldgen/biome/is_temperate/nether.json | 3 + .../biome/is_temperate/overworld.json | 15 +-- .../data/c/tags/worldgen/biome/is_wet.json | 4 +- .../c/tags/worldgen/biome/is_wet/end.json | 3 + .../c/tags/worldgen/biome/is_wet/nether.json | 3 + 112 files changed, 871 insertions(+), 46 deletions(-) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/chests/ender.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/chests/trapped.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones/deepslate.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones/infested.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones/mossy.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones/normal.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/end_stones.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fence_gates.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fence_gates/wooden.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fences.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fences/nether_brick.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fences/wooden.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/gravels.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/netherracks.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_bearing_ground/deepslate.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_bearing_ground/netherrack.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_bearing_ground/stone.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_rates/dense.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_rates/singular.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_rates/sparse.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/coal.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/copper.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/diamond.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/emerald.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/gold.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/iron.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/lapis.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/redstone.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores_in_ground/deepslate.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores_in_ground/netherrack.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores_in_ground/stone.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/sands.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/sands/colorless.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/sands/red.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/bones.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/chests/ender.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/chests/trapped.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones/deepslate.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones/infested.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones/mossy.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones/normal.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/eggs.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/end_stones.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/feathers.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fence_gates.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fence_gates/wooden.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fences.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fences/nether_brick.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fences/wooden.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/gravels.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/gunpowders.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/mushrooms.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/nether_stars.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/netherracks.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_bearing_ground/deepslate.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_bearing_ground/netherrack.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_bearing_ground/stone.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_rates/dense.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_rates/singular.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_rates/sparse.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/coal.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/copper.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/diamond.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/emerald.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/gold.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/iron.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/lapis.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/redstone.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores_in_ground/deepslate.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores_in_ground/netherrack.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores_in_ground/stone.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/sands.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/sands/colorless.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/sands/red.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds/beetroot.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds/melon.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds/pumpkin.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds/torchflower.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds/wheat.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold/nether.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation/end.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation/nether.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/end.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_lush.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_magical.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_plateau.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_rare.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sandy.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/end.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/nether.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_spooky.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/end.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/nether.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet/end.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet/nether.json diff --git a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json index 058d1ddaaa..d16abc1d92 100644 --- a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json +++ b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json @@ -6,9 +6,15 @@ "tag.block.c.buds": "Buds", "tag.block.c.chains": "Chains", "tag.block.c.chests": "Chests", + "tag.block.c.chests.ender": "Ender Chests", + "tag.block.c.chests.trapped": "Trapped Chests", "tag.block.c.chests.wooden": "Wooden Chests", "tag.block.c.clusters": "Clusters", "tag.block.c.cobblestones": "Cobblestones", + "tag.block.c.cobblestones.deepslate": "Deepslate Cobblestones", + "tag.block.c.cobblestones.infested": "Infested Cobblestones", + "tag.block.c.cobblestones.mossy": "Mossy Cobblestones", + "tag.block.c.cobblestones.normal": "Normal Cobblestones", "tag.block.c.concrete": "Concrete", "tag.block.c.concretes": "Concretes", "tag.block.c.dyed": "Dyed Blocks", @@ -28,6 +34,12 @@ "tag.block.c.dyed.red": "Red Dyed Blocks", "tag.block.c.dyed.white": "White Dyed Blocks", "tag.block.c.dyed.yellow": "Yellow Dyed Blocks", + "tag.block.c.end_stones": "End Stones", + "tag.block.c.fence_gates": "Fence Gates", + "tag.block.c.fence_gates.wooden": "Wooden Fence Gates", + "tag.block.c.fences": "Fences", + "tag.block.c.fences.nether_brick": "Nether Brick Fences", + "tag.block.c.fences.wooden": "Wooden Fences", "tag.block.c.glass_blocks": "Glass Blocks", "tag.block.c.glass_blocks.cheap": "Cheap Glass Blocks", "tag.block.c.glass_blocks.colorless": "Colorless Glass Blocks", @@ -36,17 +48,39 @@ "tag.block.c.glass_panes.colorless": "Colorless Glass Panes", "tag.block.c.glazed_terracotta": "Glazed Terracotta", "tag.block.c.glazed_terracottas": "Glazed Terracottas", + "tag.block.c.gravels": "Gravels", "tag.block.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers", + "tag.block.c.netherracks": "Netherracks", "tag.block.c.obsidians": "Obsidians", "tag.block.c.obsidians.crying": "Crying Obsidians", "tag.block.c.obsidians.normal": "Normal Obsidians", + "tag.block.c.ore_bearing_ground.deepslate": "Deepslate Ore Bearing Ground", + "tag.block.c.ore_bearing_ground.netherrack": "Netherrack Ore Bearing Ground", + "tag.block.c.ore_bearing_ground.stone": "Stone Ore Bearing Ground", + "tag.block.c.ore_rates.dense": "Dense Ore Rates", + "tag.block.c.ore_rates.singular": "Singular Ore Rates", + "tag.block.c.ore_rates.sparse": "Sparse Ore Rates", "tag.block.c.ores": "Ores", + "tag.block.c.ores.coal": "Coal Ores", + "tag.block.c.ores.copper": "Copper Ores", + "tag.block.c.ores.diamond": "Diamond Ores", + "tag.block.c.ores.emerald": "Emerald Ores", + "tag.block.c.ores.gold": "Gold Ores", + "tag.block.c.ores.iron": "Iron Ores", + "tag.block.c.ores.lapis": "Lapis Ores", "tag.block.c.ores.netherite_scrap": "Netherite Scrap Ores", "tag.block.c.ores.quartz": "Quartz Ores", + "tag.block.c.ores.redstone": "Redstone Ores", + "tag.block.c.ores_in_ground.deepslate": "Deepslate Ores In Ground", + "tag.block.c.ores_in_ground.netherrack": "Netherrack Ores In Ground", + "tag.block.c.ores_in_ground.stone": "Stone Ores In Ground", "tag.block.c.player_workstations.crafting_tables": "Crafting Tables", "tag.block.c.player_workstations.furnaces": "Furnaces", "tag.block.c.relocation_not_supported": "Relocation Not Supported", "tag.block.c.ropes": "Ropes", + "tag.block.c.sands": "Sands", + "tag.block.c.sands.colorless": "Colorless Sands", + "tag.block.c.sands.red": "Red Sands", "tag.block.c.sandstone.blocks": "Sandstone Blocks", "tag.block.c.sandstone.red_blocks": "Red Sandstone Blocks", "tag.block.c.sandstone.red_slabs": "Red Sandstone Slabs", @@ -97,6 +131,7 @@ "tag.item.c.armors": "Armors", "tag.item.c.barrels": "Barrels", "tag.item.c.barrels.wooden": "Wooden Barrels", + "tag.item.c.bones": "Bones", "tag.item.c.bookshelves": "Bookshelves", "tag.item.c.bricks": "Bricks", "tag.item.c.bricks.nether": "Nether Bricks", @@ -112,10 +147,16 @@ "tag.item.c.buds": "Buds", "tag.item.c.chains": "Chains", "tag.item.c.chests": "Chests", + "tag.item.c.chests.ender": "Ender Chests", + "tag.item.c.chests.trapped": "Trapped Chests", "tag.item.c.chests.wooden": "Wooden Chests", "tag.item.c.clusters": "Clusters", "tag.item.c.coal": "Coal", "tag.item.c.cobblestones": "Cobblestones", + "tag.item.c.cobblestones.deepslate": "Deepslate Cobblestones", + "tag.item.c.cobblestones.infested": "Infested Cobblestones", + "tag.item.c.cobblestones.mossy": "Mossy Cobblestones", + "tag.item.c.cobblestones.normal": "Normal Cobblestones", "tag.item.c.concrete": "Concrete", "tag.item.c.concrete_powder": "Concrete Powder", "tag.item.c.concrete_powders": "Concrete Powders", @@ -168,8 +209,16 @@ "tag.item.c.dyes.red": "Red Dyes", "tag.item.c.dyes.white": "White Dyes", "tag.item.c.dyes.yellow": "Yellow Dyes", + "tag.item.c.eggs": "Eggs", "tag.item.c.enchantables": "Enchantables", + "tag.item.c.end_stones": "End Stones", "tag.item.c.ender_pearls": "Ender Pearls", + "tag.item.c.feathers": "Feathers", + "tag.item.c.fence_gates": "Fence Gates", + "tag.item.c.fence_gates.wooden": "Wooden Fence Gates", + "tag.item.c.fences": "Fences", + "tag.item.c.fences.nether_brick": "Nether Brick Fences", + "tag.item.c.fences.wooden": "Wooden Fences", "tag.item.c.fertilizers": "Fertilizers", "tag.item.c.foods": "Foods", "tag.item.c.foods.berries": "Berries", @@ -212,6 +261,8 @@ "tag.item.c.glass_panes.colorless": "Colorless Glass Panes", "tag.item.c.glazed_terracotta": "Glazed Terracotta", "tag.item.c.glazed_terracottas": "Glazed Terracottas", + "tag.item.c.gravels": "Gravels", + "tag.item.c.gunpowders": "Gunpowders", "tag.item.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers", "tag.item.c.ingots": "Ingots", "tag.item.c.ingots.copper": "Copper Ingots", @@ -219,16 +270,36 @@ "tag.item.c.ingots.iron": "Iron Ingots", "tag.item.c.ingots.netherite": "Netherite Ingots", "tag.item.c.leathers": "Leathers", + "tag.item.c.mushrooms": "Mushrooms", "tag.item.c.music_discs": "Music Discs", + "tag.item.c.nether_stars": "Nether Stars", + "tag.item.c.netherracks": "Netherracks", "tag.item.c.nuggets": "Nuggets", "tag.item.c.nuggets.gold": "Gold Nuggets", "tag.item.c.nuggets.iron": "Iron Nuggets", "tag.item.c.obsidians": "Obsidians", "tag.item.c.obsidians.crying": "Crying Obsidians", "tag.item.c.obsidians.normal": "Normal Obsidians", + "tag.item.c.ore_bearing_ground.deepslate": "Deepslate Ore Bearing Ground", + "tag.item.c.ore_bearing_ground.netherrack": "Netherrack Ore Bearing Ground", + "tag.item.c.ore_bearing_ground.stone": "Stone Ore Bearing Ground", + "tag.item.c.ore_rates.dense": "Dense Ore Rates", + "tag.item.c.ore_rates.singular": "Singular Ore Rates", + "tag.item.c.ore_rates.sparse": "Sparse Ore Rates", "tag.item.c.ores": "Ores", + "tag.item.c.ores.coal": "Coal Ores", + "tag.item.c.ores.copper": "Copper Ores", + "tag.item.c.ores.diamond": "Diamond Ores", + "tag.item.c.ores.emerald": "Emerald Ores", + "tag.item.c.ores.gold": "Gold Ores", + "tag.item.c.ores.iron": "Iron Ores", + "tag.item.c.ores.lapis": "Lapis Ores", "tag.item.c.ores.netherite_scrap": "Netherite Scrap Ores", "tag.item.c.ores.quartz": "Quartz Ores", + "tag.item.c.ores.redstone": "Redstone Ores", + "tag.item.c.ores_in_ground.deepslate": "Deepslate Ores In Ground", + "tag.item.c.ores_in_ground.netherrack": "Netherrack Ores In Ground", + "tag.item.c.ores_in_ground.stone": "Stone Ores In Ground", "tag.item.c.player_workstations.crafting_tables": "Crafting Tables", "tag.item.c.player_workstations.furnaces": "Furnaces", "tag.item.c.potions": "Potions", @@ -245,6 +316,9 @@ "tag.item.c.rods.breeze": "Breeze Rods", "tag.item.c.rods.wooden": "Wooden Rods", "tag.item.c.ropes": "Ropes", + "tag.item.c.sands": "Sands", + "tag.item.c.sands.colorless": "Colorless Sands", + "tag.item.c.sands.red": "Red Sands", "tag.item.c.sandstone.blocks": "Sandstone Blocks", "tag.item.c.sandstone.red_blocks": "Red Sandstone Blocks", "tag.item.c.sandstone.red_slabs": "Red Sandstone Slabs", @@ -254,6 +328,12 @@ "tag.item.c.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", "tag.item.c.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", "tag.item.c.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", + "tag.item.c.seeds": "Seeds", + "tag.item.c.seeds.beetroot": "Beetroot Seeds", + "tag.item.c.seeds.melon": "Melon Seeds", + "tag.item.c.seeds.pumpkin": "Pumpkin Seeds", + "tag.item.c.seeds.torchflower": "Torchflower Seeds", + "tag.item.c.seeds.wheat": "Wheat Seeds", "tag.item.c.shulker_boxes": "Shulker Boxes", "tag.item.c.slime_balls": "Slimeballs", "tag.item.c.stones": "Stones", @@ -308,10 +388,13 @@ "tag.worldgen.biome.c.is_cave": "Cave", "tag.worldgen.biome.c.is_cold": "Cold", "tag.worldgen.biome.c.is_cold.end": "Cold End", + "tag.worldgen.biome.c.is_cold.nether": "Cold Nether", "tag.worldgen.biome.c.is_cold.overworld": "Cold Overworld", "tag.worldgen.biome.c.is_dead": "Dead", "tag.worldgen.biome.c.is_deep_ocean": "Deep Ocean", "tag.worldgen.biome.c.is_dense_vegetation": "Dense Vegetation", + "tag.worldgen.biome.c.is_dense_vegetation.end": "Dense End Vegetation", + "tag.worldgen.biome.c.is_dense_vegetation.nether": "Dense Nether Vegetation", "tag.worldgen.biome.c.is_dense_vegetation.overworld": "Dense Overworld Vegetation", "tag.worldgen.biome.c.is_desert": "Desert", "tag.worldgen.biome.c.is_dry": "Dry", @@ -324,10 +407,13 @@ "tag.worldgen.biome.c.is_forest": "Forest", "tag.worldgen.biome.c.is_hill": "Hills", "tag.worldgen.biome.c.is_hot": "Hot", + "tag.worldgen.biome.c.is_hot.end": "Hot End", "tag.worldgen.biome.c.is_hot.nether": "Hot Nether", "tag.worldgen.biome.c.is_hot.overworld": "Hot Overworld", "tag.worldgen.biome.c.is_icy": "Icy", "tag.worldgen.biome.c.is_jungle": "Jungle", + "tag.worldgen.biome.c.is_lush": "Lush", + "tag.worldgen.biome.c.is_magical": "Magical", "tag.worldgen.biome.c.is_mountain": "Mountain", "tag.worldgen.biome.c.is_mountain.peak": "Mountain Peak", "tag.worldgen.biome.c.is_mountain.slope": "Mountain Slope", @@ -339,17 +425,25 @@ "tag.worldgen.biome.c.is_outer_end_island": "Outer End Island", "tag.worldgen.biome.c.is_overworld": "Overworld", "tag.worldgen.biome.c.is_plains": "Plains", + "tag.worldgen.biome.c.is_plateau": "Plateau", + "tag.worldgen.biome.c.is_rare": "Rare", "tag.worldgen.biome.c.is_river": "River", + "tag.worldgen.biome.c.is_sandy": "Sandy", "tag.worldgen.biome.c.is_savanna": "Savanna", "tag.worldgen.biome.c.is_shallow_ocean": "Shallow Ocean", "tag.worldgen.biome.c.is_snowy": "Snowy", "tag.worldgen.biome.c.is_snowy_plains": "Snowy Plains", "tag.worldgen.biome.c.is_sparse_vegetation": "Sparse Vegetation", + "tag.worldgen.biome.c.is_sparse_vegetation.end": "Sparse End Vegetation", + "tag.worldgen.biome.c.is_sparse_vegetation.nether": "Sparse Nether Vegetation", "tag.worldgen.biome.c.is_sparse_vegetation.overworld": "Sparse Overworld Vegetation", + "tag.worldgen.biome.c.is_spooky": "Spooky", "tag.worldgen.biome.c.is_stony_shores": "Stony Shores", "tag.worldgen.biome.c.is_swamp": "Swamp", "tag.worldgen.biome.c.is_taiga": "Taiga", "tag.worldgen.biome.c.is_temperate": "Temperate", + "tag.worldgen.biome.c.is_temperate.end": "Temperate End", + "tag.worldgen.biome.c.is_temperate.nether": "Temperate Nether", "tag.worldgen.biome.c.is_temperate.overworld": "Temperate Overworld", "tag.worldgen.biome.c.is_tree.coniferous": "Coniferous Tree", "tag.worldgen.biome.c.is_tree.deciduous": "Deciduous Tree", @@ -359,6 +453,8 @@ "tag.worldgen.biome.c.is_void": "Void", "tag.worldgen.biome.c.is_wasteland": "Wasteland", "tag.worldgen.biome.c.is_wet": "Wet", + "tag.worldgen.biome.c.is_wet.end": "Wet End", + "tag.worldgen.biome.c.is_wet.nether": "Wet Nether", "tag.worldgen.biome.c.is_wet.overworld": "Wet Overworld", "tag.worldgen.biome.c.is_windswept": "Windswept", "tag.worldgen.biome.c.no_default_monsters": "No Default Monsters", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/chests.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/chests.json index d1092146bd..8d4e985033 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/chests.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/chests.json @@ -1,6 +1,7 @@ { "values": [ "#c:chests/wooden", - "minecraft:ender_chest" + "#c:chests/trapped", + "#c:chests/ender" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/chests/ender.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/chests/ender.json new file mode 100644 index 0000000000..8c0af53136 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/chests/ender.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:ender_chest" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/chests/trapped.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/chests/trapped.json new file mode 100644 index 0000000000..f8924f5a05 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/chests/trapped.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:trapped_chest" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones.json index 9efe7a63ec..f1637dccdb 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones.json @@ -1,8 +1,20 @@ { "values": [ - "minecraft:cobblestone", - "minecraft:mossy_cobblestone", - "minecraft:cobbled_deepslate", - "minecraft:infested_cobblestone" + { + "id": "#c:cobblestones/normal", + "required": false + }, + { + "id": "#c:cobblestones/mossy", + "required": false + }, + { + "id": "#c:cobblestones/infested", + "required": false + }, + { + "id": "#c:cobblestones/deepslate", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones/deepslate.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones/deepslate.json new file mode 100644 index 0000000000..75f1ba31f4 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones/deepslate.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:cobbled_deepslate" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones/infested.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones/infested.json new file mode 100644 index 0000000000..a1d276601e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones/infested.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:infested_cobblestone" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones/mossy.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones/mossy.json new file mode 100644 index 0000000000..c32be6c962 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones/mossy.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:mossy_cobblestone" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones/normal.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones/normal.json new file mode 100644 index 0000000000..dac674da5d --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones/normal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:cobblestone" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/end_stones.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/end_stones.json new file mode 100644 index 0000000000..f2d11375bc --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/end_stones.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:end_stone" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fence_gates.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fence_gates.json new file mode 100644 index 0000000000..f8bdd85de0 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fence_gates.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#c:fence_gates/wooden", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fence_gates/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fence_gates/wooden.json new file mode 100644 index 0000000000..88a130fa50 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fence_gates/wooden.json @@ -0,0 +1,15 @@ +{ + "values": [ + "minecraft:oak_fence_gate", + "minecraft:spruce_fence_gate", + "minecraft:birch_fence_gate", + "minecraft:jungle_fence_gate", + "minecraft:acacia_fence_gate", + "minecraft:dark_oak_fence_gate", + "minecraft:crimson_fence_gate", + "minecraft:warped_fence_gate", + "minecraft:mangrove_fence_gate", + "minecraft:bamboo_fence_gate", + "minecraft:cherry_fence_gate" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fences.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fences.json new file mode 100644 index 0000000000..7a790f3937 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fences.json @@ -0,0 +1,12 @@ +{ + "values": [ + { + "id": "#c:fences/wooden", + "required": false + }, + { + "id": "#c:fences/nether_brick", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fences/nether_brick.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fences/nether_brick.json new file mode 100644 index 0000000000..3f1aacfa7e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fences/nether_brick.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:nether_brick_fence" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fences/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fences/wooden.json new file mode 100644 index 0000000000..4f89951169 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fences/wooden.json @@ -0,0 +1,15 @@ +{ + "values": [ + "minecraft:oak_fence", + "minecraft:spruce_fence", + "minecraft:birch_fence", + "minecraft:jungle_fence", + "minecraft:acacia_fence", + "minecraft:dark_oak_fence", + "minecraft:crimson_fence", + "minecraft:warped_fence", + "minecraft:mangrove_fence", + "minecraft:bamboo_fence", + "minecraft:cherry_fence" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/gravels.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/gravels.json new file mode 100644 index 0000000000..f6968bff68 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/gravels.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:gravel" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/netherracks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/netherracks.json new file mode 100644 index 0000000000..daa9c66701 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/netherracks.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:netherrack" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_bearing_ground/deepslate.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_bearing_ground/deepslate.json new file mode 100644 index 0000000000..0012c241a3 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_bearing_ground/deepslate.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:deepslate" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_bearing_ground/netherrack.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_bearing_ground/netherrack.json new file mode 100644 index 0000000000..daa9c66701 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_bearing_ground/netherrack.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:netherrack" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_bearing_ground/stone.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_bearing_ground/stone.json new file mode 100644 index 0000000000..c2d7c79f3e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_bearing_ground/stone.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:stone" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_rates/dense.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_rates/dense.json new file mode 100644 index 0000000000..69cfa78343 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_rates/dense.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:copper_ore", + "minecraft:deepslate_copper_ore", + "minecraft:deepslate_lapis_ore", + "minecraft:deepslate_redstone_ore", + "minecraft:lapis_ore", + "minecraft:redstone_ore" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_rates/singular.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_rates/singular.json new file mode 100644 index 0000000000..79e0f4b9a7 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_rates/singular.json @@ -0,0 +1,16 @@ +{ + "values": [ + "minecraft:ancient_debris", + "minecraft:coal_ore", + "minecraft:deepslate_coal_ore", + "minecraft:deepslate_diamond_ore", + "minecraft:deepslate_emerald_ore", + "minecraft:deepslate_gold_ore", + "minecraft:deepslate_iron_ore", + "minecraft:diamond_ore", + "minecraft:emerald_ore", + "minecraft:gold_ore", + "minecraft:iron_ore", + "minecraft:nether_quartz_ore" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_rates/sparse.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_rates/sparse.json new file mode 100644 index 0000000000..3caf9ffe44 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ore_rates/sparse.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:nether_gold_ore" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores.json index 511230c3dc..253544ec15 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores.json @@ -1,31 +1,31 @@ { "values": [ { - "id": "#minecraft:coal_ores", + "id": "#c:ores/coal", "required": false }, { - "id": "#minecraft:copper_ores", + "id": "#c:ores/copper", "required": false }, { - "id": "#minecraft:diamond_ores", + "id": "#c:ores/diamond", "required": false }, { - "id": "#minecraft:emerald_ores", + "id": "#c:ores/emerald", "required": false }, { - "id": "#minecraft:gold_ores", + "id": "#c:ores/gold", "required": false }, { - "id": "#minecraft:iron_ores", + "id": "#c:ores/iron", "required": false }, { - "id": "#minecraft:lapis_ores", + "id": "#c:ores/lapis", "required": false }, { @@ -33,7 +33,7 @@ "required": false }, { - "id": "#minecraft:redstone_ores", + "id": "#c:ores/redstone", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/coal.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/coal.json new file mode 100644 index 0000000000..2061c40f46 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/coal.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#minecraft:coal_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/copper.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/copper.json new file mode 100644 index 0000000000..551a68371e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/copper.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#minecraft:copper_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/diamond.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/diamond.json new file mode 100644 index 0000000000..8fadaadd0c --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/diamond.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#minecraft:diamond_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/emerald.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/emerald.json new file mode 100644 index 0000000000..34c4c6671d --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/emerald.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#minecraft:emerald_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/gold.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/gold.json new file mode 100644 index 0000000000..4ebed2e2f3 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/gold.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#minecraft:gold_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/iron.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/iron.json new file mode 100644 index 0000000000..fed1536650 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/iron.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#minecraft:iron_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/lapis.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/lapis.json new file mode 100644 index 0000000000..47e3c79a96 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/lapis.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#minecraft:lapis_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/redstone.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/redstone.json new file mode 100644 index 0000000000..32c0872976 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores/redstone.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#minecraft:redstone_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores_in_ground/deepslate.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores_in_ground/deepslate.json new file mode 100644 index 0000000000..13e0c38aa1 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores_in_ground/deepslate.json @@ -0,0 +1,12 @@ +{ + "values": [ + "minecraft:deepslate_coal_ore", + "minecraft:deepslate_copper_ore", + "minecraft:deepslate_diamond_ore", + "minecraft:deepslate_emerald_ore", + "minecraft:deepslate_gold_ore", + "minecraft:deepslate_iron_ore", + "minecraft:deepslate_lapis_ore", + "minecraft:deepslate_redstone_ore" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores_in_ground/netherrack.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores_in_ground/netherrack.json new file mode 100644 index 0000000000..090233bd46 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores_in_ground/netherrack.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:nether_gold_ore", + "minecraft:nether_quartz_ore" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores_in_ground/stone.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores_in_ground/stone.json new file mode 100644 index 0000000000..568fbe7cb6 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores_in_ground/stone.json @@ -0,0 +1,12 @@ +{ + "values": [ + "minecraft:coal_ore", + "minecraft:copper_ore", + "minecraft:diamond_ore", + "minecraft:emerald_ore", + "minecraft:gold_ore", + "minecraft:iron_ore", + "minecraft:lapis_ore", + "minecraft:redstone_ore" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/sands.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/sands.json new file mode 100644 index 0000000000..c202e7f079 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/sands.json @@ -0,0 +1,12 @@ +{ + "values": [ + { + "id": "#c:sands/colorless", + "required": false + }, + { + "id": "#c:sands/red", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/sands/colorless.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/sands/colorless.json new file mode 100644 index 0000000000..af14f42f56 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/sands/colorless.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:sand" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/sands/red.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/sands/red.json new file mode 100644 index 0000000000..9934cb5bbc --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/sands/red.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:red_sand" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/bones.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/bones.json new file mode 100644 index 0000000000..5af534fcff --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/bones.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:bone" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/chests.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/chests.json index d1092146bd..8d4e985033 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/chests.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/chests.json @@ -1,6 +1,7 @@ { "values": [ "#c:chests/wooden", - "minecraft:ender_chest" + "#c:chests/trapped", + "#c:chests/ender" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/chests/ender.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/chests/ender.json new file mode 100644 index 0000000000..8c0af53136 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/chests/ender.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:ender_chest" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/chests/trapped.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/chests/trapped.json new file mode 100644 index 0000000000..f8924f5a05 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/chests/trapped.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:trapped_chest" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones.json index 9efe7a63ec..f1637dccdb 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones.json @@ -1,8 +1,20 @@ { "values": [ - "minecraft:cobblestone", - "minecraft:mossy_cobblestone", - "minecraft:cobbled_deepslate", - "minecraft:infested_cobblestone" + { + "id": "#c:cobblestones/normal", + "required": false + }, + { + "id": "#c:cobblestones/mossy", + "required": false + }, + { + "id": "#c:cobblestones/infested", + "required": false + }, + { + "id": "#c:cobblestones/deepslate", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones/deepslate.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones/deepslate.json new file mode 100644 index 0000000000..75f1ba31f4 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones/deepslate.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:cobbled_deepslate" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones/infested.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones/infested.json new file mode 100644 index 0000000000..a1d276601e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones/infested.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:infested_cobblestone" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones/mossy.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones/mossy.json new file mode 100644 index 0000000000..c32be6c962 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones/mossy.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:mossy_cobblestone" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones/normal.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones/normal.json new file mode 100644 index 0000000000..dac674da5d --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones/normal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:cobblestone" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/eggs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/eggs.json new file mode 100644 index 0000000000..cbcbec3c4e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/eggs.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:egg" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/end_stones.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/end_stones.json new file mode 100644 index 0000000000..f2d11375bc --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/end_stones.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:end_stone" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/feathers.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/feathers.json new file mode 100644 index 0000000000..8086200700 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/feathers.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:feather" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fence_gates.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fence_gates.json new file mode 100644 index 0000000000..f8bdd85de0 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fence_gates.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#c:fence_gates/wooden", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fence_gates/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fence_gates/wooden.json new file mode 100644 index 0000000000..88a130fa50 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fence_gates/wooden.json @@ -0,0 +1,15 @@ +{ + "values": [ + "minecraft:oak_fence_gate", + "minecraft:spruce_fence_gate", + "minecraft:birch_fence_gate", + "minecraft:jungle_fence_gate", + "minecraft:acacia_fence_gate", + "minecraft:dark_oak_fence_gate", + "minecraft:crimson_fence_gate", + "minecraft:warped_fence_gate", + "minecraft:mangrove_fence_gate", + "minecraft:bamboo_fence_gate", + "minecraft:cherry_fence_gate" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fences.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fences.json new file mode 100644 index 0000000000..7a790f3937 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fences.json @@ -0,0 +1,12 @@ +{ + "values": [ + { + "id": "#c:fences/wooden", + "required": false + }, + { + "id": "#c:fences/nether_brick", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fences/nether_brick.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fences/nether_brick.json new file mode 100644 index 0000000000..3f1aacfa7e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fences/nether_brick.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:nether_brick_fence" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fences/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fences/wooden.json new file mode 100644 index 0000000000..4f89951169 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fences/wooden.json @@ -0,0 +1,15 @@ +{ + "values": [ + "minecraft:oak_fence", + "minecraft:spruce_fence", + "minecraft:birch_fence", + "minecraft:jungle_fence", + "minecraft:acacia_fence", + "minecraft:dark_oak_fence", + "minecraft:crimson_fence", + "minecraft:warped_fence", + "minecraft:mangrove_fence", + "minecraft:bamboo_fence", + "minecraft:cherry_fence" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/gravels.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/gravels.json new file mode 100644 index 0000000000..f6968bff68 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/gravels.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:gravel" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/gunpowders.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/gunpowders.json new file mode 100644 index 0000000000..d5835ce7f9 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/gunpowders.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:gunpowder" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/mushrooms.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/mushrooms.json new file mode 100644 index 0000000000..9c6b047c0b --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/mushrooms.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:red_mushroom", + "minecraft:brown_mushroom" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/nether_stars.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/nether_stars.json new file mode 100644 index 0000000000..737a95d083 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/nether_stars.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:nether_star" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/netherracks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/netherracks.json new file mode 100644 index 0000000000..daa9c66701 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/netherracks.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:netherrack" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_bearing_ground/deepslate.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_bearing_ground/deepslate.json new file mode 100644 index 0000000000..0012c241a3 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_bearing_ground/deepslate.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:deepslate" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_bearing_ground/netherrack.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_bearing_ground/netherrack.json new file mode 100644 index 0000000000..daa9c66701 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_bearing_ground/netherrack.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:netherrack" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_bearing_ground/stone.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_bearing_ground/stone.json new file mode 100644 index 0000000000..c2d7c79f3e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_bearing_ground/stone.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:stone" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_rates/dense.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_rates/dense.json new file mode 100644 index 0000000000..69cfa78343 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_rates/dense.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:copper_ore", + "minecraft:deepslate_copper_ore", + "minecraft:deepslate_lapis_ore", + "minecraft:deepslate_redstone_ore", + "minecraft:lapis_ore", + "minecraft:redstone_ore" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_rates/singular.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_rates/singular.json new file mode 100644 index 0000000000..79e0f4b9a7 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_rates/singular.json @@ -0,0 +1,16 @@ +{ + "values": [ + "minecraft:ancient_debris", + "minecraft:coal_ore", + "minecraft:deepslate_coal_ore", + "minecraft:deepslate_diamond_ore", + "minecraft:deepslate_emerald_ore", + "minecraft:deepslate_gold_ore", + "minecraft:deepslate_iron_ore", + "minecraft:diamond_ore", + "minecraft:emerald_ore", + "minecraft:gold_ore", + "minecraft:iron_ore", + "minecraft:nether_quartz_ore" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_rates/sparse.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_rates/sparse.json new file mode 100644 index 0000000000..3caf9ffe44 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ore_rates/sparse.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:nether_gold_ore" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores.json index 551d210d55..253544ec15 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores.json @@ -1,31 +1,31 @@ { "values": [ { - "id": "#minecraft:coal_ores", + "id": "#c:ores/coal", "required": false }, { - "id": "#minecraft:copper_ores", + "id": "#c:ores/copper", "required": false }, { - "id": "#minecraft:diamond_ores", + "id": "#c:ores/diamond", "required": false }, { - "id": "#minecraft:emerald_ores", + "id": "#c:ores/emerald", "required": false }, { - "id": "#minecraft:gold_ores", + "id": "#c:ores/gold", "required": false }, { - "id": "#minecraft:iron_ores", + "id": "#c:ores/iron", "required": false }, { - "id": "#minecraft:lapis_ores", + "id": "#c:ores/lapis", "required": false }, { @@ -33,15 +33,7 @@ "required": false }, { - "id": "#minecraft:redstone_ores", - "required": false - }, - { - "id": "#c:ores/quartz", - "required": false - }, - { - "id": "#c:ores/netherite_scrap", + "id": "#c:ores/redstone", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/coal.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/coal.json new file mode 100644 index 0000000000..2061c40f46 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/coal.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#minecraft:coal_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/copper.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/copper.json new file mode 100644 index 0000000000..551a68371e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/copper.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#minecraft:copper_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/diamond.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/diamond.json new file mode 100644 index 0000000000..8fadaadd0c --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/diamond.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#minecraft:diamond_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/emerald.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/emerald.json new file mode 100644 index 0000000000..34c4c6671d --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/emerald.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#minecraft:emerald_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/gold.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/gold.json new file mode 100644 index 0000000000..4ebed2e2f3 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/gold.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#minecraft:gold_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/iron.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/iron.json new file mode 100644 index 0000000000..fed1536650 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/iron.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#minecraft:iron_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/lapis.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/lapis.json new file mode 100644 index 0000000000..47e3c79a96 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/lapis.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#minecraft:lapis_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/quartz.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/quartz.json index f0bc7a4657..c2416f7997 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/quartz.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/quartz.json @@ -1,5 +1,9 @@ { "values": [ - "minecraft:nether_quartz_ore" + "minecraft:nether_quartz_ore", + { + "id": "#c:quartz_ores", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/redstone.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/redstone.json new file mode 100644 index 0000000000..32c0872976 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/redstone.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#minecraft:redstone_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores_in_ground/deepslate.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores_in_ground/deepslate.json new file mode 100644 index 0000000000..13e0c38aa1 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores_in_ground/deepslate.json @@ -0,0 +1,12 @@ +{ + "values": [ + "minecraft:deepslate_coal_ore", + "minecraft:deepslate_copper_ore", + "minecraft:deepslate_diamond_ore", + "minecraft:deepslate_emerald_ore", + "minecraft:deepslate_gold_ore", + "minecraft:deepslate_iron_ore", + "minecraft:deepslate_lapis_ore", + "minecraft:deepslate_redstone_ore" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores_in_ground/netherrack.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores_in_ground/netherrack.json new file mode 100644 index 0000000000..090233bd46 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores_in_ground/netherrack.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:nether_gold_ore", + "minecraft:nether_quartz_ore" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores_in_ground/stone.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores_in_ground/stone.json new file mode 100644 index 0000000000..568fbe7cb6 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores_in_ground/stone.json @@ -0,0 +1,12 @@ +{ + "values": [ + "minecraft:coal_ore", + "minecraft:copper_ore", + "minecraft:diamond_ore", + "minecraft:emerald_ore", + "minecraft:gold_ore", + "minecraft:iron_ore", + "minecraft:lapis_ore", + "minecraft:redstone_ore" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/sands.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/sands.json new file mode 100644 index 0000000000..c202e7f079 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/sands.json @@ -0,0 +1,12 @@ +{ + "values": [ + { + "id": "#c:sands/colorless", + "required": false + }, + { + "id": "#c:sands/red", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/sands/colorless.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/sands/colorless.json new file mode 100644 index 0000000000..af14f42f56 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/sands/colorless.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:sand" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/sands/red.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/sands/red.json new file mode 100644 index 0000000000..9934cb5bbc --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/sands/red.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:red_sand" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds.json new file mode 100644 index 0000000000..a5ec0d064e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds.json @@ -0,0 +1,24 @@ +{ + "values": [ + { + "id": "#c:seeds/beetroot", + "required": false + }, + { + "id": "#c:seeds/melon", + "required": false + }, + { + "id": "#c:seeds/pumpkin", + "required": false + }, + { + "id": "#c:seeds/torchflower", + "required": false + }, + { + "id": "#c:seeds/wheat", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds/beetroot.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds/beetroot.json new file mode 100644 index 0000000000..da5a4ab7ef --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds/beetroot.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:beetroot_seeds" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds/melon.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds/melon.json new file mode 100644 index 0000000000..973c52ea12 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds/melon.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:melon_seeds" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds/pumpkin.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds/pumpkin.json new file mode 100644 index 0000000000..264c06bf04 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds/pumpkin.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:pumpkin_seeds" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds/torchflower.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds/torchflower.json new file mode 100644 index 0000000000..e02282a32c --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds/torchflower.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:torchflower_seeds" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds/wheat.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds/wheat.json new file mode 100644 index 0000000000..b90459c291 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/seeds/wheat.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:wheat_seeds" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold.json index a5684677e6..d58cc9f774 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold.json @@ -1,5 +1,7 @@ { "values": [ - "#c:is_cold/overworld" + "#c:is_cold/overworld", + "#c:is_cold/nether", + "#c:is_cold/end" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold/nether.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold/nether.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold/nether.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation.json index ac773567ac..bd663e450b 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation.json @@ -3,6 +3,14 @@ { "id": "#c:is_dense_vegetation/overworld", "required": false + }, + { + "id": "#c:is_dense_vegetation/nether", + "required": false + }, + { + "id": "#c:is_dense_vegetation/end", + "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation/end.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation/end.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation/end.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation/nether.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation/nether.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation/nether.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot.json index 91ad22241e..28dd24912a 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot.json @@ -1,6 +1,7 @@ { "values": [ "#c:is_hot/overworld", - "#c:is_hot/nether" + "#c:is_hot/nether", + "#c:is_hot/end" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/end.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/end.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/end.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json index 7f15d1ada1..92e893f5de 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json @@ -1,6 +1,5 @@ { "values": [ - "minecraft:swamp", "minecraft:mangrove_swamp", "minecraft:jungle", "minecraft:bamboo_jungle", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_lush.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_lush.json new file mode 100644 index 0000000000..14035f0a54 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_lush.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:lush_caves" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_magical.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_magical.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_magical.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_plateau.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_plateau.json new file mode 100644 index 0000000000..7228fbfd2b --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_plateau.json @@ -0,0 +1,8 @@ +{ + "values": [ + "minecraft:wooded_badlands", + "minecraft:savanna_plateau", + "minecraft:cherry_grove", + "minecraft:meadow" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_rare.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_rare.json new file mode 100644 index 0000000000..1c8ff47705 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_rare.json @@ -0,0 +1,17 @@ +{ + "values": [ + "minecraft:sunflower_plains", + "minecraft:flower_forest", + "minecraft:old_growth_birch_forest", + "minecraft:old_growth_spruce_taiga", + "minecraft:bamboo_jungle", + "minecraft:sparse_jungle", + "minecraft:eroded_badlands", + "minecraft:savanna_plateau", + "minecraft:windswept_savanna", + "minecraft:ice_spikes", + "minecraft:windswept_gravelly_hills", + "minecraft:mushroom_fields", + "minecraft:deep_dark" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sandy.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sandy.json new file mode 100644 index 0000000000..5380f1372e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sandy.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:desert", + "minecraft:badlands", + "minecraft:wooded_badlands", + "minecraft:eroded_badlands", + "minecraft:beach" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation.json index bd3b8da016..0e0f20ccd8 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation.json @@ -3,6 +3,14 @@ { "id": "#c:is_sparse_vegetation/overworld", "required": false + }, + { + "id": "#c:is_sparse_vegetation/nether", + "required": false + }, + { + "id": "#c:is_sparse_vegetation/end", + "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/end.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/end.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/end.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/nether.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/nether.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/nether.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_spooky.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_spooky.json new file mode 100644 index 0000000000..9255238fa6 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_spooky.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:dark_forest", + "minecraft:deep_dark" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate.json index 53794ed902..fe845d3378 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate.json @@ -1,5 +1,7 @@ { "values": [ - "#c:is_temperate/overworld" + "#c:is_temperate/overworld", + "#c:is_temperate/nether", + "#c:is_temperate/end" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/end.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/end.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/end.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/nether.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/nether.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/nether.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json index b1c4877cac..e6856022e8 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json @@ -1,15 +1,18 @@ { "values": [ - "minecraft:forest", + "minecraft:plains", "minecraft:sunflower_plains", - "minecraft:swamp", - "minecraft:stony_shore", - "minecraft:dark_forest", - "minecraft:windswept_forest", + "minecraft:forest", + "minecraft:flower_forest", "minecraft:birch_forest", "minecraft:old_growth_birch_forest", + "minecraft:dark_forest", + "minecraft:cherry_grove", "minecraft:meadow", - "minecraft:plains", + "minecraft:swamp", + "minecraft:beach", + "minecraft:ocean", + "minecraft:deep_ocean", { "id": "#c:climate_temperate", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet.json index bee471c87a..c451f70640 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet.json @@ -1,5 +1,7 @@ { "values": [ - "#c:is_wet/overworld" + "#c:is_wet/overworld", + "#c:is_wet/nether", + "#c:is_wet/end" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet/end.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet/end.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet/end.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet/nether.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet/nether.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet/nether.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file From 5236d2d0d63e985f003c93c09a565b6d931562c9 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 20:19:43 -0400 Subject: [PATCH 27/36] more javadoc and fixed biomes in temperature tag --- .../convention/datagen/generators/BiomeTagGenerator.java | 3 ++- .../api/tag/convention/v2/ConventionalBiomeTags.java | 9 +++++++++ .../api/tag/convention/v2/ConventionalBlockTags.java | 4 ++-- .../api/tag/convention/v2/ConventionalItemTags.java | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java index c9740a14a5..ee037a5a75 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java @@ -189,6 +189,7 @@ private void generateClimateAndVegetationTags() { .add(BiomeKeys.CHERRY_GROVE) .add(BiomeKeys.MEADOW) .add(BiomeKeys.SWAMP) + .add(BiomeKeys.MANGROVE_SWAMP) .add(BiomeKeys.BEACH) .add(BiomeKeys.OCEAN) .add(BiomeKeys.DEEP_OCEAN); @@ -200,7 +201,6 @@ private void generateClimateAndVegetationTags() { .addTag(ConventionalBiomeTags.IS_TEMPERATE_END); getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT_OVERWORLD) - .add(BiomeKeys.MANGROVE_SWAMP) .add(BiomeKeys.JUNGLE) .add(BiomeKeys.BAMBOO_JUNGLE) .add(BiomeKeys.SPARSE_JUNGLE) @@ -212,6 +212,7 @@ private void generateClimateAndVegetationTags() { .add(BiomeKeys.SAVANNA_PLATEAU) .add(BiomeKeys.WINDSWEPT_SAVANNA) .add(BiomeKeys.STONY_PEAKS) + .add(BiomeKeys.MUSHROOM_FIELDS) .add(BiomeKeys.WARM_OCEAN); getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT_NETHER) .add(BiomeKeys.NETHER_WASTES) diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java index 438df5684a..119c3589d0 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java @@ -55,16 +55,25 @@ private ConventionalBiomeTags() { */ public static final TagKey IS_OVERWORLD = register("is_overworld"); + /** + * Biomes that are between above 0.8 temperature. (Excluding 0.8) + */ public static final TagKey IS_HOT = register("is_hot"); public static final TagKey IS_HOT_OVERWORLD = register("is_hot/overworld"); public static final TagKey IS_HOT_NETHER = register("is_hot/nether"); public static final TagKey IS_HOT_END = register("is_hot/end"); + /** + * Biomes that are between 0.5 and 0.8 temperature range. (Including 0.5 and 0.8) + */ public static final TagKey IS_TEMPERATE = register("is_temperate"); public static final TagKey IS_TEMPERATE_OVERWORLD = register("is_temperate/overworld"); public static final TagKey IS_TEMPERATE_NETHER = register("is_temperate/nether"); public static final TagKey IS_TEMPERATE_END = register("is_temperate/end"); + /** + * Biomes that are between below 0.5 temperature. (Excluding 0.5) + */ public static final TagKey IS_COLD = register("is_cold"); public static final TagKey IS_COLD_OVERWORLD = register("is_cold/overworld"); public static final TagKey IS_COLD_NETHER = register("is_cold/nether"); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java index fe8dd6b27d..9039a3e332 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java @@ -209,12 +209,12 @@ private ConventionalBlockTags() { public static final TagKey ORE_BEARING_GROUND_STONE = register("ore_bearing_ground/stone"); /** * Ores which on average result in more than one resource worth of materials ignoring fortune and other modifiers. - * (example, Redstone Ore) + * (example, Copper Ore) */ public static final TagKey ORE_RATES_DENSE = register("ore_rates/dense"); /** * Ores which on average result in one resource worth of materials ignoring fortune and other modifiers. - * (Example, Coal Ore) + * (Example, Iron Ore) */ public static final TagKey ORE_RATES_SINGULAR = register("ore_rates/singular"); /** diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index c8107e4b58..5df4980ce0 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -433,12 +433,12 @@ private ConventionalItemTags() { public static final TagKey ORE_BEARING_GROUND_STONE = register("ore_bearing_ground/stone"); /** * Ores which on average result in more than one resource worth of materials ignoring fortune and other modifiers. - * (example, Redstone Ore) + * (example, Copper Ore) */ public static final TagKey ORE_RATES_DENSE = register("ore_rates/dense"); /** * Ores which on average result in one resource worth of materials ignoring fortune and other modifiers. - * (Example, Coal Ore) + * (Example, Iron Ore) */ public static final TagKey ORE_RATES_SINGULAR = register("ore_rates/singular"); /** From 63f469cf49a5e50705e475b60b3bffd9403f2e18 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 20:26:16 -0400 Subject: [PATCH 28/36] fixed typo in biome temperature tag javadoc --- .../fabric/api/tag/convention/v2/ConventionalBiomeTags.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java index 119c3589d0..2396057c0d 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java @@ -56,7 +56,7 @@ private ConventionalBiomeTags() { public static final TagKey IS_OVERWORLD = register("is_overworld"); /** - * Biomes that are between above 0.8 temperature. (Excluding 0.8) + * Biomes that are above 0.8 temperature. (Excluding 0.8) */ public static final TagKey IS_HOT = register("is_hot"); public static final TagKey IS_HOT_OVERWORLD = register("is_hot/overworld"); @@ -72,7 +72,7 @@ private ConventionalBiomeTags() { public static final TagKey IS_TEMPERATE_END = register("is_temperate/end"); /** - * Biomes that are between below 0.5 temperature. (Excluding 0.5) + * Biomes that are below 0.5 temperature. (Excluding 0.5) */ public static final TagKey IS_COLD = register("is_cold"); public static final TagKey IS_COLD_OVERWORLD = register("is_cold/overworld"); From 5d0a7ae2bc2fa52de974487dc214c1b0fd5cd014 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 20:37:26 -0400 Subject: [PATCH 29/36] attempt at potion tag javadoc --- .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index 5df4980ce0..13e9cb1691 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -153,6 +153,10 @@ private ConventionalItemTags() { public static final TagKey GLOWSTONE_DUSTS = register("dusts/glowstone"); // Consumables + /** + * Variations of the Potion bottle that can hold various effects. Examples are Splash and Lingering Potions from vanilla. + * If a mod adds a new variant like Seeking Potion that applies effect to the closest entity at impact, that would in this tag. + */ public static final TagKey POTIONS = register("potions"); // Foods From b98b9b3d07a7287b6d9decd57868b26162fcb0fa Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 20:51:16 -0400 Subject: [PATCH 30/36] Add bottled potion subtag --- .../datagen/generators/EnglishTagLangGenerator.java | 1 + .../convention/datagen/generators/ItemTagGenerator.java | 4 +++- .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 7 ++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 4a2ce25d96..f180d44597 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -240,6 +240,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.GLOWSTONE_DUSTS, "Glowstone Dusts"); translationBuilder.add(ConventionalItemTags.COAL, "Coal"); translationBuilder.add(ConventionalItemTags.POTIONS, "Potions"); + translationBuilder.add(ConventionalItemTags.BOTTLED_POTIONS, "Bottled Potions"); translationBuilder.add(ConventionalItemTags.FOODS, "Foods"); translationBuilder.add(ConventionalItemTags.ANIMAL_FOODS, "Animal Foods"); translationBuilder.add(ConventionalItemTags.FRUIT_FOODS, "Fruits"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index d38002f90f..cd2bdb09ac 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -230,10 +230,12 @@ private void generateDyeTags() { } private void generateConsumableTags() { - getOrCreateTagBuilder(ConventionalItemTags.POTIONS) + getOrCreateTagBuilder(ConventionalItemTags.BOTTLED_POTIONS) .add(Items.POTION) .add(Items.SPLASH_POTION) .add(Items.LINGERING_POTION); + getOrCreateTagBuilder(ConventionalItemTags.POTIONS) + .addOptionalTag(ConventionalItemTags.BOTTLED_POTIONS); } private void generateFoodTags() { diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index 13e9cb1691..fd58104a7b 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -153,11 +153,16 @@ private ConventionalItemTags() { public static final TagKey GLOWSTONE_DUSTS = register("dusts/glowstone"); // Consumables + /** + * Items that can hold various potion effects similar to how potion bottles do. + * Contents of this tag may not always be a kind of bottle. Buckets of potions could go here. + */ + public static final TagKey POTIONS = register("potions"); /** * Variations of the Potion bottle that can hold various effects. Examples are Splash and Lingering Potions from vanilla. * If a mod adds a new variant like Seeking Potion that applies effect to the closest entity at impact, that would in this tag. */ - public static final TagKey POTIONS = register("potions"); + public static final TagKey BOTTLED_POTIONS = register("potions/bottled"); // Foods public static final TagKey FOODS = register("foods"); From ef27c6cc434361cc3dc713e2cc241ebf7bfbf222 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 20:53:52 -0400 Subject: [PATCH 31/36] Datagen bottled potion and biome temperature fix --- .../assets/fabric-convention-tags-v2/lang/en_us.json | 1 + .../src/generated/resources/data/c/tags/item/potions.json | 7 ++++--- .../resources/data/c/tags/item/potions/bottled.json | 7 +++++++ .../data/c/tags/worldgen/biome/is_hot/overworld.json | 2 +- .../data/c/tags/worldgen/biome/is_temperate/overworld.json | 1 + 5 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/potions/bottled.json diff --git a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json index d16abc1d92..a5658f46dc 100644 --- a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json +++ b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json @@ -303,6 +303,7 @@ "tag.item.c.player_workstations.crafting_tables": "Crafting Tables", "tag.item.c.player_workstations.furnaces": "Furnaces", "tag.item.c.potions": "Potions", + "tag.item.c.potions.bottled": "Bottled Potions", "tag.item.c.raw_blocks": "Raw Blocks", "tag.item.c.raw_blocks.copper": "Raw Copper Blocks", "tag.item.c.raw_blocks.gold": "Raw Gold Blocks", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/potions.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/potions.json index 592e0eb9db..f23dc99e82 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/potions.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/potions.json @@ -1,7 +1,8 @@ { "values": [ - "minecraft:potion", - "minecraft:splash_potion", - "minecraft:lingering_potion" + { + "id": "#c:potions/bottled", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/potions/bottled.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/potions/bottled.json new file mode 100644 index 0000000000..592e0eb9db --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/potions/bottled.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:potion", + "minecraft:splash_potion", + "minecraft:lingering_potion" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json index 92e893f5de..659a1b202e 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json @@ -1,6 +1,5 @@ { "values": [ - "minecraft:mangrove_swamp", "minecraft:jungle", "minecraft:bamboo_jungle", "minecraft:sparse_jungle", @@ -12,6 +11,7 @@ "minecraft:savanna_plateau", "minecraft:windswept_savanna", "minecraft:stony_peaks", + "minecraft:mushroom_fields", "minecraft:warm_ocean", { "id": "#c:climate_hot", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json index e6856022e8..b6250ec4e1 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json @@ -10,6 +10,7 @@ "minecraft:cherry_grove", "minecraft:meadow", "minecraft:swamp", + "minecraft:mangrove_swamp", "minecraft:beach", "minecraft:ocean", "minecraft:deep_ocean", From f006a2b739bc6381fee95848cad0c17667054287 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Mon, 14 Oct 2024 07:21:06 -0400 Subject: [PATCH 32/36] Improved potion javadoc more --- .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 1 + 1 file changed, 1 insertion(+) diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index fd58104a7b..b6dd670d14 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -156,6 +156,7 @@ private ConventionalItemTags() { /** * Items that can hold various potion effects similar to how potion bottles do. * Contents of this tag may not always be a kind of bottle. Buckets of potions could go here. + * The subtags would be the verb form of the container such as `c:potions/bucketed` or `c:potions/vialed` */ public static final TagKey POTIONS = register("potions"); /** From 7af6e54cf87f63b39b5e58de2ad64eff53a2d811 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Mon, 14 Oct 2024 10:36:59 -0400 Subject: [PATCH 33/36] Changed potion verb to noun --- .../datagen/generators/EnglishTagLangGenerator.java | 2 +- .../convention/datagen/generators/ItemTagGenerator.java | 4 ++-- .../assets/fabric-convention-tags-v2/lang/en_us.json | 2 +- .../src/generated/resources/data/c/tags/item/potions.json | 2 +- .../c/tags/item/potions/{bottled.json => bottle.json} | 0 .../api/tag/convention/v2/ConventionalItemTags.java | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/potions/{bottled.json => bottle.json} (100%) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index f180d44597..d02a86a393 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -240,7 +240,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.GLOWSTONE_DUSTS, "Glowstone Dusts"); translationBuilder.add(ConventionalItemTags.COAL, "Coal"); translationBuilder.add(ConventionalItemTags.POTIONS, "Potions"); - translationBuilder.add(ConventionalItemTags.BOTTLED_POTIONS, "Bottled Potions"); + translationBuilder.add(ConventionalItemTags.BOTTLE_POTIONS, "Bottle Potions"); translationBuilder.add(ConventionalItemTags.FOODS, "Foods"); translationBuilder.add(ConventionalItemTags.ANIMAL_FOODS, "Animal Foods"); translationBuilder.add(ConventionalItemTags.FRUIT_FOODS, "Fruits"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index cd2bdb09ac..7d26e60284 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -230,12 +230,12 @@ private void generateDyeTags() { } private void generateConsumableTags() { - getOrCreateTagBuilder(ConventionalItemTags.BOTTLED_POTIONS) + getOrCreateTagBuilder(ConventionalItemTags.BOTTLE_POTIONS) .add(Items.POTION) .add(Items.SPLASH_POTION) .add(Items.LINGERING_POTION); getOrCreateTagBuilder(ConventionalItemTags.POTIONS) - .addOptionalTag(ConventionalItemTags.BOTTLED_POTIONS); + .addOptionalTag(ConventionalItemTags.BOTTLE_POTIONS); } private void generateFoodTags() { diff --git a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json index a5658f46dc..71b3c7ee75 100644 --- a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json +++ b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json @@ -303,7 +303,7 @@ "tag.item.c.player_workstations.crafting_tables": "Crafting Tables", "tag.item.c.player_workstations.furnaces": "Furnaces", "tag.item.c.potions": "Potions", - "tag.item.c.potions.bottled": "Bottled Potions", + "tag.item.c.potions.bottle": "Bottle Potions", "tag.item.c.raw_blocks": "Raw Blocks", "tag.item.c.raw_blocks.copper": "Raw Copper Blocks", "tag.item.c.raw_blocks.gold": "Raw Gold Blocks", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/potions.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/potions.json index f23dc99e82..a669498dc9 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/potions.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/potions.json @@ -1,7 +1,7 @@ { "values": [ { - "id": "#c:potions/bottled", + "id": "#c:potions/bottle", "required": false } ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/potions/bottled.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/potions/bottle.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/potions/bottled.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/potions/bottle.json diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index b6dd670d14..215b8d9f81 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -156,14 +156,14 @@ private ConventionalItemTags() { /** * Items that can hold various potion effects similar to how potion bottles do. * Contents of this tag may not always be a kind of bottle. Buckets of potions could go here. - * The subtags would be the verb form of the container such as `c:potions/bucketed` or `c:potions/vialed` + * The subtags would be the name of the container that is holding the potion effects such as `c:potions/bucket` or `c:potions/vial` as examples. */ public static final TagKey POTIONS = register("potions"); /** - * Variations of the Potion bottle that can hold various effects. Examples are Splash and Lingering Potions from vanilla. - * If a mod adds a new variant like Seeking Potion that applies effect to the closest entity at impact, that would in this tag. + * Variations of the potion bottle that can hold various effects. Examples are splash and lingering potions from vanilla. + * If a mod adds a new variant like seeking potion that applies effect to the closest entity at impact, that would in this tag. */ - public static final TagKey BOTTLED_POTIONS = register("potions/bottled"); + public static final TagKey BOTTLE_POTIONS = register("potions/bottle"); // Foods public static final TagKey FOODS = register("foods"); From ffb18fa945bc8ce77f6f58ca74cb3c38048db06c Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Mon, 14 Oct 2024 14:09:21 -0400 Subject: [PATCH 34/36] Improve potion javadoc to mention data component --- .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index 215b8d9f81..a766c77a92 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -154,13 +154,14 @@ private ConventionalItemTags() { // Consumables /** - * Items that can hold various potion effects similar to how potion bottles do. + * Items that can hold various potion effects by making use of {@link net.minecraft.component.DataComponentTypes#POTION_CONTENTS}. * Contents of this tag may not always be a kind of bottle. Buckets of potions could go here. * The subtags would be the name of the container that is holding the potion effects such as `c:potions/bucket` or `c:potions/vial` as examples. */ public static final TagKey POTIONS = register("potions"); /** - * Variations of the potion bottle that can hold various effects. Examples are splash and lingering potions from vanilla. + * Variations of the potion bottle that can hold various effects by using {@link net.minecraft.component.DataComponentTypes#POTION_CONTENTS}. + * Examples are splash and lingering potions from vanilla. * If a mod adds a new variant like seeking potion that applies effect to the closest entity at impact, that would in this tag. */ public static final TagKey BOTTLE_POTIONS = register("potions/bottle"); From 3477bd7ce91826dc95bfcbee07afb08d86e6c530 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Fri, 25 Oct 2024 09:14:47 -0400 Subject: [PATCH 35/36] special exception for certain biome tag --- .../fabricmc/fabric/test/tag/convention/v2/TagUtilTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fabric-convention-tags-v2/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v2/TagUtilTest.java b/fabric-convention-tags-v2/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v2/TagUtilTest.java index 2fcbbe3389..25edbd5723 100644 --- a/fabric-convention-tags-v2/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v2/TagUtilTest.java +++ b/fabric-convention-tags-v2/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v2/TagUtilTest.java @@ -64,8 +64,12 @@ public class TagUtilTest implements ModInitializer { ConventionalBiomeTags.IS_SAVANNA_TREE, ConventionalBiomeTags.IS_VEGETATION_DENSE, ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD, + ConventionalBiomeTags.IS_VEGETATION_DENSE_NETHER, + ConventionalBiomeTags.IS_VEGETATION_DENSE_END , ConventionalBiomeTags.IS_VEGETATION_SPARSE, ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD, + ConventionalBiomeTags.IS_VEGETATION_SPARSE_NETHER, + ConventionalBiomeTags.IS_VEGETATION_SPARSE_END , ConventionalBlockTags.RED_SANDSTONE_BLOCKS, ConventionalBlockTags.RED_SANDSTONE_SLABS, From 207fd1984ab00f119368286b1a9cc38b4a14767b Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Fri, 25 Oct 2024 09:22:31 -0400 Subject: [PATCH 36/36] checkstyle --- .../fabricmc/fabric/test/tag/convention/v2/TagUtilTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fabric-convention-tags-v2/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v2/TagUtilTest.java b/fabric-convention-tags-v2/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v2/TagUtilTest.java index 25edbd5723..2461e751d7 100644 --- a/fabric-convention-tags-v2/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v2/TagUtilTest.java +++ b/fabric-convention-tags-v2/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v2/TagUtilTest.java @@ -65,11 +65,11 @@ public class TagUtilTest implements ModInitializer { ConventionalBiomeTags.IS_VEGETATION_DENSE, ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD, ConventionalBiomeTags.IS_VEGETATION_DENSE_NETHER, - ConventionalBiomeTags.IS_VEGETATION_DENSE_END , + ConventionalBiomeTags.IS_VEGETATION_DENSE_END, ConventionalBiomeTags.IS_VEGETATION_SPARSE, ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD, ConventionalBiomeTags.IS_VEGETATION_SPARSE_NETHER, - ConventionalBiomeTags.IS_VEGETATION_SPARSE_END , + ConventionalBiomeTags.IS_VEGETATION_SPARSE_END, ConventionalBlockTags.RED_SANDSTONE_BLOCKS, ConventionalBlockTags.RED_SANDSTONE_SLABS,