From c64626deff0a04c941d5f426ae0501030d11396a Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 9 Sep 2023 11:57:34 -0400 Subject: [PATCH 001/123] Large unification of common tags with neo --- .../test/tag/client/v1/ClientTagTest.java | 2 +- .../convention/datagen/DatagenEntrypoint.java | 4 + .../datagen/generators/BiomeTagGenerator.java | 259 ++++++++----- .../BlockEntityTypeTagGenerator.java | 39 ++ .../datagen/generators/BlockTagGenerator.java | 178 ++++++++- .../generators/EnchantmentTagGenerator.java | 25 +- .../generators/EnglishTagLangGenerator.java | 16 + .../generators/EntityTypeTagGenerator.java | 22 +- .../datagen/generators/FluidTagGenerator.java | 26 +- .../datagen/generators/ItemTagGenerator.java | 365 ++++++++++-------- .../lang/en_us.json | 3 + .../data/c/tags/blocks/quartz_ores.json | 6 - .../c/tags/blocks/red_sandstone_stairs.json | 7 - .../blocks/uncolored_sandstone_slabs.json | 8 - .../blocks/uncolored_sandstone_stairs.json | 7 - .../entity_movement_enhancement.json | 8 - .../data/c/tags/entity_types/boats.json | 7 - .../data/c/tags/entity_types/bosses.json | 7 - .../resources/data/c/tags/items/axes.json | 15 - .../data/c/tags/items/black_dyes.json | 6 - .../data/c/tags/items/bookshelves.json | 6 - .../resources/data/c/tags/items/bows.json | 7 - .../data/c/tags/items/brown_dyes.json | 6 - .../data/c/tags/items/budding_blocks.json | 6 - .../resources/data/c/tags/items/clusters.json | 6 - .../data/c/tags/items/copper_ingots.json | 6 - .../data/c/tags/items/cyan_dyes.json | 6 - .../resources/data/c/tags/items/diamonds.json | 6 - .../resources/data/c/tags/items/dusts.json | 7 - .../resources/data/c/tags/items/emeralds.json | 6 - .../data/c/tags/items/empty_buckets.json | 6 - .../data/c/tags/items/gold_ingots.json | 6 - .../data/c/tags/items/gray_dyes.json | 6 - .../data/c/tags/items/green_dyes.json | 6 - .../resources/data/c/tags/items/hoes.json | 15 - .../data/c/tags/items/iron_ingots.json | 6 - .../resources/data/c/tags/items/lapis.json | 6 - .../data/c/tags/items/lava_buckets.json | 6 - .../data/c/tags/items/light_blue_dyes.json | 6 - .../data/c/tags/items/light_gray_dyes.json | 6 - .../data/c/tags/items/lime_dyes.json | 6 - .../data/c/tags/items/magenta_dyes.json | 6 - .../data/c/tags/items/milk_buckets.json | 6 - .../data/c/tags/items/netherite_ingots.json | 6 - .../resources/data/c/tags/items/nuggets.json | 7 - .../data/c/tags/items/orange_dyes.json | 6 - .../resources/data/c/tags/items/pickaxes.json | 15 - .../data/c/tags/items/pink_dyes.json | 6 - .../data/c/tags/items/purple_dyes.json | 6 - .../resources/data/c/tags/items/quartz.json | 6 - .../data/c/tags/items/quartz_ores.json | 6 - .../data/c/tags/items/raw_copper_blocks.json | 6 - .../data/c/tags/items/raw_copper_ores.json | 6 - .../data/c/tags/items/raw_gold_ores.json | 6 - .../data/c/tags/items/raw_iron_blocks.json | 6 - .../data/c/tags/items/raw_iron_ores.json | 6 - .../resources/data/c/tags/items/red_dyes.json | 6 - .../c/tags/items/red_sandstone_stairs.json | 7 - .../data/c/tags/items/redstone_dusts.json | 6 - .../resources/data/c/tags/items/shears.json | 10 - .../resources/data/c/tags/items/shields.json | 6 - .../resources/data/c/tags/items/shovels.json | 15 - .../resources/data/c/tags/items/spears.json | 6 - .../resources/data/c/tags/items/swords.json | 15 - .../tags/items/uncolored_sandstone_slabs.json | 8 - .../items/uncolored_sandstone_stairs.json | 7 - .../data/c/tags/items/water_buckets.json | 6 - .../data/c/tags/items/white_dyes.json | 6 - .../data/c/tags/items/wooden_barrels.json | 6 - .../data/c/tags/items/yellow_dyes.json | 6 - .../data/c/tags/worldgen/biome/beach.json | 10 - .../c/tags/worldgen/biome/birch_forest.json | 7 - .../data/c/tags/worldgen/biome/desert.json | 6 - .../c/tags/worldgen/biome/end_islands.json | 4 - .../c/tags/worldgen/biome/extreme_hills.json | 7 - .../c/tags/worldgen/biome/flower_forests.json | 6 - .../data/c/tags/worldgen/biome/icy.json | 7 - .../data/c/tags/worldgen/biome/jungle.json | 9 - .../data/c/tags/worldgen/biome/mesa.json | 8 - .../c/tags/worldgen/biome/mountain_slope.json | 6 - .../data/c/tags/worldgen/biome/mushroom.json | 6 - .../c/tags/worldgen/biome/nether_forests.json | 7 - .../data/c/tags/worldgen/biome/plains.json | 7 - .../data/c/tags/worldgen/biome/river.json | 9 - .../c/tags/worldgen/biome/snowy_plains.json | 6 - .../c/tags/worldgen/biome/stony_shores.json | 6 - .../data/c/tags/worldgen/biome/swamp.json | 7 - .../data/c/tags/worldgen/biome/taiga.json | 9 - .../tags/worldgen/biome/tree_coniferous.json | 10 - .../tags/worldgen/biome/vegetation_dense.json | 10 - .../data/c/tags/worldgen/biome/void.json | 6 - .../data/c/tags/worldgen/biome/wasteland.json | 4 - .../relocation_not_supported.json} | 0 .../data/common/tags/blocks/barrels.json | 10 + .../common/tags/blocks/barrels/wooden.json | 10 + .../data/common/tags/blocks/bookshelves.json | 10 + .../common/tags/blocks/budding_blocks.json | 10 + .../items => common/tags/blocks}/buds.json | 6 +- .../items => common/tags/blocks}/chests.json | 6 +- .../data/common/tags/blocks/clusters.json | 10 + .../data/common/tags/blocks/dyed_blocks.json | 21 + .../common/tags/blocks/dyed_blocks/black.json | 17 + .../common/tags/blocks/dyed_blocks/blue.json | 17 + .../common/tags/blocks/dyed_blocks/brown.json | 17 + .../common/tags/blocks/dyed_blocks/cyan.json | 17 + .../common/tags/blocks/dyed_blocks/gray.json | 17 + .../common/tags/blocks/dyed_blocks/green.json | 17 + .../tags/blocks/dyed_blocks/light_blue.json | 17 + .../tags/blocks/dyed_blocks/light_gray.json | 17 + .../common/tags/blocks/dyed_blocks/lime.json | 17 + .../tags/blocks/dyed_blocks/magenta.json | 17 + .../tags/blocks/dyed_blocks/orange.json | 17 + .../common/tags/blocks/dyed_blocks/pink.json | 17 + .../tags/blocks/dyed_blocks/purple.json | 17 + .../common/tags/blocks/dyed_blocks/red.json | 17 + .../common/tags/blocks/dyed_blocks/white.json | 17 + .../tags/blocks/dyed_blocks/yellow.json | 17 + .../tags/blocks/glass_blocks.json | 6 +- .../tags/blocks/glass_panes.json | 6 +- .../items => common/tags/blocks}/ores.json | 6 +- .../data/common/tags/blocks/ores/quartz.json | 10 + .../blocks/relocation_not_supported.json} | 2 +- .../common/tags/blocks/sandstone/blocks.json | 17 + .../tags/blocks/sandstone/red_blocks.json} | 6 +- .../tags/blocks/sandstone/red_slabs.json} | 6 +- .../tags/blocks/sandstone/red_stairs.json | 11 + .../tags/blocks/sandstone/slabs.json} | 7 +- .../common/tags/blocks/sandstone/stairs.json | 17 + .../blocks/sandstone/uncolored_blocks.json} | 6 +- .../blocks/sandstone/uncolored_slabs.json | 12 + .../blocks/sandstone/uncolored_stairs.json} | 6 +- .../tags/blocks}/shulker_boxes.json | 6 +- .../tags/blocks/villager_job_sites.json | 6 +- .../entity_defense_enhancement.json | 6 +- .../entity_movement_enhancement.json | 12 + .../tags/enchantment/fortune.json} | 3 +- .../data/common/tags/enchantment/looting.json | 10 + .../weapon_damage_enhancement.json | 6 +- .../data/common/tags/entity_types/boats.json | 11 + .../data/common/tags/entity_types/bosses.json | 11 + .../tags/entity_types/minecarts.json | 6 +- .../tags/fluids/honey.json} | 2 +- .../tags/fluids/lava.json} | 4 +- .../tags/fluids/milk.json} | 2 +- .../tags/fluids/water.json} | 4 +- .../data/common/tags/items/barrels.json | 10 + .../common/tags/items/barrels/wooden.json | 10 + .../data/common/tags/items/bookshelves.json | 10 + .../tags/items/buckets/empty.json} | 5 +- .../tags/items/buckets/entity_water.json} | 10 +- .../data/common/tags/items/buckets/lava.json | 14 + .../data/common/tags/items/buckets/milk.json | 14 + .../data/common/tags/items/buckets/water.json | 14 + .../common/tags/items/budding_blocks.json | 10 + .../blocks => common/tags/items}/buds.json | 6 +- .../blocks => common/tags/items}/chests.json | 6 +- .../data/common/tags/items/clusters.json | 10 + .../tags/items/coal.json} | 4 +- .../data/common/tags/items/dusts.json | 11 + .../tags/items/dusts/glowstone.json} | 2 +- .../tags/items/dusts/redstone.json} | 5 +- .../data/common/tags/items/dyed_items.json | 21 + .../common/tags/items/dyed_items/black.json | 17 + .../common/tags/items/dyed_items/blue.json | 17 + .../common/tags/items/dyed_items/brown.json | 17 + .../common/tags/items/dyed_items/cyan.json | 17 + .../common/tags/items/dyed_items/gray.json | 17 + .../common/tags/items/dyed_items/green.json | 17 + .../tags/items/dyed_items/light_blue.json | 17 + .../tags/items/dyed_items/light_gray.json | 17 + .../common/tags/items/dyed_items/lime.json | 17 + .../common/tags/items/dyed_items/magenta.json | 17 + .../common/tags/items/dyed_items/orange.json | 17 + .../common/tags/items/dyed_items/pink.json | 17 + .../common/tags/items/dyed_items/purple.json | 17 + .../common/tags/items/dyed_items/red.json | 17 + .../common/tags/items/dyed_items/white.json | 17 + .../common/tags/items/dyed_items/yellow.json | 17 + .../data/{c => common}/tags/items/dyes.json | 36 +- .../data/common/tags/items/dyes/black.json | 10 + .../data/common/tags/items/dyes/blue.json | 10 + .../data/common/tags/items/dyes/brown.json | 10 + .../data/common/tags/items/dyes/cyan.json | 10 + .../data/common/tags/items/dyes/gray.json | 10 + .../data/common/tags/items/dyes/green.json | 10 + .../common/tags/items/dyes/light_blue.json | 10 + .../common/tags/items/dyes/light_gray.json | 10 + .../data/common/tags/items/dyes/lime.json | 10 + .../data/common/tags/items/dyes/magenta.json | 10 + .../data/common/tags/items/dyes/orange.json | 10 + .../data/common/tags/items/dyes/pink.json | 10 + .../data/common/tags/items/dyes/purple.json | 10 + .../data/common/tags/items/dyes/red.json | 10 + .../data/common/tags/items/dyes/white.json | 10 + .../data/common/tags/items/dyes/yellow.json | 10 + .../data/{c => common}/tags/items/foods.json | 6 +- .../data/{c => common}/tags/items/gems.json | 6 +- .../tags/items/gems/amethyst.json} | 2 +- .../data/common/tags/items/gems/diamond.json | 14 + .../data/common/tags/items/gems/emerald.json | 14 + .../data/common/tags/items/gems/lapis.json | 14 + .../tags/items/gems/prismarine.json} | 2 +- .../tags/items/gems/quartz.json} | 3 +- .../tags/items/glass_blocks.json | 6 +- .../{c => common}/tags/items/glass_panes.json | 6 +- .../data/{c => common}/tags/items/ingots.json | 6 +- .../data/common/tags/items/ingots/copper.json | 14 + .../tags/items/ingots/gold.json} | 5 +- .../data/common/tags/items/ingots/iron.json | 14 + .../common/tags/items/ingots/netherite.json | 14 + .../data/common/tags/items/nuggets.json | 11 + .../blocks => common/tags/items}/ores.json | 14 +- .../tags/items/ores/netherite_scrap.json} | 2 +- .../data/common/tags/items/ores/quartz.json | 14 + .../{c => common}/tags/items/potions.json | 6 +- .../tags/items/raw_blocks.json} | 2 + .../common/tags/items/raw_blocks/copper.json | 14 + .../common/tags/items/raw_blocks/gold.json | 14 + .../common/tags/items/raw_blocks/iron.json | 14 + .../data/common/tags/items/raw_materials.json | 28 ++ .../tags/items/raw_materials/copper.json | 10 + .../common/tags/items/raw_materials/gold.json | 10 + .../common/tags/items/raw_materials/iron.json | 10 + .../common/tags/items/sandstone/blocks.json | 17 + .../tags/items/sandstone/red_blocks.json} | 6 +- .../tags/items/sandstone/red_slabs.json} | 6 +- .../tags/items/sandstone/red_stairs.json | 11 + .../common/tags/items/sandstone/slabs.json | 17 + .../common/tags/items/sandstone/stairs.json | 17 + .../items/sandstone/uncolored_blocks.json} | 6 +- .../tags/items/sandstone/uncolored_slabs.json | 12 + .../items/sandstone/uncolored_stairs.json} | 6 +- .../tags/items}/shulker_boxes.json | 6 +- .../tags/items/tools.json} | 13 +- .../data/common/tags/items/tools/bows.json | 14 + .../tags/items/tools/crossbows.json} | 2 +- .../tags/items/tools/fishing_rods.json} | 2 +- .../data/common/tags/items/tools/shears.json | 14 + .../tags/items/tools/shields.json} | 5 +- .../data/common/tags/items/tools/spears.json | 14 + .../tags/items/villager_job_sites.json | 6 +- .../tags/worldgen/biome/is_aquatic.json} | 6 +- .../tags/worldgen/biome/is_aquatic_icy.json} | 6 +- .../tags/worldgen/biome/is_badlands.json} | 6 +- .../common/tags/worldgen/biome/is_beach.json | 14 + .../tags/worldgen/biome/is_birch_forest.json | 11 + .../tags/worldgen/biome/is_cave.json} | 6 +- .../common/tags/worldgen/biome/is_cold.json | 6 + .../worldgen/biome/is_cold/overworld.json} | 7 +- .../tags/worldgen/biome/is_dead.json} | 2 +- .../tags/worldgen/biome/is_deep_ocean.json} | 6 +- .../worldgen/biome/is_dense_vegetation.json | 9 + .../biome/is_dense_vegetation/overworld.json | 14 + .../common/tags/worldgen/biome/is_desert.json | 10 + .../common/tags/worldgen/biome/is_dry.json | 6 + .../tags/worldgen/biome/is_dry/overworld.json | 25 ++ .../tags/worldgen/biome/is_end_island.json} | 2 +- .../worldgen/biome/is_extreme_hills.json} | 8 +- .../tags/worldgen/biome/is_floral.json} | 6 +- .../tags/worldgen/biome/is_flower_forest.json | 14 + .../common/tags/worldgen/biome/is_forest.json | 13 + .../common/tags/worldgen/biome/is_hot.json | 6 + .../tags/worldgen/biome/is_hot/overworld.json | 34 ++ .../common/tags/worldgen/biome/is_icy.json | 11 + .../common/tags/worldgen/biome/is_jungle.json | 13 + .../tags/worldgen/biome/is_mountain.json} | 4 + .../worldgen/biome/is_mountain/peak.json} | 6 +- .../worldgen/biome/is_mountain/slope.json | 10 + .../tags/worldgen/biome/is_mushroom.json | 10 + .../tags/worldgen/biome/is_nether.json} | 6 +- .../tags/worldgen/biome/is_nether_forest.json | 11 + .../tags/worldgen/biome/is_ocean.json} | 8 +- .../tags/worldgen/biome/is_overworld.json} | 6 +- .../common/tags/worldgen/biome/is_plains.json | 11 + .../tags/worldgen/biome/is_river.json} | 4 +- .../tags/worldgen/biome/is_savanna.json} | 6 +- .../worldgen/biome/is_shallow_ocean.json} | 6 +- .../tags/worldgen/biome/is_snowy.json} | 6 +- .../tags/worldgen/biome/is_snowy_plains.json | 10 + .../worldgen/biome/is_sparse_vegetation.json | 9 + .../biome/is_sparse_vegetation/overworld.json | 25 ++ .../tags/worldgen/biome/is_stony_shores.json | 10 + .../common/tags/worldgen/biome/is_swamp.json | 11 + .../tags/worldgen/biome/is_taiga.json} | 4 +- .../tags/worldgen/biome/is_temperate.json} | 2 +- .../biome/is_temperate/overworld.json} | 6 +- .../tags/worldgen/biome/is_the_end.json} | 6 +- .../worldgen/biome/is_tree/coniferous.json | 14 + .../worldgen/biome/is_tree/deciduous.json} | 6 +- .../tags/worldgen/biome/is_tree/jungle.json | 13 + .../tags/worldgen/biome/is_tree/savanna.json | 13 + .../tags/worldgen/biome/is_underground.json | 13 + .../common/tags/worldgen/biome/is_void.json | 10 + .../tags/worldgen/biome/is_wasteland.json | 9 + .../common/tags/worldgen/biome/is_wet.json | 6 + .../worldgen/biome/is_wet/overworld.json} | 10 +- .../tags/worldgen/biome/is_windswept.json | 13 + .../data/minecraft/tags/items/pickaxes.json | 13 - .../data/minecraft/tags/items/shovels.json | 13 - .../convention/v1/ConventionalBiomeTags.java | 116 +++--- .../v1/ConventionalBlockEntityTypeTags.java | 37 ++ .../convention/v1/ConventionalBlockTags.java | 44 ++- .../convention/v1/ConventionalItemTags.java | 176 +++++---- .../impl/tag/convention/TagRegistration.java | 4 +- .../test/tag/convention/v1/TagUtilTest.java | 4 +- .../v1/provider/FabricLanguageProvider.java | 17 + .../v1/provider/FabricTagProvider.java | 15 + 307 files changed, 2968 insertions(+), 1151 deletions(-) create mode 100644 fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java create mode 100644 fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java create mode 100644 fabric-convention-tags-v1/src/generated/resources/assets/fabric-convention-tags-v1-datagen/lang/en_us.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/quartz_ores.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/red_sandstone_stairs.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/uncolored_sandstone_slabs.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/uncolored_sandstone_stairs.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/entity_movement_enhancement.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/entity_types/boats.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/entity_types/bosses.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/axes.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/black_dyes.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/bookshelves.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/bows.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/brown_dyes.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/budding_blocks.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/clusters.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/copper_ingots.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/cyan_dyes.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/diamonds.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/dusts.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/emeralds.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/empty_buckets.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/gold_ingots.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/gray_dyes.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/green_dyes.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/hoes.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/iron_ingots.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/lapis.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/lava_buckets.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/light_blue_dyes.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/light_gray_dyes.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/lime_dyes.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/magenta_dyes.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/milk_buckets.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/netherite_ingots.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/nuggets.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/orange_dyes.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/pickaxes.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/pink_dyes.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/purple_dyes.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/quartz.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/quartz_ores.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_copper_blocks.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_copper_ores.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_gold_ores.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_iron_blocks.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_iron_ores.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/red_dyes.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/red_sandstone_stairs.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/redstone_dusts.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/shears.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/shields.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/shovels.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/spears.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/swords.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/uncolored_sandstone_slabs.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/uncolored_sandstone_stairs.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/water_buckets.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/white_dyes.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/wooden_barrels.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/yellow_dyes.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/beach.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/birch_forest.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/desert.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/end_islands.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/extreme_hills.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/flower_forests.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/icy.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/jungle.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mesa.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mountain_slope.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mushroom.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/nether_forests.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/plains.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/river.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/snowy_plains.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/stony_shores.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/swamp.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/taiga.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_coniferous.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/vegetation_dense.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/void.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/wasteland.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/dead.json => common/tags/block_entity_type/relocation_not_supported.json} (100%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/barrels.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/barrels/wooden.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/bookshelves.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/budding_blocks.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/items => common/tags/blocks}/buds.json (54%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/items => common/tags/blocks}/chests.json (50%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/clusters.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/black.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/blue.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/brown.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/cyan.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/gray.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/green.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_blue.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_gray.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/lime.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/magenta.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/orange.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/pink.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/purple.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/red.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/white.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/yellow.json rename fabric-convention-tags-v1/src/generated/resources/data/{c => common}/tags/blocks/glass_blocks.json (86%) rename fabric-convention-tags-v1/src/generated/resources/data/{c => common}/tags/blocks/glass_panes.json (86%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/items => common/tags/blocks}/ores.json (87%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores/quartz.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/fluids/water.json => common/tags/blocks/relocation_not_supported.json} (66%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/blocks.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/blocks/red_sandstone_blocks.json => common/tags/blocks/sandstone/red_blocks.json} (56%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/items/red_sandstone_slabs.json => common/tags/blocks/sandstone/red_slabs.json} (50%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/red_stairs.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/climate_wet.json => common/tags/blocks/sandstone/slabs.json} (54%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/stairs.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/items/uncolored_sandstone_blocks.json => common/tags/blocks/sandstone/uncolored_blocks.json} (54%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_slabs.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/items/sandstone_stairs.json => common/tags/blocks/sandstone/uncolored_stairs.json} (61%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/items => common/tags/blocks}/shulker_boxes.json (85%) rename fabric-convention-tags-v1/src/generated/resources/data/{c => common}/tags/blocks/villager_job_sites.json (82%) rename fabric-convention-tags-v1/src/generated/resources/data/{c => common}/tags/enchantment/entity_defense_enhancement.json (65%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/entity_movement_enhancement.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/items/coal.json => common/tags/enchantment/fortune.json} (60%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/looting.json rename fabric-convention-tags-v1/src/generated/resources/data/{c => common}/tags/enchantment/weapon_damage_enhancement.json (58%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/boats.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/bosses.json rename fabric-convention-tags-v1/src/generated/resources/data/{c => common}/tags/entity_types/minecarts.json (70%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/underground.json => common/tags/fluids/honey.json} (76%) rename fabric-convention-tags-v1/src/generated/resources/data/{minecraft/tags/items/axes.json => common/tags/fluids/lava.json} (67%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/tree_jungle.json => common/tags/fluids/milk.json} (75%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/aquatic.json => common/tags/fluids/water.json} (67%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/barrels.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/barrels/wooden.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/bookshelves.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/blocks/sandstone_blocks.json => common/tags/items/buckets/empty.json} (56%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/items/entity_water_buckets.json => common/tags/items/buckets/entity_water.json} (52%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/lava.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/milk.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/water.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/budding_blocks.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/blocks => common/tags/items}/buds.json (54%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/blocks => common/tags/items}/chests.json (50%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/clusters.json rename fabric-convention-tags-v1/src/generated/resources/data/{minecraft/tags/items/swords.json => common/tags/items/coal.json} (67%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dusts.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/enchantment/fortune.json => common/tags/items/dusts/glowstone.json} (56%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/blocks/sandstone_slabs.json => common/tags/items/dusts/redstone.json} (57%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/black.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/blue.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/brown.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/cyan.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/gray.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/green.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/light_blue.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/light_gray.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/lime.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/magenta.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/orange.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/pink.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/purple.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/red.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/white.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/yellow.json rename fabric-convention-tags-v1/src/generated/resources/data/{c => common}/tags/items/dyes.json (50%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/black.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/blue.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/brown.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/cyan.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/gray.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/green.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/light_blue.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/light_gray.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/lime.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/magenta.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/orange.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/pink.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/purple.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/red.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/white.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/yellow.json rename fabric-convention-tags-v1/src/generated/resources/data/{c => common}/tags/items/foods.json (92%) rename fabric-convention-tags-v1/src/generated/resources/data/{c => common}/tags/items/gems.json (58%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/enchantment/looting.json => common/tags/items/gems/amethyst.json} (56%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/diamond.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/emerald.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/lapis.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/blocks/budding_blocks.json => common/tags/items/gems/prismarine.json} (53%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/forest.json => common/tags/items/gems/quartz.json} (61%) rename fabric-convention-tags-v1/src/generated/resources/data/{c => common}/tags/items/glass_blocks.json (86%) rename fabric-convention-tags-v1/src/generated/resources/data/{c => common}/tags/items/glass_panes.json (86%) rename fabric-convention-tags-v1/src/generated/resources/data/{c => common}/tags/items/ingots.json (57%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/copper.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/items/sandstone_blocks.json => common/tags/items/ingots/gold.json} (56%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/iron.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/netherite.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/nuggets.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/blocks => common/tags/items}/ores.json (73%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/blocks/wooden_barrels.json => common/tags/items/ores/netherite_scrap.json} (56%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ores/quartz.json rename fabric-convention-tags-v1/src/generated/resources/data/{c => common}/tags/items/potions.json (55%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/items/raw_gold_blocks.json => common/tags/items/raw_blocks.json} (52%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks/copper.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks/gold.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks/iron.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials/copper.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials/gold.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials/iron.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/blocks.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/items/red_sandstone_blocks.json => common/tags/items/sandstone/red_blocks.json} (56%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/blocks/red_sandstone_slabs.json => common/tags/items/sandstone/red_slabs.json} (50%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/red_stairs.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/slabs.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/stairs.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/blocks/uncolored_sandstone_blocks.json => common/tags/items/sandstone/uncolored_blocks.json} (54%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/uncolored_slabs.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/blocks/sandstone_stairs.json => common/tags/items/sandstone/uncolored_stairs.json} (61%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/blocks => common/tags/items}/shulker_boxes.json (85%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/climate_hot.json => common/tags/items/tools.json} (53%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/bows.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/items/blue_dyes.json => common/tags/items/tools/crossbows.json} (62%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/blocks/bookshelves.json => common/tags/items/tools/fishing_rods.json} (59%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/shears.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/items/sandstone_slabs.json => common/tags/items/tools/shields.json} (58%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/spears.json rename fabric-convention-tags-v1/src/generated/resources/data/{c => common}/tags/items/villager_job_sites.json (78%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/ocean.json => common/tags/worldgen/biome/is_aquatic.json} (61%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/aquatic_icy.json => common/tags/worldgen/biome/is_aquatic_icy.json} (51%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/items/raw_ores.json => common/tags/worldgen/biome/is_badlands.json} (60%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_beach.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_birch_forest.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/caves.json => common/tags/worldgen/biome/is_cave.json} (53%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_cold.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/climate_cold.json => common/tags/worldgen/biome/is_cold/overworld.json} (69%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/tree_savanna.json => common/tags/worldgen/biome/is_dead.json} (74%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/deep_ocean.json => common/tags/worldgen/biome/is_deep_ocean.json} (60%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation/overworld.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_desert.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dry.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dry/overworld.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/fluids/lava.json => common/tags/worldgen/biome/is_end_island.json} (71%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/windswept.json => common/tags/worldgen/biome/is_extreme_hills.json} (62%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/floral.json => common/tags/worldgen/biome/is_floral.json} (61%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_flower_forest.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_forest.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_hot.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_hot/overworld.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_icy.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_jungle.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/mountain.json => common/tags/worldgen/biome/is_mountain.json} (63%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/mountain_peak.json => common/tags/worldgen/biome/is_mountain/peak.json} (51%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/slope.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mushroom.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/in_nether.json => common/tags/worldgen/biome/is_nether.json} (71%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_nether_forest.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/climate_dry.json => common/tags/worldgen/biome/is_ocean.json} (57%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/in_overworld.json => common/tags/worldgen/biome/is_overworld.json} (94%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_plains.json rename fabric-convention-tags-v1/src/generated/resources/data/{minecraft/tags/items/hoes.json => common/tags/worldgen/biome/is_river.json} (64%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/savanna.json => common/tags/worldgen/biome/is_savanna.json} (67%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/shallow_ocean.json => common/tags/worldgen/biome/is_shallow_ocean.json} (60%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/snowy.json => common/tags/worldgen/biome/is_snowy.json} (58%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_snowy_plains.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation/overworld.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_stony_shores.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_swamp.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/badlands.json => common/tags/worldgen/biome/is_taiga.json} (64%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/blocks/clusters.json => common/tags/worldgen/biome/is_temperate.json} (52%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/climate_temperate.json => common/tags/worldgen/biome/is_temperate/overworld.json} (76%) rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/in_the_end.json => common/tags/worldgen/biome/is_the_end.json} (69%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/coniferous.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/tree_deciduous.json => common/tags/worldgen/biome/is_tree/deciduous.json} (63%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/jungle.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/savanna.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_underground.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_void.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_wasteland.json create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_wet.json rename fabric-convention-tags-v1/src/generated/resources/data/{c/tags/worldgen/biome/vegetation_sparse.json => common/tags/worldgen/biome/is_wet/overworld.json} (62%) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_windswept.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/pickaxes.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/shovels.json create mode 100644 fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockEntityTypeTags.java diff --git a/fabric-client-tags-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java b/fabric-client-tags-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java index ed2b70a8ad..29cc8377f8 100644 --- a/fabric-client-tags-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java +++ b/fabric-client-tags-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java @@ -63,7 +63,7 @@ public void onInitializeClient() { throw new AssertionError("Did not expect to find diamond block in c:ores, but it was found!"); } - if (!ClientTags.isInLocal(ConventionalBiomeTags.FOREST, BiomeKeys.FOREST)) { + if (!ClientTags.isInLocal(ConventionalBiomeTags.IS_FOREST, BiomeKeys.FOREST)) { throw new AssertionError("Expected to find forest in c:forest, but it was not found!"); } diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java index ef208e8cf0..487c63485a 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java @@ -19,8 +19,10 @@ import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; import net.fabricmc.fabric.impl.tag.convention.datagen.generators.BiomeTagGenerator; +import net.fabricmc.fabric.impl.tag.convention.datagen.generators.BlockEntityTypeTagGenerator; import net.fabricmc.fabric.impl.tag.convention.datagen.generators.BlockTagGenerator; import net.fabricmc.fabric.impl.tag.convention.datagen.generators.EnchantmentTagGenerator; +import net.fabricmc.fabric.impl.tag.convention.datagen.generators.EnglishTagLangGenerator; import net.fabricmc.fabric.impl.tag.convention.datagen.generators.EntityTypeTagGenerator; import net.fabricmc.fabric.impl.tag.convention.datagen.generators.FluidTagGenerator; import net.fabricmc.fabric.impl.tag.convention.datagen.generators.ItemTagGenerator; @@ -36,5 +38,7 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { pack.addProvider(EnchantmentTagGenerator::new); pack.addProvider(BiomeTagGenerator::new); pack.addProvider(EntityTypeTagGenerator::new); + pack.addProvider(BlockEntityTypeTagGenerator::new); + pack.addProvider(EnglishTagLangGenerator::new); } } diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java index fad79f66fd..7453639987 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java @@ -16,17 +16,18 @@ package net.fabricmc.fabric.impl.tag.convention.datagen.generators; -import java.util.concurrent.CompletableFuture; - +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBiomeTags; import net.minecraft.registry.RegistryKeys; -import net.minecraft.registry.tag.BiomeTags; import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.tag.BiomeTags; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeKeys; -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBiomeTags; +import java.util.concurrent.CompletableFuture; public class BiomeTagGenerator extends FabricTagProvider { public BiomeTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { @@ -40,17 +41,18 @@ protected void configure(RegistryWrapper.WrapperLookup arg) { generateOtherBiomeTypes(); generateClimateAndVegetationTags(); generateTerrainDescriptorTags(); + generateBackwardsCompatTags(); } private void generateDimensionTags() { - getOrCreateTagBuilder(ConventionalBiomeTags.IN_NETHER) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_NETHER) .addOptionalTag(BiomeTags.IS_NETHER) .add(BiomeKeys.CRIMSON_FOREST) .add(BiomeKeys.WARPED_FOREST) .add(BiomeKeys.NETHER_WASTES) .add(BiomeKeys.SOUL_SAND_VALLEY) .add(BiomeKeys.BASALT_DELTAS); - getOrCreateTagBuilder(ConventionalBiomeTags.IN_THE_END) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_THE_END) .addOptionalTag(BiomeTags.IS_END) .add(BiomeKeys.END_BARRENS) .add(BiomeKeys.END_MIDLANDS) @@ -58,7 +60,7 @@ private void generateDimensionTags() { .add(BiomeKeys.THE_END) .add(BiomeKeys.SMALL_END_ISLANDS); // We avoid the vanilla group tags here as mods may add to them without actually spawning them in the overworld - getOrCreateTagBuilder(ConventionalBiomeTags.IN_OVERWORLD) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_OVERWORLD) .addOptionalTag(BiomeTags.IS_OVERWORLD) .add(BiomeKeys.RIVER).add(BiomeKeys.FROZEN_RIVER) .add(BiomeKeys.COLD_OCEAN).add(BiomeKeys.DEEP_COLD_OCEAN) @@ -86,85 +88,80 @@ private void generateDimensionTags() { } private void generateCategoryTags() { - getOrCreateTagBuilder(ConventionalBiomeTags.TAIGA) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_TAIGA) .addOptionalTag(BiomeTags.IS_TAIGA); - getOrCreateTagBuilder(ConventionalBiomeTags.EXTREME_HILLS) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_EXTREME_HILLS) .add(BiomeKeys.WINDSWEPT_GRAVELLY_HILLS) .add(BiomeKeys.WINDSWEPT_HILLS); - getOrCreateTagBuilder(ConventionalBiomeTags.WINDSWEPT) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_WINDSWEPT) .add(BiomeKeys.WINDSWEPT_HILLS) .add(BiomeKeys.WINDSWEPT_GRAVELLY_HILLS) .add(BiomeKeys.WINDSWEPT_FOREST) .add(BiomeKeys.WINDSWEPT_SAVANNA); - getOrCreateTagBuilder(ConventionalBiomeTags.JUNGLE) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_JUNGLE) .addOptionalTag(BiomeTags.IS_JUNGLE); - getOrCreateTagBuilder(ConventionalBiomeTags.MESA) - .add(BiomeKeys.WOODED_BADLANDS) - .add(BiomeKeys.ERODED_BADLANDS) - .add(BiomeKeys.BADLANDS); - getOrCreateTagBuilder(ConventionalBiomeTags.PLAINS) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_PLAINS) .add(BiomeKeys.SUNFLOWER_PLAINS) .add(BiomeKeys.PLAINS); - getOrCreateTagBuilder(ConventionalBiomeTags.SAVANNA) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_SAVANNA) .addOptionalTag(BiomeTags.IS_SAVANNA) .add(BiomeKeys.SAVANNA_PLATEAU) .add(BiomeKeys.WINDSWEPT_SAVANNA) .add(BiomeKeys.SAVANNA); - getOrCreateTagBuilder(ConventionalBiomeTags.ICY) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_ICY) .add(BiomeKeys.FROZEN_PEAKS) .add(BiomeKeys.ICE_SPIKES); - getOrCreateTagBuilder(ConventionalBiomeTags.AQUATIC_ICY) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_AQUATIC_ICY) .add(BiomeKeys.FROZEN_RIVER) .add(BiomeKeys.DEEP_FROZEN_OCEAN) .add(BiomeKeys.FROZEN_OCEAN); - getOrCreateTagBuilder(ConventionalBiomeTags.SNOWY) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_SNOWY) .add(BiomeKeys.SNOWY_BEACH) .add(BiomeKeys.SNOWY_PLAINS) .add(BiomeKeys.SNOWY_SLOPES) .add(BiomeKeys.SNOWY_TAIGA); - getOrCreateTagBuilder(ConventionalBiomeTags.BEACH) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_BEACH) .addOptionalTag(BiomeTags.IS_BEACH) .add(BiomeKeys.STONY_SHORE); - getOrCreateTagBuilder(ConventionalBiomeTags.FOREST) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_FOREST) .addOptionalTag(BiomeTags.IS_FOREST); - getOrCreateTagBuilder(ConventionalBiomeTags.BIRCH_FOREST) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_BIRCH_FOREST) .add(BiomeKeys.BIRCH_FOREST) .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST); - getOrCreateTagBuilder(ConventionalBiomeTags.OCEAN) - .addOptionalTag(ConventionalBiomeTags.DEEP_OCEAN) - .addOptionalTag(ConventionalBiomeTags.SHALLOW_OCEAN) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_OCEAN) + .addOptionalTag(ConventionalBiomeTags.IS_DEEP_OCEAN) + .addOptionalTag(ConventionalBiomeTags.IS_SHALLOW_OCEAN) .addOptionalTag(BiomeTags.IS_OCEAN); - getOrCreateTagBuilder(ConventionalBiomeTags.DESERT) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_DESERT) .add(BiomeKeys.DESERT); - getOrCreateTagBuilder(ConventionalBiomeTags.RIVER) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_RIVER) .addOptionalTag(BiomeTags.IS_RIVER); - getOrCreateTagBuilder(ConventionalBiomeTags.SWAMP) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_SWAMP) .add(BiomeKeys.MANGROVE_SWAMP) .add(BiomeKeys.SWAMP); - getOrCreateTagBuilder(ConventionalBiomeTags.MUSHROOM) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_MUSHROOM) .add(BiomeKeys.MUSHROOM_FIELDS); - getOrCreateTagBuilder(ConventionalBiomeTags.UNDERGROUND) - .addOptionalTag(ConventionalBiomeTags.CAVES); - getOrCreateTagBuilder(ConventionalBiomeTags.MOUNTAIN) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_UNDERGROUND) + .addOptionalTag(ConventionalBiomeTags.IS_CAVE); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_MOUNTAIN) .addOptionalTag(BiomeTags.IS_MOUNTAIN); } private void generateOtherBiomeTypes() { - getOrCreateTagBuilder(ConventionalBiomeTags.BADLANDS) - .addOptionalTag(ConventionalBiomeTags.MESA) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_BADLANDS) .addOptionalTag(BiomeTags.IS_BADLANDS); - getOrCreateTagBuilder(ConventionalBiomeTags.CAVES) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_CAVE) .add(BiomeKeys.DEEP_DARK) .add(BiomeKeys.DRIPSTONE_CAVES) .add(BiomeKeys.LUSH_CAVES); - getOrCreateTagBuilder(ConventionalBiomeTags.VOID) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_VOID) .add(BiomeKeys.THE_VOID); - getOrCreateTagBuilder(ConventionalBiomeTags.DEEP_OCEAN) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_DEEP_OCEAN) .add(BiomeKeys.DEEP_FROZEN_OCEAN) .add(BiomeKeys.DEEP_LUKEWARM_OCEAN) .add(BiomeKeys.DEEP_COLD_OCEAN) .add(BiomeKeys.DEEP_OCEAN); - getOrCreateTagBuilder(ConventionalBiomeTags.SHALLOW_OCEAN) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_SHALLOW_OCEAN) .add(BiomeKeys.OCEAN) .add(BiomeKeys.LUKEWARM_OCEAN) .add(BiomeKeys.FROZEN_OCEAN) @@ -173,14 +170,18 @@ private void generateOtherBiomeTypes() { } private void generateClimateAndVegetationTags() { - getOrCreateTagBuilder(ConventionalBiomeTags.CLIMATE_COLD) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD_OVERWORLD) .add(BiomeKeys.SNOWY_PLAINS) + .add(BiomeKeys.SNOWY_SLOPES) .add(BiomeKeys.GROVE) .add(BiomeKeys.JAGGED_PEAKS) .add(BiomeKeys.TAIGA).add(BiomeKeys.SNOWY_TAIGA) .add(BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA).add(BiomeKeys.OLD_GROWTH_PINE_TAIGA) - .addOptionalTag(ConventionalBiomeTags.ICY); - getOrCreateTagBuilder(ConventionalBiomeTags.CLIMATE_TEMPERATE) + .addOptionalTag(ConventionalBiomeTags.IS_ICY); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD) + .addTag(ConventionalBiomeTags.IS_COLD_OVERWORLD); + + getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD) .add(BiomeKeys.FOREST) .add(BiomeKeys.SUNFLOWER_PLAINS) .add(BiomeKeys.SWAMP) @@ -191,75 +192,151 @@ private void generateClimateAndVegetationTags() { .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST) .add(BiomeKeys.MEADOW) .add(BiomeKeys.PLAINS); - getOrCreateTagBuilder(ConventionalBiomeTags.CLIMATE_HOT) - .addOptionalTag(ConventionalBiomeTags.JUNGLE) - .addOptionalTag(ConventionalBiomeTags.SAVANNA) - .addOptionalTag(ConventionalBiomeTags.DESERT) - .addOptionalTag(ConventionalBiomeTags.BADLANDS) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE) + .addTag(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD); + + getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT_OVERWORLD) + .addOptionalTag(ConventionalBiomeTags.IS_JUNGLE) + .addOptionalTag(ConventionalBiomeTags.IS_SAVANNA) + .addOptionalTag(ConventionalBiomeTags.IS_DESERT) + .addOptionalTag(ConventionalBiomeTags.IS_BADLANDS) .add(BiomeKeys.STONY_PEAKS) - .addOptionalTag(ConventionalBiomeTags.MUSHROOM) - .addOptionalTag(ConventionalBiomeTags.IN_NETHER); - getOrCreateTagBuilder(ConventionalBiomeTags.CLIMATE_WET) - .addOptionalTag(ConventionalBiomeTags.AQUATIC) - .addOptionalTag(ConventionalBiomeTags.SWAMP) - .add(BiomeKeys.LUSH_CAVES) - .addOptionalTag(ConventionalBiomeTags.JUNGLE); - getOrCreateTagBuilder(ConventionalBiomeTags.CLIMATE_DRY) - .addOptionalTag(ConventionalBiomeTags.IN_NETHER) - .addOptionalTag(ConventionalBiomeTags.BADLANDS) - .addOptionalTag(ConventionalBiomeTags.DESERT) - .addOptionalTag(ConventionalBiomeTags.SAVANNA); - getOrCreateTagBuilder(ConventionalBiomeTags.VEGETATION_DENSE) - .addOptionalTag(ConventionalBiomeTags.JUNGLE) - .add(BiomeKeys.SUNFLOWER_PLAINS); - getOrCreateTagBuilder(ConventionalBiomeTags.VEGETATION_SPARSE) - .addOptionalTag(ConventionalBiomeTags.SAVANNA) - .addOptionalTag(ConventionalBiomeTags.DESERT) - .addOptionalTag(ConventionalBiomeTags.DEAD) + .addOptionalTag(ConventionalBiomeTags.IS_MUSHROOM) + .addOptionalTag(ConventionalBiomeTags.IS_NETHER); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT) + .addTag(ConventionalBiomeTags.IS_HOT_OVERWORLD); + + getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET_OVERWORLD) + .addOptionalTag(ConventionalBiomeTags.IS_AQUATIC) + .addOptionalTag(ConventionalBiomeTags.IS_SWAMP) .add(BiomeKeys.LUSH_CAVES) - .addOptionalTag(ConventionalBiomeTags.WASTELAND); - getOrCreateTagBuilder(ConventionalBiomeTags.TREE_CONIFEROUS) + .addOptionalTag(ConventionalBiomeTags.IS_JUNGLE); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET) + .addTag(ConventionalBiomeTags.IS_WET_OVERWORLD); + + getOrCreateTagBuilder(ConventionalBiomeTags.IS_DRY_OVERWORLD) + .addOptionalTag(ConventionalBiomeTags.IS_NETHER) + .addOptionalTag(ConventionalBiomeTags.IS_BADLANDS) + .addOptionalTag(ConventionalBiomeTags.IS_DESERT) + .addOptionalTag(ConventionalBiomeTags.IS_SAVANNA); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_DRY) + .addTag(ConventionalBiomeTags.IS_DRY_OVERWORLD); + + getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD) + .addOptionalTag(ConventionalBiomeTags.IS_JUNGLE) + .add(BiomeKeys.DARK_FOREST); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE) + .addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD) + .addOptionalTag(ConventionalBiomeTags.IS_SAVANNA) + .addOptionalTag(ConventionalBiomeTags.IS_DESERT) + .addOptionalTag(ConventionalBiomeTags.IS_DEAD) + .addOptionalTag(ConventionalBiomeTags.IS_WASTELAND); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE) + .addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_TREE_CONIFEROUS) .add(BiomeKeys.GROVE) - .addOptionalTag(ConventionalBiomeTags.TAIGA); - getOrCreateTagBuilder(ConventionalBiomeTags.TREE_DECIDUOUS) + .addOptionalTag(ConventionalBiomeTags.IS_TAIGA); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_TREE_DECIDUOUS) .add(BiomeKeys.FOREST) .add(BiomeKeys.WINDSWEPT_FOREST) .add(BiomeKeys.FLOWER_FOREST) .add(BiomeKeys.BIRCH_FOREST) .add(BiomeKeys.DARK_FOREST) .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST); - getOrCreateTagBuilder(ConventionalBiomeTags.TREE_JUNGLE) - .addOptionalTag(ConventionalBiomeTags.JUNGLE); - getOrCreateTagBuilder(ConventionalBiomeTags.TREE_SAVANNA) - .addOptionalTag(ConventionalBiomeTags.SAVANNA); - getOrCreateTagBuilder(ConventionalBiomeTags.FLORAL) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_TREE_JUNGLE) + .addOptionalTag(ConventionalBiomeTags.IS_JUNGLE); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_TREE_SAVANNA) + .addOptionalTag(ConventionalBiomeTags.IS_SAVANNA); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLORAL) .add(BiomeKeys.SUNFLOWER_PLAINS) .add(BiomeKeys.MEADOW) .add(BiomeKeys.CHERRY_GROVE) - .addOptionalTag(ConventionalBiomeTags.FLOWER_FORESTS); + .addOptionalTag(ConventionalBiomeTags.IS_FLOWER_FOREST); } private void generateTerrainDescriptorTags() { - getOrCreateTagBuilder(ConventionalBiomeTags.MOUNTAIN_PEAK) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_MOUNTAIN_PEAK) .add(BiomeKeys.FROZEN_PEAKS) .add(BiomeKeys.JAGGED_PEAKS) .add(BiomeKeys.STONY_PEAKS); - getOrCreateTagBuilder(ConventionalBiomeTags.MOUNTAIN_SLOPE) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_MOUNTAIN_SLOPE) .add(BiomeKeys.SNOWY_SLOPES); - getOrCreateTagBuilder(ConventionalBiomeTags.AQUATIC) - .addOptionalTag(ConventionalBiomeTags.OCEAN) - .addOptionalTag(ConventionalBiomeTags.RIVER); - getOrCreateTagBuilder(ConventionalBiomeTags.DEAD); - getOrCreateTagBuilder(ConventionalBiomeTags.WASTELAND); - getOrCreateTagBuilder(ConventionalBiomeTags.END_ISLANDS); - getOrCreateTagBuilder(ConventionalBiomeTags.NETHER_FORESTS) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_AQUATIC) + .addOptionalTag(ConventionalBiomeTags.IS_OCEAN) + .addOptionalTag(ConventionalBiomeTags.IS_RIVER); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_DEAD); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_WASTELAND); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_END_ISLAND); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_NETHER_FOREST) .add(BiomeKeys.WARPED_FOREST) .add(BiomeKeys.CRIMSON_FOREST); - getOrCreateTagBuilder(ConventionalBiomeTags.SNOWY_PLAINS) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_SNOWY_PLAINS) .add(BiomeKeys.SNOWY_PLAINS); - getOrCreateTagBuilder(ConventionalBiomeTags.STONY_SHORES) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_STONY_SHORES) .add(BiomeKeys.STONY_SHORE); - getOrCreateTagBuilder(ConventionalBiomeTags.FLOWER_FORESTS) - .add(BiomeKeys.FLOWER_FOREST); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLOWER_FOREST) + .add(BiomeKeys.FLOWER_FOREST) + .addOptionalTag(new Identifier("c", "flower_forests")); + } + + private void generateBackwardsCompatTags() { + // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. + // TODO: Remove backwards compat tag entries in 1.22 + + getOrCreateTagBuilder(ConventionalBiomeTags.IS_NETHER).addOptionalTag(new Identifier("c", "in_nether")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_THE_END).addOptionalTag(new Identifier("c", "in_the_end")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_OVERWORLD).addOptionalTag(new Identifier("c", "in_the_overworld")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_TAIGA); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_EXTREME_HILLS); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_WINDSWEPT); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_JUNGLE); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_PLAINS); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_SAVANNA); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_ICY); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_AQUATIC_ICY); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_SNOWY); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_BEACH); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_FOREST); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_BIRCH_FOREST); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_OCEAN); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_DESERT); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_RIVER); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_SWAMP); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_MUSHROOM); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_UNDERGROUND); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_MOUNTAIN); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_BADLANDS).addOptionalTag(new Identifier("c", "is_mesa")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_CAVE).addOptionalTag(new Identifier("c", "caves")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_VOID); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_DEEP_OCEAN); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_SHALLOW_OCEAN); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD_OVERWORLD).addOptionalTag(new Identifier("c", "climate_cold")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD).addOptionalTag(new Identifier("c", "climate_temperate")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT_OVERWORLD).addOptionalTag(new Identifier("c", "climate_hot")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET_OVERWORLD).addOptionalTag(new Identifier("c", "climate_wet")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_DRY_OVERWORLD).addOptionalTag(new Identifier("c", "climate_dry")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD).addOptionalTag(new Identifier("c", "vegetation_dense")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD).addOptionalTag(new Identifier("c", "vegetation_sparse")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_TREE_CONIFEROUS).addOptionalTag(new Identifier("c", "tree_coniferous")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_TREE_DECIDUOUS).addOptionalTag(new Identifier("c", "tree_deciduous")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_TREE_JUNGLE).addOptionalTag(new Identifier("c", "tree_jungle")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_TREE_SAVANNA).addOptionalTag(new Identifier("c", "tree_savanna")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_FLORAL); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_MOUNTAIN_PEAK).addOptionalTag(new Identifier("c", "mountain_peak")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_MOUNTAIN_SLOPE).addOptionalTag(new Identifier("c", "mountain_slope")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_AQUATIC); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_DEAD); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_WASTELAND); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_END_ISLAND).addOptionalTag(new Identifier("c", "end_islands")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_NETHER_FOREST).addOptionalTag(new Identifier("c", "nether_forests")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_SNOWY_PLAINS); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_STONY_SHORES); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLOWER_FOREST).addOptionalTag(new Identifier("c", "flower_forests")); + } + + private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey tag) + { + return getOrCreateTagBuilder(tag).addOptionalTag(new Identifier("c", tag.id().getPath())); } } diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java new file mode 100644 index 0000000000..9e2cb5f000 --- /dev/null +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.impl.tag.convention.datagen.generators; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockEntityTypeTags; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalEntityTypeTags; +import net.minecraft.entity.EntityType; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; + +import java.util.concurrent.CompletableFuture; + +public class BlockEntityTypeTagGenerator extends FabricTagProvider.BlockEntityTypeTagProvider { + public BlockEntityTypeTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { + super(output, completableFuture); + } + + @Override + protected void configure(RegistryWrapper.WrapperLookup registries) { + getOrCreateTagBuilder(ConventionalBlockEntityTypeTags.RELOCATION_NOT_SUPPORTED); // Generate tag so others can see it exists through JSON. + } +} diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java index 9ba2a11204..18ed328196 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java @@ -16,17 +16,21 @@ package net.fabricmc.fabric.impl.tag.convention.datagen.generators; -import java.util.List; -import java.util.concurrent.CompletableFuture; - +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.BlockTags; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.DyeColor; +import net.minecraft.util.Identifier; -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags; +import java.util.List; +import java.util.Locale; +import java.util.concurrent.CompletableFuture; +import java.util.function.Consumer; public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { static List VILLAGER_JOB_SITE_BLOCKS = List.of( @@ -54,7 +58,7 @@ public BlockTagGenerator(FabricDataOutput output, CompletableFuture tag) + { + return getOrCreateTagBuilder(tag).addOptionalTag(new Identifier("c", tag.id().getPath())); + } } diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java index 35b819db66..6ce7e930d1 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java @@ -16,14 +16,16 @@ package net.fabricmc.fabric.impl.tag.convention.datagen.generators; -import java.util.concurrent.CompletableFuture; - -import net.minecraft.registry.RegistryWrapper; -import net.minecraft.enchantment.Enchantments; - import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.fabricmc.fabric.api.tag.convention.v1.ConventionalEnchantmentTags; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.Enchantments; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; + +import java.util.concurrent.CompletableFuture; public class EnchantmentTagGenerator extends FabricTagProvider.EnchantmentTagProvider { public EnchantmentTagGenerator(FabricDataOutput output, CompletableFuture registriesFuture) { @@ -53,5 +55,18 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { .add(Enchantments.PROJECTILE_PROTECTION) .add(Enchantments.FIRE_PROTECTION) .add(Enchantments.RESPIRATION); + + // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. + // TODO: Remove backwards compat tag entries in 1.22 + getOrCreateTagBuilderWithOptionalLegacy(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalEnchantmentTags.INCREASES_ENTITY_DROPS); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalEnchantmentTags.WEAPON_DAMAGE_ENHANCEMENT); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalEnchantmentTags.ENTITY_MOVEMENT_ENHANCEMENT); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalEnchantmentTags.ENTITY_DEFENSE_ENHANCEMENT); + } + + private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey tag) + { + return getOrCreateTagBuilder(tag).addOptionalTag(new Identifier("c", tag.id().getPath())); } } diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java new file mode 100644 index 0000000000..0d90cd7132 --- /dev/null +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -0,0 +1,16 @@ +package net.fabricmc.fabric.impl.tag.convention.datagen.generators; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBiomeTags; + +public class EnglishTagLangGenerator extends FabricLanguageProvider { + public EnglishTagLangGenerator(FabricDataOutput output) { + super(output); + } + + @Override + public void generateTranslations(FabricLanguageProvider.TranslationBuilder translationBuilder) { + + } +} diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java index 02b67d2ce9..e5542698b6 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java @@ -16,14 +16,15 @@ package net.fabricmc.fabric.impl.tag.convention.datagen.generators; -import java.util.concurrent.CompletableFuture; - -import net.minecraft.registry.RegistryWrapper; -import net.minecraft.entity.EntityType; - import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.fabricmc.fabric.api.tag.convention.v1.ConventionalEntityTypeTags; +import net.minecraft.entity.EntityType; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; + +import java.util.concurrent.CompletableFuture; public class EntityTypeTagGenerator extends FabricTagProvider.EntityTypeTagProvider { public EntityTypeTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { @@ -46,5 +47,16 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { getOrCreateTagBuilder(ConventionalEntityTypeTags.BOATS) .add(EntityType.BOAT) .add(EntityType.CHEST_BOAT); + + // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. + // TODO: Remove backwards compat tag entries in 1.22 + getOrCreateTagBuilderWithOptionalLegacy(ConventionalEntityTypeTags.BOSSES); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalEntityTypeTags.MINECARTS); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalEntityTypeTags.BOATS); + } + + private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey> tag) + { + return getOrCreateTagBuilder(tag).addOptionalTag(new Identifier("c", tag.id().getPath())); } } diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java index f17b4b71a3..a03ce41773 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java @@ -16,14 +16,16 @@ package net.fabricmc.fabric.impl.tag.convention.datagen.generators; -import java.util.concurrent.CompletableFuture; - -import net.minecraft.registry.RegistryWrapper; -import net.minecraft.registry.tag.FluidTags; - import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.fabricmc.fabric.api.tag.convention.v1.ConventionalFluidTags; +import net.minecraft.fluid.Fluid; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.tag.FluidTags; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; + +import java.util.concurrent.CompletableFuture; public class FluidTagGenerator extends FabricTagProvider.FluidTagProvider { public FluidTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { @@ -36,5 +38,19 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { .addOptionalTag(FluidTags.WATER); getOrCreateTagBuilder(ConventionalFluidTags.LAVA) .addOptionalTag(FluidTags.LAVA); + getOrCreateTagBuilder(ConventionalFluidTags.MILK); + getOrCreateTagBuilder(ConventionalFluidTags.HONEY); + + // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. + // TODO: Remove backwards compat tag entries in 1.22 + getOrCreateTagBuilderWithOptionalLegacy(ConventionalFluidTags.WATER); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalFluidTags.LAVA); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalFluidTags.MILK); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalFluidTags.HONEY); + } + + private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey tag) + { + return getOrCreateTagBuilder(tag).addOptionalTag(new Identifier("c", tag.id().getPath())); } } diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index 5e37c3bf55..56cacb9c83 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -16,39 +16,22 @@ package net.fabricmc.fabric.impl.tag.convention.datagen.generators; -import java.util.concurrent.CompletableFuture; - +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalItemTags; +import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; import net.minecraft.item.Items; import net.minecraft.registry.Registries; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.ItemTags; +import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalItemTags; +import java.util.concurrent.CompletableFuture; public class ItemTagGenerator extends FabricTagProvider.ItemTagProvider { - /** @deprecated Replaced with {@link ItemTags#PICKAXES}. */ - @Deprecated - private static final Identifier FABRIC_PICKAXES = createFabricId("pickaxes"); - /** @deprecated Replaced with {@link ItemTags#SHOVELS}. */ - @Deprecated - private static final Identifier FABRIC_SHOVELS = createFabricId("shovels"); - /** @deprecated Replaced with {@link ItemTags#HOES}. */ - @Deprecated - private static final Identifier FABRIC_HOES = createFabricId("hoes"); - /** @deprecated Replaced with {@link ItemTags#AXES}. */ - @Deprecated - private static final Identifier FABRIC_AXES = createFabricId("axes"); - /** @deprecated Replaced with {@link ConventionalItemTags#SHEARS}. */ - @Deprecated - private static final Identifier FABRIC_SHEARS = createFabricId("shears"); - /** @deprecated Replaced with {@link ItemTags#SWORDS}. */ - @Deprecated - private static final Identifier FABRIC_SWORDS = createFabricId("swords"); public ItemTagGenerator(FabricDataOutput output, CompletableFuture completableFuture, FabricTagProvider.BlockTagProvider blockTags) { super(output, completableFuture, blockTags); @@ -61,17 +44,20 @@ protected void configure(RegistryWrapper.WrapperLookup arg) { generateOreAndRelatedTags(); generateConsumableTags(); generateDyeTags(); + generateDyedTags(); generateVillagerJobSites(); copyItemTags(); + generateBackwardsCompatTags(); } private void copyItemTags() { + copy(ConventionalBlockTags.BARRELS, ConventionalItemTags.BARRELS); copy(ConventionalBlockTags.BOOKSHELVES, ConventionalItemTags.BOOKSHELVES); copy(ConventionalBlockTags.CHESTS, ConventionalItemTags.CHESTS); copy(ConventionalBlockTags.GLASS_BLOCKS, ConventionalItemTags.GLASS_BLOCKS); copy(ConventionalBlockTags.GLASS_PANES, ConventionalItemTags.GLASS_PANES); copy(ConventionalBlockTags.SHULKER_BOXES, ConventionalItemTags.SHULKER_BOXES); - copy(ConventionalBlockTags.WOODEN_BARRELS, ConventionalItemTags.WOODEN_BARRELS); + copy(ConventionalBlockTags.BARRELS_WOODEN, ConventionalItemTags.BARRELS_WOODEN); copy(ConventionalBlockTags.BUDDING_BLOCKS, ConventionalItemTags.BUDDING_BLOCKS); copy(ConventionalBlockTags.BUDS, ConventionalItemTags.BUDS); @@ -90,53 +76,53 @@ private void copyItemTags() { private void generateDyeTags() { getOrCreateTagBuilder(ConventionalItemTags.DYES) - .addOptionalTag(ConventionalItemTags.BLACK_DYES) - .addOptionalTag(ConventionalItemTags.BLUE_DYES) - .addOptionalTag(ConventionalItemTags.BROWN_DYES) - .addOptionalTag(ConventionalItemTags.GREEN_DYES) - .addOptionalTag(ConventionalItemTags.RED_DYES) - .addOptionalTag(ConventionalItemTags.WHITE_DYES) - .addOptionalTag(ConventionalItemTags.YELLOW_DYES) - .addOptionalTag(ConventionalItemTags.LIGHT_GRAY_DYES) - .addOptionalTag(ConventionalItemTags.LIGHT_BLUE_DYES) - .addOptionalTag(ConventionalItemTags.LIME_DYES) - .addOptionalTag(ConventionalItemTags.MAGENTA_DYES) - .addOptionalTag(ConventionalItemTags.ORANGE_DYES) - .addOptionalTag(ConventionalItemTags.PINK_DYES) - .addOptionalTag(ConventionalItemTags.CYAN_DYES) - .addOptionalTag(ConventionalItemTags.GRAY_DYES) - .addOptionalTag(ConventionalItemTags.PURPLE_DYES); - getOrCreateTagBuilder(ConventionalItemTags.BLACK_DYES) + .addOptionalTag(ConventionalItemTags.DYES_BLACK) + .addOptionalTag(ConventionalItemTags.DYES_BLUE) + .addOptionalTag(ConventionalItemTags.DYES_BROWN) + .addOptionalTag(ConventionalItemTags.DYES_GREEN) + .addOptionalTag(ConventionalItemTags.DYES_RED) + .addOptionalTag(ConventionalItemTags.DYES_WHITE) + .addOptionalTag(ConventionalItemTags.DYES_YELLOW) + .addOptionalTag(ConventionalItemTags.DYES_LIGHT_GRAY) + .addOptionalTag(ConventionalItemTags.DYES_LIGHT_BLUE) + .addOptionalTag(ConventionalItemTags.DYES_LIME) + .addOptionalTag(ConventionalItemTags.DYES_MAGENTA) + .addOptionalTag(ConventionalItemTags.DYES_ORANGE) + .addOptionalTag(ConventionalItemTags.DYES_PINK) + .addOptionalTag(ConventionalItemTags.DYES_CYAN) + .addOptionalTag(ConventionalItemTags.DYES_GRAY) + .addOptionalTag(ConventionalItemTags.DYES_PURPLE); + getOrCreateTagBuilder(ConventionalItemTags.DYES_BLACK) .add(Items.BLACK_DYE); - getOrCreateTagBuilder(ConventionalItemTags.BLUE_DYES) + getOrCreateTagBuilder(ConventionalItemTags.DYES_BLUE) .add(Items.BLUE_DYE); - getOrCreateTagBuilder(ConventionalItemTags.BROWN_DYES) + getOrCreateTagBuilder(ConventionalItemTags.DYES_BROWN) .add(Items.BROWN_DYE); - getOrCreateTagBuilder(ConventionalItemTags.GREEN_DYES) + getOrCreateTagBuilder(ConventionalItemTags.DYES_GREEN) .add(Items.GREEN_DYE); - getOrCreateTagBuilder(ConventionalItemTags.RED_DYES) + getOrCreateTagBuilder(ConventionalItemTags.DYES_RED) .add(Items.RED_DYE); - getOrCreateTagBuilder(ConventionalItemTags.WHITE_DYES) + getOrCreateTagBuilder(ConventionalItemTags.DYES_WHITE) .add(Items.WHITE_DYE); - getOrCreateTagBuilder(ConventionalItemTags.YELLOW_DYES) + getOrCreateTagBuilder(ConventionalItemTags.DYES_YELLOW) .add(Items.YELLOW_DYE); - getOrCreateTagBuilder(ConventionalItemTags.LIGHT_BLUE_DYES) + getOrCreateTagBuilder(ConventionalItemTags.DYES_LIGHT_BLUE) .add(Items.LIGHT_BLUE_DYE); - getOrCreateTagBuilder(ConventionalItemTags.LIGHT_GRAY_DYES) + getOrCreateTagBuilder(ConventionalItemTags.DYES_LIGHT_GRAY) .add(Items.LIGHT_GRAY_DYE); - getOrCreateTagBuilder(ConventionalItemTags.LIME_DYES) + getOrCreateTagBuilder(ConventionalItemTags.DYES_LIME) .add(Items.LIME_DYE); - getOrCreateTagBuilder(ConventionalItemTags.MAGENTA_DYES) + getOrCreateTagBuilder(ConventionalItemTags.DYES_MAGENTA) .add(Items.MAGENTA_DYE); - getOrCreateTagBuilder(ConventionalItemTags.ORANGE_DYES) + getOrCreateTagBuilder(ConventionalItemTags.DYES_ORANGE) .add(Items.ORANGE_DYE); - getOrCreateTagBuilder(ConventionalItemTags.PINK_DYES) + getOrCreateTagBuilder(ConventionalItemTags.DYES_PINK) .add(Items.PINK_DYE); - getOrCreateTagBuilder(ConventionalItemTags.CYAN_DYES) + getOrCreateTagBuilder(ConventionalItemTags.DYES_CYAN) .add(Items.CYAN_DYE); - getOrCreateTagBuilder(ConventionalItemTags.GRAY_DYES) + getOrCreateTagBuilder(ConventionalItemTags.DYES_GRAY) .add(Items.GRAY_DYE); - getOrCreateTagBuilder(ConventionalItemTags.PURPLE_DYES) + getOrCreateTagBuilder(ConventionalItemTags.DYES_PURPLE) .add(Items.PURPLE_DYE); } @@ -153,20 +139,20 @@ private void generateConsumableTags() { } private void generateBucketTags() { - getOrCreateTagBuilder(ConventionalItemTags.EMPTY_BUCKETS) + getOrCreateTagBuilder(ConventionalItemTags.BUCKETS_EMPTY) .add(Items.BUCKET); - getOrCreateTagBuilder(ConventionalItemTags.LAVA_BUCKETS) + getOrCreateTagBuilder(ConventionalItemTags.BUCKETS_LAVA) .add(Items.LAVA_BUCKET); - getOrCreateTagBuilder(ConventionalItemTags.ENTITY_WATER_BUCKETS) + getOrCreateTagBuilder(ConventionalItemTags.BUCKETS_ENTITY_WATER) .add(Items.AXOLOTL_BUCKET) .add(Items.COD_BUCKET) .add(Items.PUFFERFISH_BUCKET) .add(Items.TROPICAL_FISH_BUCKET) .add(Items.SALMON_BUCKET) .add(Items.TADPOLE_BUCKET); - getOrCreateTagBuilder(ConventionalItemTags.WATER_BUCKETS) + getOrCreateTagBuilder(ConventionalItemTags.BUCKETS_WATER) .add(Items.WATER_BUCKET); - getOrCreateTagBuilder(ConventionalItemTags.MILK_BUCKETS) + getOrCreateTagBuilder(ConventionalItemTags.BUCKETS_MILK) .add(Items.MILK_BUCKET); } @@ -182,114 +168,89 @@ private void generateOreAndRelatedTags() { getOrCreateTagBuilder(ConventionalItemTags.NUGGETS) .add(Items.GOLD_NUGGET, Items.IRON_NUGGET); copy(ConventionalBlockTags.ORES, ConventionalItemTags.ORES); - getOrCreateTagBuilder(ConventionalItemTags.RAW_ORES) - .addOptionalTag(ConventionalItemTags.RAW_IRON_ORES) - .addOptionalTag(ConventionalItemTags.RAW_COPPER_ORES) - .addOptionalTag(ConventionalItemTags.RAW_GOLD_ORES); + getOrCreateTagBuilder(ConventionalItemTags.ORES) + .addOptionalTag(ConventionalItemTags.ORES_QUARTZ) + .addOptionalTag(ConventionalItemTags.ORES_NETHERITE_SCRAP); + getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS) + .addOptionalTag(ConventionalItemTags.RAW_MATERIALS_IRON) + .addOptionalTag(ConventionalItemTags.RAW_MATERIALS_COPPER) + .addOptionalTag(ConventionalItemTags.RAW_MATERIALS_GOLD); + getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS) + .add(Items.RAW_IRON, Items.RAW_COPPER, Items.RAW_GOLD); + getOrCreateTagBuilder(ConventionalItemTags.RAW_BLOCKS) + .add(Items.RAW_IRON_BLOCK, Items.RAW_COPPER_BLOCK, Items.RAW_GOLD_BLOCK); // Vanilla instances - getOrCreateTagBuilder(ConventionalItemTags.IRON_INGOTS) + getOrCreateTagBuilder(ConventionalItemTags.INGOTS_IRON) .add(Items.IRON_INGOT); - getOrCreateTagBuilder(ConventionalItemTags.COPPER_INGOTS) + getOrCreateTagBuilder(ConventionalItemTags.INGOTS_COPPER) .add(Items.COPPER_INGOT); - getOrCreateTagBuilder(ConventionalItemTags.GOLD_INGOTS) + getOrCreateTagBuilder(ConventionalItemTags.INGOTS_GOLD) .add(Items.GOLD_INGOT); - getOrCreateTagBuilder(ConventionalItemTags.NETHERITE_INGOTS) + getOrCreateTagBuilder(ConventionalItemTags.INGOTS_NETHERITE) .add(Items.NETHERITE_INGOT); - getOrCreateTagBuilder(ConventionalItemTags.REDSTONE_DUSTS) - .add(Items.REDSTONE); - getOrCreateTagBuilder(ConventionalItemTags.QUARTZ_ORES) - .add(Items.NETHER_QUARTZ_ORE); - getOrCreateTagBuilder(ConventionalItemTags.QUARTZ) - .add(Items.QUARTZ); - getOrCreateTagBuilder(ConventionalItemTags.RAW_IRON_ORES) - .add(Items.RAW_IRON); - getOrCreateTagBuilder(ConventionalItemTags.RAW_COPPER_ORES) - .add(Items.RAW_COPPER); - getOrCreateTagBuilder(ConventionalItemTags.RAW_GOLD_ORES) - .add(Items.RAW_GOLD); - getOrCreateTagBuilder(ConventionalItemTags.RAW_IRON_BLOCKS) + + getOrCreateTagBuilder(ConventionalItemTags.RAW_BLOCKS_IRON) .add(Items.RAW_IRON_BLOCK); - getOrCreateTagBuilder(ConventionalItemTags.RAW_COPPER_BLOCKS) + getOrCreateTagBuilder(ConventionalItemTags.RAW_BLOCKS_COPPER) .add(Items.RAW_COPPER_BLOCK); - getOrCreateTagBuilder(ConventionalItemTags.RAW_GOLD_BLOCKS) + getOrCreateTagBuilder(ConventionalItemTags.RAW_BLOCKS_GOLD) .add(Items.RAW_GOLD_BLOCK); + + getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS_IRON) + .add(Items.RAW_IRON); + getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS_COPPER) + .add(Items.RAW_COPPER); + getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS_GOLD) + .add(Items.RAW_GOLD); + + getOrCreateTagBuilder(ConventionalItemTags.DUSTS_REDSTONE) + .add(Items.REDSTONE); + getOrCreateTagBuilder(ConventionalItemTags.DUSTS_GLOWSTONE) + .add(Items.GLOWSTONE_DUST); getOrCreateTagBuilder(ConventionalItemTags.COAL) .addOptionalTag(ItemTags.COALS); - getOrCreateTagBuilder(ConventionalItemTags.EMERALDS) + + getOrCreateTagBuilder(ConventionalItemTags.ORES_QUARTZ) + .add(Items.NETHER_QUARTZ_ORE); + getOrCreateTagBuilder(ConventionalItemTags.ORES_NETHERITE_SCRAP) + .add(Items.ANCIENT_DEBRIS); + + getOrCreateTagBuilder(ConventionalItemTags.GEMS_QUARTZ) + .add(Items.QUARTZ); + getOrCreateTagBuilder(ConventionalItemTags.GEMS_EMERALD) .add(Items.EMERALD); - getOrCreateTagBuilder(ConventionalItemTags.LAPIS) + getOrCreateTagBuilder(ConventionalItemTags.GEMS_LAPIS) .add(Items.LAPIS_LAZULI); - getOrCreateTagBuilder(ConventionalItemTags.DIAMONDS) + getOrCreateTagBuilder(ConventionalItemTags.GEMS_DIAMOND) .add(Items.DIAMOND); + getOrCreateTagBuilder(ConventionalItemTags.GEMS_AMETHYST) + .add(Items.AMETHYST_SHARD); + getOrCreateTagBuilder(ConventionalItemTags.GEMS_PRISMARINE) + .add(Items.PRISMARINE_CRYSTALS); } private void generateToolTags() { - getOrCreateTagBuilder(ConventionalItemTags.AXES) - .addOptionalTag(FABRIC_AXES) - .add(Items.DIAMOND_AXE) - .add(Items.GOLDEN_AXE) - .add(Items.WOODEN_AXE) - .add(Items.STONE_AXE) - .add(Items.IRON_AXE) - .add(Items.NETHERITE_AXE); - getOrCreateTagBuilder(ConventionalItemTags.PICKAXES) - .addOptionalTag(FABRIC_PICKAXES) - .add(Items.DIAMOND_PICKAXE) - .add(Items.GOLDEN_PICKAXE) - .add(Items.WOODEN_PICKAXE) - .add(Items.STONE_PICKAXE) - .add(Items.IRON_PICKAXE) - .add(Items.NETHERITE_PICKAXE); - getOrCreateTagBuilder(ConventionalItemTags.HOES) - .addOptionalTag(FABRIC_HOES) - .add(Items.DIAMOND_HOE) - .add(Items.GOLDEN_HOE) - .add(Items.WOODEN_HOE) - .add(Items.STONE_HOE) - .add(Items.IRON_HOE) - .add(Items.NETHERITE_HOE); - getOrCreateTagBuilder(ConventionalItemTags.SWORDS) - .addOptionalTag(FABRIC_SWORDS) - .add(Items.DIAMOND_SWORD) - .add(Items.GOLDEN_SWORD) - .add(Items.WOODEN_SWORD) - .add(Items.STONE_SWORD) - .add(Items.IRON_SWORD) - .add(Items.NETHERITE_SWORD); - getOrCreateTagBuilder(ConventionalItemTags.SHOVELS) - .addOptionalTag(FABRIC_SHOVELS) - .add(Items.DIAMOND_SHOVEL) - .add(Items.GOLDEN_SHOVEL) - .add(Items.WOODEN_SHOVEL) - .add(Items.STONE_SHOVEL) - .add(Items.IRON_SHOVEL) - .add(Items.NETHERITE_SHOVEL); - getOrCreateTagBuilder(ItemTags.AXES) - .addOptionalTag(ConventionalItemTags.AXES) - .addOptionalTag(FABRIC_AXES); - getOrCreateTagBuilder(ItemTags.PICKAXES) - .addOptionalTag(ConventionalItemTags.PICKAXES) - .addOptionalTag(FABRIC_PICKAXES); - getOrCreateTagBuilder(ItemTags.HOES) - .addOptionalTag(ConventionalItemTags.HOES) - .addOptionalTag(FABRIC_HOES); - getOrCreateTagBuilder(ItemTags.SWORDS) - .addOptionalTag(ConventionalItemTags.SWORDS) - .addOptionalTag(FABRIC_SWORDS); - getOrCreateTagBuilder(ItemTags.SHOVELS) - .addOptionalTag(ConventionalItemTags.SHOVELS) - .addOptionalTag(FABRIC_SHOVELS); - getOrCreateTagBuilder(ConventionalItemTags.SHEARS) - .addOptionalTag(FABRIC_SHEARS) - .add(Items.SHEARS); - getOrCreateTagBuilder(ConventionalItemTags.SPEARS) - .add(Items.TRIDENT); - getOrCreateTagBuilder(ConventionalItemTags.BOWS) - .add(Items.CROSSBOW) + getOrCreateTagBuilder(ConventionalItemTags.TOOLS) + .addOptionalTag(ConventionalItemTags.TOOLS_BOWS) + .addOptionalTag(ConventionalItemTags.TOOLS_CROSSBOWS) + .addOptionalTag(ConventionalItemTags.TOOLS_SHEARS) + .addOptionalTag(ConventionalItemTags.TOOLS_SHIELDS) + .addOptionalTag(ConventionalItemTags.TOOLS_SPEARS) + .addOptionalTag(ConventionalItemTags.TOOLS_FISHING_RODS); + + getOrCreateTagBuilder(ConventionalItemTags.TOOLS_BOWS) .add(Items.BOW); - getOrCreateTagBuilder(ConventionalItemTags.SHIELDS) + getOrCreateTagBuilder(ConventionalItemTags.TOOLS_CROSSBOWS) + .add(Items.CROSSBOW); + getOrCreateTagBuilder(ConventionalItemTags.TOOLS_SHEARS) + .add(Items.SHEARS); + getOrCreateTagBuilder(ConventionalItemTags.TOOLS_SHIELDS) .add(Items.SHIELD); + getOrCreateTagBuilder(ConventionalItemTags.TOOLS_SPEARS) + .add(Items.TRIDENT); + getOrCreateTagBuilder(ConventionalItemTags.TOOLS_FISHING_RODS) + .add(Items.FISHING_ROD); } private void generateVillagerJobSites() { @@ -299,7 +260,105 @@ private void generateVillagerJobSites() { .forEach(getOrCreateTagBuilder(ConventionalItemTags.VILLAGER_JOB_SITES)::add); } - private static Identifier createFabricId(String id) { - return new Identifier("fabric", id); + private void generateDyedTags() { + copy(ConventionalBlockTags.DYED_BLOCKS_BLACK, ConventionalItemTags.DYED_ITEMS_BLACK); + copy(ConventionalBlockTags.DYED_BLOCKS_BLUE, ConventionalItemTags.DYED_ITEMS_BLUE); + copy(ConventionalBlockTags.DYED_BLOCKS_BROWN, ConventionalItemTags.DYED_ITEMS_BROWN); + copy(ConventionalBlockTags.DYED_BLOCKS_CYAN, ConventionalItemTags.DYED_ITEMS_CYAN); + copy(ConventionalBlockTags.DYED_BLOCKS_GRAY, ConventionalItemTags.DYED_ITEMS_GRAY); + copy(ConventionalBlockTags.DYED_BLOCKS_GREEN, ConventionalItemTags.DYED_ITEMS_GREEN); + copy(ConventionalBlockTags.DYED_BLOCKS_LIGHT_GRAY, ConventionalItemTags.DYED_ITEMS_LIGHT_GRAY); + copy(ConventionalBlockTags.DYED_BLOCKS_LIGHT_BLUE, ConventionalItemTags.DYED_ITEMS_LIGHT_BLUE); + copy(ConventionalBlockTags.DYED_BLOCKS_LIME, ConventionalItemTags.DYED_ITEMS_LIME); + copy(ConventionalBlockTags.DYED_BLOCKS_MAGENTA, ConventionalItemTags.DYED_ITEMS_MAGENTA); + copy(ConventionalBlockTags.DYED_BLOCKS_ORANGE, ConventionalItemTags.DYED_ITEMS_ORANGE); + copy(ConventionalBlockTags.DYED_BLOCKS_PINK, ConventionalItemTags.DYED_ITEMS_PINK); + copy(ConventionalBlockTags.DYED_BLOCKS_PURPLE, ConventionalItemTags.DYED_ITEMS_PURPLE); + copy(ConventionalBlockTags.DYED_BLOCKS_RED, ConventionalItemTags.DYED_ITEMS_RED); + copy(ConventionalBlockTags.DYED_BLOCKS_WHITE, ConventionalItemTags.DYED_ITEMS_WHITE); + copy(ConventionalBlockTags.DYED_BLOCKS_YELLOW, ConventionalItemTags.DYED_ITEMS_YELLOW); + + getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS) + .addTag(ConventionalItemTags.DYED_ITEMS_BLACK) + .addTag(ConventionalItemTags.DYED_ITEMS_BLUE) + .addTag(ConventionalItemTags.DYED_ITEMS_BROWN) + .addTag(ConventionalItemTags.DYED_ITEMS_CYAN) + .addTag(ConventionalItemTags.DYED_ITEMS_GRAY) + .addTag(ConventionalItemTags.DYED_ITEMS_GREEN) + .addTag(ConventionalItemTags.DYED_ITEMS_LIGHT_BLUE) + .addTag(ConventionalItemTags.DYED_ITEMS_LIGHT_GRAY) + .addTag(ConventionalItemTags.DYED_ITEMS_LIME) + .addTag(ConventionalItemTags.DYED_ITEMS_MAGENTA) + .addTag(ConventionalItemTags.DYED_ITEMS_ORANGE) + .addTag(ConventionalItemTags.DYED_ITEMS_PINK) + .addTag(ConventionalItemTags.DYED_ITEMS_PURPLE) + .addTag(ConventionalItemTags.DYED_ITEMS_RED) + .addTag(ConventionalItemTags.DYED_ITEMS_WHITE) + .addTag(ConventionalItemTags.DYED_ITEMS_YELLOW); + } + + private void generateBackwardsCompatTags() { + // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. + // TODO: Remove backwards compat tag entries in 1.22 + + getOrCreateTagBuilder(ConventionalItemTags.DYES_BLACK).addOptionalTag(new Identifier("c", "black_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.DYES_BLUE).addOptionalTag(new Identifier("c", "blue_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.DYES_BROWN).addOptionalTag(new Identifier("c", "brown_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.DYES_GREEN).addOptionalTag(new Identifier("c", "green_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.DYES_RED).addOptionalTag(new Identifier("c", "red_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.DYES_WHITE).addOptionalTag(new Identifier("c", "white_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.DYES_YELLOW).addOptionalTag(new Identifier("c", "yellow_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.DYES_LIGHT_BLUE).addOptionalTag(new Identifier("c", "light_blue_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.DYES_LIGHT_GRAY).addOptionalTag(new Identifier("c", "light_gray_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.DYES_LIME).addOptionalTag(new Identifier("c", "lime_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.DYES_MAGENTA).addOptionalTag(new Identifier("c", "magenta_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.DYES_ORANGE).addOptionalTag(new Identifier("c", "orange_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.DYES_PINK).addOptionalTag(new Identifier("c", "pink_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.DYES_CYAN).addOptionalTag(new Identifier("c", "cyan_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.DYES_GRAY).addOptionalTag(new Identifier("c", "gray_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.DYES_PURPLE).addOptionalTag(new Identifier("c", "purple_dyes")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.DYES); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.FOODS); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.POTIONS); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.BUCKETS_EMPTY).addOptionalTag(new Identifier("c", "empty_buckets")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.BUCKETS_LAVA).addOptionalTag(new Identifier("c", "lava_buckets")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.BUCKETS_ENTITY_WATER).addOptionalTag(new Identifier("c", "entity_water_buckets")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.BUCKETS_WATER).addOptionalTag(new Identifier("c", "water_buckets")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.BUCKETS_MILK).addOptionalTag(new Identifier("c", "milk_buckets")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.DUSTS); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.GEMS); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.INGOTS); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.NUGGETS); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.RAW_MATERIALS).addOptionalTag(new Identifier("c", "raw_ores")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.INGOTS_IRON).addOptionalTag(new Identifier("c", "iron_ingots")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.INGOTS_COPPER).addOptionalTag(new Identifier("c", "copper_ingots")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.INGOTS_GOLD).addOptionalTag(new Identifier("c", "gold_ingots")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.INGOTS_NETHERITE).addOptionalTag(new Identifier("c", "netherite_ingots")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.DUSTS_REDSTONE).addOptionalTag(new Identifier("c", "dusts")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.ORES_QUARTZ).addOptionalTag(new Identifier("c", "quartz_ores")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.RAW_BLOCKS_IRON).addOptionalTag(new Identifier("c", "raw_iron_blocks")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.RAW_BLOCKS_COPPER).addOptionalTag(new Identifier("c", "raw_copper_blocks")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.RAW_BLOCKS_GOLD).addOptionalTag(new Identifier("c", "raw_gold_blocks")); + getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS_IRON).addOptionalTag(new Identifier("c", "raw_iron_ores")); + getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS_COPPER).addOptionalTag(new Identifier("c", "raw_copper_ores")); + getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS_GOLD).addOptionalTag(new Identifier("c", "raw_gold_ores")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.COAL); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.GEMS_EMERALD); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.GEMS_LAPIS); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.GEMS_DIAMOND); + getOrCreateTagBuilder(ConventionalItemTags.GEMS_DIAMOND).addOptionalTag(new Identifier("c", "diamonds")); + getOrCreateTagBuilder(ConventionalItemTags.GEMS_LAPIS).addOptionalTag(new Identifier("c", "lapis")); + getOrCreateTagBuilder(ConventionalItemTags.GEMS_EMERALD).addOptionalTag(new Identifier("c", "emeralds")); + getOrCreateTagBuilder(ConventionalItemTags.GEMS_QUARTZ).addOptionalTag(new Identifier("c", "quartz")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.TOOLS_SHEARS).addOptionalTag(new Identifier("c", "shears")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.TOOLS_SPEARS).addOptionalTag(new Identifier("c", "spears")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.TOOLS_BOWS).addOptionalTag(new Identifier("c", "bows")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.TOOLS_SHIELDS).addOptionalTag(new Identifier("c", "shields")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.VILLAGER_JOB_SITES); + } + + private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey tag) + { + return getOrCreateTagBuilder(tag).addOptionalTag(new Identifier("c", tag.id().getPath())); } } diff --git a/fabric-convention-tags-v1/src/generated/resources/assets/fabric-convention-tags-v1-datagen/lang/en_us.json b/fabric-convention-tags-v1/src/generated/resources/assets/fabric-convention-tags-v1-datagen/lang/en_us.json new file mode 100644 index 0000000000..1f37d03f3f --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/assets/fabric-convention-tags-v1-datagen/lang/en_us.json @@ -0,0 +1,3 @@ +{ + "common.is_aquatic": "Identifier Test" +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/quartz_ores.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/quartz_ores.json deleted file mode 100644 index 6c65cff932..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/quartz_ores.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:nether_quartz_ore" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/red_sandstone_stairs.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/red_sandstone_stairs.json deleted file mode 100644 index 4871421ee3..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/red_sandstone_stairs.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:red_sandstone_stairs", - "minecraft:smooth_red_sandstone_stairs" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/uncolored_sandstone_slabs.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/uncolored_sandstone_slabs.json deleted file mode 100644 index 03efe85461..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/uncolored_sandstone_slabs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:sandstone_slab", - "minecraft:cut_sandstone_slab", - "minecraft:smooth_sandstone_slab" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/uncolored_sandstone_stairs.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/uncolored_sandstone_stairs.json deleted file mode 100644 index 17f9b772f9..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/uncolored_sandstone_stairs.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:sandstone_stairs", - "minecraft:smooth_sandstone_stairs" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/entity_movement_enhancement.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/entity_movement_enhancement.json deleted file mode 100644 index e398c6b107..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/entity_movement_enhancement.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:swift_sneak", - "minecraft:depth_strider", - "minecraft:soul_speed" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/entity_types/boats.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/entity_types/boats.json deleted file mode 100644 index 3b361e1750..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/entity_types/boats.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:boat", - "minecraft:chest_boat" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/entity_types/bosses.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/entity_types/bosses.json deleted file mode 100644 index 4b3521261b..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/entity_types/bosses.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:ender_dragon", - "minecraft:wither" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/axes.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/axes.json deleted file mode 100644 index 91802a057a..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/axes.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "#fabric:axes", - "required": false - }, - "minecraft:diamond_axe", - "minecraft:golden_axe", - "minecraft:wooden_axe", - "minecraft:stone_axe", - "minecraft:iron_axe", - "minecraft:netherite_axe" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/black_dyes.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/black_dyes.json deleted file mode 100644 index c25071e211..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/black_dyes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:black_dye" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/bookshelves.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/bookshelves.json deleted file mode 100644 index 6cdb0ddace..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/bookshelves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:bookshelf" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/bows.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/bows.json deleted file mode 100644 index cd7142c568..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/bows.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:crossbow", - "minecraft:bow" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/brown_dyes.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/brown_dyes.json deleted file mode 100644 index d7744fde88..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/brown_dyes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:brown_dye" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/budding_blocks.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/budding_blocks.json deleted file mode 100644 index 9313d69e58..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/budding_blocks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:budding_amethyst" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/clusters.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/clusters.json deleted file mode 100644 index 932252eca6..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/clusters.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:amethyst_cluster" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/copper_ingots.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/copper_ingots.json deleted file mode 100644 index 4b0daa0db9..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/copper_ingots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:copper_ingot" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/cyan_dyes.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/cyan_dyes.json deleted file mode 100644 index 384cb9c640..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/cyan_dyes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:cyan_dye" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/diamonds.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/diamonds.json deleted file mode 100644 index a0b7317d86..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/diamonds.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:diamond" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/dusts.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/dusts.json deleted file mode 100644 index 147e5c7485..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/dusts.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:glowstone_dust", - "minecraft:redstone" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/emeralds.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/emeralds.json deleted file mode 100644 index 838caf0bd9..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/emeralds.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:emerald" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/empty_buckets.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/empty_buckets.json deleted file mode 100644 index bbbc81a920..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/empty_buckets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:bucket" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/gold_ingots.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/gold_ingots.json deleted file mode 100644 index d88f9571ab..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/gold_ingots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:gold_ingot" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/gray_dyes.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/gray_dyes.json deleted file mode 100644 index 3b7b4389d3..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/gray_dyes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:gray_dye" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/green_dyes.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/green_dyes.json deleted file mode 100644 index 096286bf24..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/green_dyes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:green_dye" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/hoes.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/hoes.json deleted file mode 100644 index 253e2b0196..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/hoes.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "#fabric:hoes", - "required": false - }, - "minecraft:diamond_hoe", - "minecraft:golden_hoe", - "minecraft:wooden_hoe", - "minecraft:stone_hoe", - "minecraft:iron_hoe", - "minecraft:netherite_hoe" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/iron_ingots.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/iron_ingots.json deleted file mode 100644 index 549adc4716..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/iron_ingots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:iron_ingot" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/lapis.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/lapis.json deleted file mode 100644 index e46a647221..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/lapis.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:lapis_lazuli" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/lava_buckets.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/lava_buckets.json deleted file mode 100644 index cd86ce99cd..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/lava_buckets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:lava_bucket" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/light_blue_dyes.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/light_blue_dyes.json deleted file mode 100644 index f280f4fe78..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/light_blue_dyes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:light_blue_dye" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/light_gray_dyes.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/light_gray_dyes.json deleted file mode 100644 index 82c02bce0d..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/light_gray_dyes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:light_gray_dye" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/lime_dyes.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/lime_dyes.json deleted file mode 100644 index 415993059d..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/lime_dyes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:lime_dye" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/magenta_dyes.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/magenta_dyes.json deleted file mode 100644 index 810b6e5470..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/magenta_dyes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:magenta_dye" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/milk_buckets.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/milk_buckets.json deleted file mode 100644 index a3133b34b1..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/milk_buckets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:milk_bucket" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/netherite_ingots.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/netherite_ingots.json deleted file mode 100644 index ff3f383d69..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/netherite_ingots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:netherite_ingot" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/nuggets.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/nuggets.json deleted file mode 100644 index b755b03552..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/nuggets.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:gold_nugget", - "minecraft:iron_nugget" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/orange_dyes.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/orange_dyes.json deleted file mode 100644 index 9939b61694..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/orange_dyes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:orange_dye" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/pickaxes.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/pickaxes.json deleted file mode 100644 index 6ce8db5fda..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/pickaxes.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "#fabric:pickaxes", - "required": false - }, - "minecraft:diamond_pickaxe", - "minecraft:golden_pickaxe", - "minecraft:wooden_pickaxe", - "minecraft:stone_pickaxe", - "minecraft:iron_pickaxe", - "minecraft:netherite_pickaxe" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/pink_dyes.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/pink_dyes.json deleted file mode 100644 index c5172b16be..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/pink_dyes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:pink_dye" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/purple_dyes.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/purple_dyes.json deleted file mode 100644 index cd6a8fef07..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/purple_dyes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:purple_dye" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/quartz.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/quartz.json deleted file mode 100644 index 49ac1fd152..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:quartz" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/quartz_ores.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/quartz_ores.json deleted file mode 100644 index 6c65cff932..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/quartz_ores.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:nether_quartz_ore" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_copper_blocks.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_copper_blocks.json deleted file mode 100644 index 3a578a0277..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_copper_blocks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:raw_copper_block" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_copper_ores.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_copper_ores.json deleted file mode 100644 index cb1b852f38..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_copper_ores.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:raw_copper" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_gold_ores.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_gold_ores.json deleted file mode 100644 index 3ac7724642..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_gold_ores.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:raw_gold" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_iron_blocks.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_iron_blocks.json deleted file mode 100644 index 14f551c592..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_iron_blocks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:raw_iron_block" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_iron_ores.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_iron_ores.json deleted file mode 100644 index 9c072749ce..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_iron_ores.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:raw_iron" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/red_dyes.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/red_dyes.json deleted file mode 100644 index 68b06807fa..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/red_dyes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:red_dye" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/red_sandstone_stairs.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/red_sandstone_stairs.json deleted file mode 100644 index 4871421ee3..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/red_sandstone_stairs.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:red_sandstone_stairs", - "minecraft:smooth_red_sandstone_stairs" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/redstone_dusts.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/redstone_dusts.json deleted file mode 100644 index 2703f553aa..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/redstone_dusts.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:redstone" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/shears.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/shears.json deleted file mode 100644 index 3f0b173f94..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/shears.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "#fabric:shears", - "required": false - }, - "minecraft:shears" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/shields.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/shields.json deleted file mode 100644 index 440d82e4b5..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/shields.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:shield" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/shovels.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/shovels.json deleted file mode 100644 index d4f341457a..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/shovels.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "#fabric:shovels", - "required": false - }, - "minecraft:diamond_shovel", - "minecraft:golden_shovel", - "minecraft:wooden_shovel", - "minecraft:stone_shovel", - "minecraft:iron_shovel", - "minecraft:netherite_shovel" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/spears.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/spears.json deleted file mode 100644 index 939ae4541b..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/spears.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:trident" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/swords.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/swords.json deleted file mode 100644 index a4e474652a..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/swords.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "#fabric:swords", - "required": false - }, - "minecraft:diamond_sword", - "minecraft:golden_sword", - "minecraft:wooden_sword", - "minecraft:stone_sword", - "minecraft:iron_sword", - "minecraft:netherite_sword" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/uncolored_sandstone_slabs.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/uncolored_sandstone_slabs.json deleted file mode 100644 index 03efe85461..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/uncolored_sandstone_slabs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:sandstone_slab", - "minecraft:cut_sandstone_slab", - "minecraft:smooth_sandstone_slab" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/uncolored_sandstone_stairs.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/uncolored_sandstone_stairs.json deleted file mode 100644 index 17f9b772f9..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/uncolored_sandstone_stairs.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:sandstone_stairs", - "minecraft:smooth_sandstone_stairs" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/water_buckets.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/water_buckets.json deleted file mode 100644 index ab70c822fd..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/water_buckets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:water_bucket" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/white_dyes.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/white_dyes.json deleted file mode 100644 index 1b92baa6af..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/white_dyes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:white_dye" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/wooden_barrels.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/wooden_barrels.json deleted file mode 100644 index 01825818a4..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/wooden_barrels.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:barrel" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/yellow_dyes.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/yellow_dyes.json deleted file mode 100644 index 343377909d..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/yellow_dyes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:yellow_dye" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/beach.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/beach.json deleted file mode 100644 index 93913ce229..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/beach.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "#minecraft:is_beach", - "required": false - }, - "minecraft:stony_shore" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/birch_forest.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/birch_forest.json deleted file mode 100644 index 0389e9f8e1..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/birch_forest.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:birch_forest", - "minecraft:old_growth_birch_forest" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/desert.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/desert.json deleted file mode 100644 index ff757c0365..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/desert.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:desert" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/end_islands.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/end_islands.json deleted file mode 100644 index 5e8aecc986..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/end_islands.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/extreme_hills.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/extreme_hills.json deleted file mode 100644 index 834dcb1ccc..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/extreme_hills.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:windswept_gravelly_hills", - "minecraft:windswept_hills" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/flower_forests.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/flower_forests.json deleted file mode 100644 index 4a69c610dd..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/flower_forests.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:flower_forest" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/icy.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/icy.json deleted file mode 100644 index eef6ef3e42..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/icy.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:frozen_peaks", - "minecraft:ice_spikes" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/jungle.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/jungle.json deleted file mode 100644 index a01171ae7d..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/jungle.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "#minecraft:is_jungle", - "required": false - } - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mesa.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mesa.json deleted file mode 100644 index 5ba66b2288..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mesa.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:wooded_badlands", - "minecraft:eroded_badlands", - "minecraft:badlands" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mountain_slope.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mountain_slope.json deleted file mode 100644 index 82d1884853..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mountain_slope.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:snowy_slopes" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mushroom.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mushroom.json deleted file mode 100644 index f97ef26445..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mushroom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:mushroom_fields" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/nether_forests.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/nether_forests.json deleted file mode 100644 index f78109de5b..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/nether_forests.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:warped_forest", - "minecraft:crimson_forest" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/plains.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/plains.json deleted file mode 100644 index ce7fb70b56..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/plains.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:sunflower_plains", - "minecraft:plains" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/river.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/river.json deleted file mode 100644 index c84bf06c4b..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/river.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "#minecraft:is_river", - "required": false - } - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/snowy_plains.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/snowy_plains.json deleted file mode 100644 index 54db173ca7..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/snowy_plains.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:snowy_plains" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/stony_shores.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/stony_shores.json deleted file mode 100644 index f8b581ef71..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/stony_shores.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:stony_shore" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/swamp.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/swamp.json deleted file mode 100644 index 5cc3342407..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/swamp.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:mangrove_swamp", - "minecraft:swamp" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/taiga.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/taiga.json deleted file mode 100644 index 69cce78a6a..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/taiga.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "#minecraft:is_taiga", - "required": false - } - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_coniferous.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_coniferous.json deleted file mode 100644 index 5beaf6f7d4..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_coniferous.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:grove", - { - "id": "#c:taiga", - "required": false - } - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/vegetation_dense.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/vegetation_dense.json deleted file mode 100644 index 8349d82c26..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/vegetation_dense.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "#c:jungle", - "required": false - }, - "minecraft:sunflower_plains" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/void.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/void.json deleted file mode 100644 index 76ee211256..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/void.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:the_void" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/wasteland.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/wasteland.json deleted file mode 100644 index 5e8aecc986..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/wasteland.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/dead.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/block_entity_type/relocation_not_supported.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/dead.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/block_entity_type/relocation_not_supported.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/barrels.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/barrels.json new file mode 100644 index 0000000000..41ceb0e0d3 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/barrels.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "#common:barrels/wooden", + { + "id": "#c:barrels", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/barrels/wooden.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/barrels/wooden.json new file mode 100644 index 0000000000..a9c1763f11 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/barrels/wooden.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:barrel", + { + "id": "#c:wooden_barrels", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/bookshelves.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/bookshelves.json new file mode 100644 index 0000000000..05583106f0 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/bookshelves.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:bookshelf", + { + "id": "#c:bookshelves", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/budding_blocks.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/budding_blocks.json new file mode 100644 index 0000000000..fb588b0e83 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/budding_blocks.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:budding_amethyst", + { + "id": "#c:budding_blocks", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/buds.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/buds.json similarity index 54% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/buds.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/buds.json index b20d30c88f..8cbc022463 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/buds.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/buds.json @@ -3,6 +3,10 @@ "values": [ "minecraft:small_amethyst_bud", "minecraft:medium_amethyst_bud", - "minecraft:large_amethyst_bud" + "minecraft:large_amethyst_bud", + { + "id": "#c:buds", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/chests.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/chests.json similarity index 50% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/chests.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/chests.json index 7acec0eccc..2d7c0d4f46 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/chests.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/chests.json @@ -3,6 +3,10 @@ "values": [ "minecraft:chest", "minecraft:ender_chest", - "minecraft:trapped_chest" + "minecraft:trapped_chest", + { + "id": "#c:chests", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/clusters.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/clusters.json new file mode 100644 index 0000000000..658e58564d --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/clusters.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:amethyst_cluster", + { + "id": "#c:clusters", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks.json new file mode 100644 index 0000000000..fe6fad2b72 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "#common:dyed_blocks/black", + "#common:dyed_blocks/blue", + "#common:dyed_blocks/brown", + "#common:dyed_blocks/cyan", + "#common:dyed_blocks/gray", + "#common:dyed_blocks/green", + "#common:dyed_blocks/light_blue", + "#common:dyed_blocks/light_gray", + "#common:dyed_blocks/lime", + "#common:dyed_blocks/magenta", + "#common:dyed_blocks/orange", + "#common:dyed_blocks/pink", + "#common:dyed_blocks/purple", + "#common:dyed_blocks/red", + "#common:dyed_blocks/white", + "#common:dyed_blocks/yellow" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/black.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/black.json new file mode 100644 index 0000000000..ebe31c9524 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/black.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:black_banner", + "minecraft:black_bed", + "minecraft:black_candle", + "minecraft:black_carpet", + "minecraft:black_concrete", + "minecraft:black_concrete_powder", + "minecraft:black_glazed_terracotta", + "minecraft:black_shulker_box", + "minecraft:black_stained_glass", + "minecraft:black_stained_glass_pane", + "minecraft:black_terracotta", + "minecraft:black_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/blue.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/blue.json new file mode 100644 index 0000000000..e3c6e2ca95 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/blue.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:blue_banner", + "minecraft:blue_bed", + "minecraft:blue_candle", + "minecraft:blue_carpet", + "minecraft:blue_concrete", + "minecraft:blue_concrete_powder", + "minecraft:blue_glazed_terracotta", + "minecraft:blue_shulker_box", + "minecraft:blue_stained_glass", + "minecraft:blue_stained_glass_pane", + "minecraft:blue_terracotta", + "minecraft:blue_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/brown.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/brown.json new file mode 100644 index 0000000000..d359c02cd1 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/brown.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:brown_banner", + "minecraft:brown_bed", + "minecraft:brown_candle", + "minecraft:brown_carpet", + "minecraft:brown_concrete", + "minecraft:brown_concrete_powder", + "minecraft:brown_glazed_terracotta", + "minecraft:brown_shulker_box", + "minecraft:brown_stained_glass", + "minecraft:brown_stained_glass_pane", + "minecraft:brown_terracotta", + "minecraft:brown_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/cyan.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/cyan.json new file mode 100644 index 0000000000..0fb94adcce --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/cyan.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:cyan_banner", + "minecraft:cyan_bed", + "minecraft:cyan_candle", + "minecraft:cyan_carpet", + "minecraft:cyan_concrete", + "minecraft:cyan_concrete_powder", + "minecraft:cyan_glazed_terracotta", + "minecraft:cyan_shulker_box", + "minecraft:cyan_stained_glass", + "minecraft:cyan_stained_glass_pane", + "minecraft:cyan_terracotta", + "minecraft:cyan_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/gray.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/gray.json new file mode 100644 index 0000000000..f93eeb0c38 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/gray.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:gray_banner", + "minecraft:gray_bed", + "minecraft:gray_candle", + "minecraft:gray_carpet", + "minecraft:gray_concrete", + "minecraft:gray_concrete_powder", + "minecraft:gray_glazed_terracotta", + "minecraft:gray_shulker_box", + "minecraft:gray_stained_glass", + "minecraft:gray_stained_glass_pane", + "minecraft:gray_terracotta", + "minecraft:gray_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/green.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/green.json new file mode 100644 index 0000000000..8b4261b21f --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/green.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:green_banner", + "minecraft:green_bed", + "minecraft:green_candle", + "minecraft:green_carpet", + "minecraft:green_concrete", + "minecraft:green_concrete_powder", + "minecraft:green_glazed_terracotta", + "minecraft:green_shulker_box", + "minecraft:green_stained_glass", + "minecraft:green_stained_glass_pane", + "minecraft:green_terracotta", + "minecraft:green_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_blue.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_blue.json new file mode 100644 index 0000000000..8bded9034a --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_blue.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:light_blue_banner", + "minecraft:light_blue_bed", + "minecraft:light_blue_candle", + "minecraft:light_blue_carpet", + "minecraft:light_blue_concrete", + "minecraft:light_blue_concrete_powder", + "minecraft:light_blue_glazed_terracotta", + "minecraft:light_blue_shulker_box", + "minecraft:light_blue_stained_glass", + "minecraft:light_blue_stained_glass_pane", + "minecraft:light_blue_terracotta", + "minecraft:light_blue_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_gray.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_gray.json new file mode 100644 index 0000000000..155b5fe129 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_gray.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:light_gray_banner", + "minecraft:light_gray_bed", + "minecraft:light_gray_candle", + "minecraft:light_gray_carpet", + "minecraft:light_gray_concrete", + "minecraft:light_gray_concrete_powder", + "minecraft:light_gray_glazed_terracotta", + "minecraft:light_gray_shulker_box", + "minecraft:light_gray_stained_glass", + "minecraft:light_gray_stained_glass_pane", + "minecraft:light_gray_terracotta", + "minecraft:light_gray_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/lime.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/lime.json new file mode 100644 index 0000000000..6191433953 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/lime.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:lime_banner", + "minecraft:lime_bed", + "minecraft:lime_candle", + "minecraft:lime_carpet", + "minecraft:lime_concrete", + "minecraft:lime_concrete_powder", + "minecraft:lime_glazed_terracotta", + "minecraft:lime_shulker_box", + "minecraft:lime_stained_glass", + "minecraft:lime_stained_glass_pane", + "minecraft:lime_terracotta", + "minecraft:lime_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/magenta.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/magenta.json new file mode 100644 index 0000000000..3c0960b9aa --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/magenta.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:magenta_banner", + "minecraft:magenta_bed", + "minecraft:magenta_candle", + "minecraft:magenta_carpet", + "minecraft:magenta_concrete", + "minecraft:magenta_concrete_powder", + "minecraft:magenta_glazed_terracotta", + "minecraft:magenta_shulker_box", + "minecraft:magenta_stained_glass", + "minecraft:magenta_stained_glass_pane", + "minecraft:magenta_terracotta", + "minecraft:magenta_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/orange.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/orange.json new file mode 100644 index 0000000000..6d443cdcda --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/orange.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:orange_banner", + "minecraft:orange_bed", + "minecraft:orange_candle", + "minecraft:orange_carpet", + "minecraft:orange_concrete", + "minecraft:orange_concrete_powder", + "minecraft:orange_glazed_terracotta", + "minecraft:orange_shulker_box", + "minecraft:orange_stained_glass", + "minecraft:orange_stained_glass_pane", + "minecraft:orange_terracotta", + "minecraft:orange_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/pink.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/pink.json new file mode 100644 index 0000000000..9d6aa1d83e --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/pink.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:pink_banner", + "minecraft:pink_bed", + "minecraft:pink_candle", + "minecraft:pink_carpet", + "minecraft:pink_concrete", + "minecraft:pink_concrete_powder", + "minecraft:pink_glazed_terracotta", + "minecraft:pink_shulker_box", + "minecraft:pink_stained_glass", + "minecraft:pink_stained_glass_pane", + "minecraft:pink_terracotta", + "minecraft:pink_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/purple.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/purple.json new file mode 100644 index 0000000000..330f6e2f55 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/purple.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:purple_banner", + "minecraft:purple_bed", + "minecraft:purple_candle", + "minecraft:purple_carpet", + "minecraft:purple_concrete", + "minecraft:purple_concrete_powder", + "minecraft:purple_glazed_terracotta", + "minecraft:purple_shulker_box", + "minecraft:purple_stained_glass", + "minecraft:purple_stained_glass_pane", + "minecraft:purple_terracotta", + "minecraft:purple_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/red.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/red.json new file mode 100644 index 0000000000..488a4ef6a6 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/red.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:red_banner", + "minecraft:red_bed", + "minecraft:red_candle", + "minecraft:red_carpet", + "minecraft:red_concrete", + "minecraft:red_concrete_powder", + "minecraft:red_glazed_terracotta", + "minecraft:red_shulker_box", + "minecraft:red_stained_glass", + "minecraft:red_stained_glass_pane", + "minecraft:red_terracotta", + "minecraft:red_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/white.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/white.json new file mode 100644 index 0000000000..b66e91b410 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/white.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:white_banner", + "minecraft:white_bed", + "minecraft:white_candle", + "minecraft:white_carpet", + "minecraft:white_concrete", + "minecraft:white_concrete_powder", + "minecraft:white_glazed_terracotta", + "minecraft:white_shulker_box", + "minecraft:white_stained_glass", + "minecraft:white_stained_glass_pane", + "minecraft:white_terracotta", + "minecraft:white_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/yellow.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/yellow.json new file mode 100644 index 0000000000..4a38b9a835 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/yellow.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:yellow_banner", + "minecraft:yellow_bed", + "minecraft:yellow_candle", + "minecraft:yellow_carpet", + "minecraft:yellow_concrete", + "minecraft:yellow_concrete_powder", + "minecraft:yellow_glazed_terracotta", + "minecraft:yellow_shulker_box", + "minecraft:yellow_stained_glass", + "minecraft:yellow_stained_glass_pane", + "minecraft:yellow_terracotta", + "minecraft:yellow_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/glass_blocks.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/glass_blocks.json similarity index 86% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/glass_blocks.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/glass_blocks.json index 7d701ab396..dfe7184b2a 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/glass_blocks.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/glass_blocks.json @@ -18,6 +18,10 @@ "minecraft:red_stained_glass", "minecraft:tinted_glass", "minecraft:white_stained_glass", - "minecraft:yellow_stained_glass" + "minecraft:yellow_stained_glass", + { + "id": "#c:glass_blocks", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/glass_panes.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/glass_panes.json similarity index 86% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/glass_panes.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/glass_panes.json index ced01be246..f97c5c4c4c 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/glass_panes.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/glass_panes.json @@ -17,6 +17,10 @@ "minecraft:purple_stained_glass_pane", "minecraft:red_stained_glass_pane", "minecraft:white_stained_glass_pane", - "minecraft:yellow_stained_glass_pane" + "minecraft:yellow_stained_glass_pane", + { + "id": "#c:glass_panes", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/ores.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores.json similarity index 87% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/ores.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores.json index ce1eb6df6d..2b1417225c 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/ores.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores.json @@ -34,7 +34,11 @@ "required": false }, { - "id": "#c:quartz_ores", + "id": "#common:ores/quartz", + "required": false + }, + { + "id": "#c:ores", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores/quartz.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores/quartz.json new file mode 100644 index 0000000000..8f0af0a820 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores/quartz.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:nether_quartz_ore", + { + "id": "#c:quartz_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/fluids/water.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/relocation_not_supported.json similarity index 66% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/fluids/water.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/relocation_not_supported.json index 16f57ce2d5..b4acf5ca7f 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/fluids/water.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/relocation_not_supported.json @@ -2,7 +2,7 @@ "replace": false, "values": [ { - "id": "#minecraft:water", + "id": "#c:movement_restricted", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/blocks.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/blocks.json new file mode 100644 index 0000000000..3c7666272a --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/blocks.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + { + "id": "#common:sandstone/uncolored_blocks", + "required": false + }, + { + "id": "#common:sandstone/red_blocks", + "required": false + }, + { + "id": "#c:sandstone_blocks", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/red_sandstone_blocks.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/red_blocks.json similarity index 56% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/red_sandstone_blocks.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/red_blocks.json index 1a08acdc4e..5006a1cb82 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/red_sandstone_blocks.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/red_blocks.json @@ -4,6 +4,10 @@ "minecraft:red_sandstone", "minecraft:chiseled_red_sandstone", "minecraft:cut_red_sandstone", - "minecraft:smooth_red_sandstone" + "minecraft:smooth_red_sandstone", + { + "id": "#c:red_sandstone_blocks", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/red_sandstone_slabs.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/red_slabs.json similarity index 50% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/red_sandstone_slabs.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/red_slabs.json index 22be9b64f8..cbd4deed72 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/red_sandstone_slabs.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/red_slabs.json @@ -3,6 +3,10 @@ "values": [ "minecraft:red_sandstone_slab", "minecraft:cut_red_sandstone_slab", - "minecraft:smooth_red_sandstone_slab" + "minecraft:smooth_red_sandstone_slab", + { + "id": "#c:red_sandstone_slabs", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/red_stairs.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/red_stairs.json new file mode 100644 index 0000000000..9d20c68208 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/red_stairs.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:red_sandstone_stairs", + "minecraft:smooth_red_sandstone_stairs", + { + "id": "#c:red_sandstone_stairs", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_wet.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/slabs.json similarity index 54% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_wet.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/slabs.json index 78d379c864..6d75e8f765 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_wet.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/slabs.json @@ -2,16 +2,15 @@ "replace": false, "values": [ { - "id": "#c:aquatic", + "id": "#common:sandstone/uncolored_slabs", "required": false }, { - "id": "#c:swamp", + "id": "#common:sandstone/red_slabs", "required": false }, - "minecraft:lush_caves", { - "id": "#c:jungle", + "id": "#c:sandstone_slabs", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/stairs.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/stairs.json new file mode 100644 index 0000000000..c6eca053fd --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/stairs.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + { + "id": "#common:sandstone/uncolored_stairs", + "required": false + }, + { + "id": "#common:sandstone/red_stairs", + "required": false + }, + { + "id": "#c:sandstone_stairs", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/uncolored_sandstone_blocks.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_blocks.json similarity index 54% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/uncolored_sandstone_blocks.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_blocks.json index f29b649052..f3c547fd05 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/uncolored_sandstone_blocks.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_blocks.json @@ -4,6 +4,10 @@ "minecraft:sandstone", "minecraft:chiseled_sandstone", "minecraft:cut_sandstone", - "minecraft:smooth_sandstone" + "minecraft:smooth_sandstone", + { + "id": "#c:uncolored_sandstone_blocks", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_slabs.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_slabs.json new file mode 100644 index 0000000000..ac90e3f386 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_slabs.json @@ -0,0 +1,12 @@ +{ + "replace": false, + "values": [ + "minecraft:sandstone_slab", + "minecraft:cut_sandstone_slab", + "minecraft:smooth_sandstone_slab", + { + "id": "#c:uncolored_sandstone_slabs", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/sandstone_stairs.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_stairs.json similarity index 61% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/sandstone_stairs.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_stairs.json index 233e65b97e..8a9fd9d6be 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/sandstone_stairs.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_stairs.json @@ -1,13 +1,11 @@ { "replace": false, "values": [ + "minecraft:sandstone_stairs", + "minecraft:smooth_sandstone_stairs", { "id": "#c:uncolored_sandstone_stairs", "required": false - }, - { - "id": "#c:red_sandstone_stairs", - "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/shulker_boxes.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/shulker_boxes.json similarity index 85% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/shulker_boxes.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/shulker_boxes.json index 8a9b7c8ed2..b9d106097b 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/shulker_boxes.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/shulker_boxes.json @@ -17,6 +17,10 @@ "minecraft:red_shulker_box", "minecraft:white_shulker_box", "minecraft:yellow_shulker_box", - "minecraft:black_shulker_box" + "minecraft:black_shulker_box", + { + "id": "#c:shulker_boxes", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/villager_job_sites.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/villager_job_sites.json similarity index 82% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/villager_job_sites.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/villager_job_sites.json index 88f3b11bba..1263472824 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/villager_job_sites.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/villager_job_sites.json @@ -16,6 +16,10 @@ "minecraft:loom", "minecraft:smithing_table", "minecraft:smoker", - "minecraft:stonecutter" + "minecraft:stonecutter", + { + "id": "#c:villager_job_sites", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/entity_defense_enhancement.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/entity_defense_enhancement.json similarity index 65% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/entity_defense_enhancement.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/entity_defense_enhancement.json index b01fdddc4f..4147b5de4a 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/entity_defense_enhancement.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/entity_defense_enhancement.json @@ -6,6 +6,10 @@ "minecraft:blast_protection", "minecraft:projectile_protection", "minecraft:fire_protection", - "minecraft:respiration" + "minecraft:respiration", + { + "id": "#c:entity_defense_enhancement", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/entity_movement_enhancement.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/entity_movement_enhancement.json new file mode 100644 index 0000000000..eb38ea8670 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/entity_movement_enhancement.json @@ -0,0 +1,12 @@ +{ + "replace": false, + "values": [ + "minecraft:swift_sneak", + "minecraft:depth_strider", + "minecraft:soul_speed", + { + "id": "#c:entity_movement_enhancement", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/coal.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/fortune.json similarity index 60% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/coal.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/fortune.json index 28404d4411..048852563a 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/coal.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/fortune.json @@ -1,8 +1,9 @@ { "replace": false, "values": [ + "minecraft:fortune", { - "id": "#minecraft:coals", + "id": "#c:fortune", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/looting.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/looting.json new file mode 100644 index 0000000000..a23271914a --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/looting.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:looting", + { + "id": "#c:looting", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/weapon_damage_enhancement.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/weapon_damage_enhancement.json similarity index 58% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/weapon_damage_enhancement.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/weapon_damage_enhancement.json index bdef43ba26..17df4a9551 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/weapon_damage_enhancement.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/weapon_damage_enhancement.json @@ -5,6 +5,10 @@ "minecraft:impaling", "minecraft:smite", "minecraft:power", - "minecraft:sharpness" + "minecraft:sharpness", + { + "id": "#c:weapon_damage_enhancement", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/boats.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/boats.json new file mode 100644 index 0000000000..826bfb4c6a --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/boats.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:boat", + "minecraft:chest_boat", + { + "id": "#c:boats", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/bosses.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/bosses.json new file mode 100644 index 0000000000..d290f327d3 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/bosses.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:ender_dragon", + "minecraft:wither", + { + "id": "#c:bosses", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/entity_types/minecarts.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/minecarts.json similarity index 70% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/entity_types/minecarts.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/minecarts.json index 99af753397..affb8fe890 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/entity_types/minecarts.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/minecarts.json @@ -7,6 +7,10 @@ "minecraft:furnace_minecart", "minecraft:command_block_minecart", "minecraft:hopper_minecart", - "minecraft:spawner_minecart" + "minecraft:spawner_minecart", + { + "id": "#c:minecarts", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/underground.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/fluids/honey.json similarity index 76% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/underground.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/fluids/honey.json index 48a0275e96..7236638722 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/underground.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/fluids/honey.json @@ -2,7 +2,7 @@ "replace": false, "values": [ { - "id": "#c:caves", + "id": "#c:honey", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/axes.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/fluids/lava.json similarity index 67% rename from fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/axes.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/fluids/lava.json index 4122c4bff7..4ab41673d9 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/axes.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/fluids/lava.json @@ -2,11 +2,11 @@ "replace": false, "values": [ { - "id": "#c:axes", + "id": "#minecraft:lava", "required": false }, { - "id": "#fabric:axes", + "id": "#c:lava", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_jungle.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/fluids/milk.json similarity index 75% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_jungle.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/fluids/milk.json index f47b75d1a9..9b0ea9b81f 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_jungle.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/fluids/milk.json @@ -2,7 +2,7 @@ "replace": false, "values": [ { - "id": "#c:jungle", + "id": "#c:milk", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/aquatic.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/fluids/water.json similarity index 67% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/aquatic.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/fluids/water.json index 6429b24203..7a05b9c495 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/aquatic.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/fluids/water.json @@ -2,11 +2,11 @@ "replace": false, "values": [ { - "id": "#c:ocean", + "id": "#minecraft:water", "required": false }, { - "id": "#c:river", + "id": "#c:water", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/barrels.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/barrels.json new file mode 100644 index 0000000000..41ceb0e0d3 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/barrels.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "#common:barrels/wooden", + { + "id": "#c:barrels", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/barrels/wooden.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/barrels/wooden.json new file mode 100644 index 0000000000..a9c1763f11 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/barrels/wooden.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:barrel", + { + "id": "#c:wooden_barrels", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/bookshelves.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/bookshelves.json new file mode 100644 index 0000000000..05583106f0 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/bookshelves.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:bookshelf", + { + "id": "#c:bookshelves", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/sandstone_blocks.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/empty.json similarity index 56% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/sandstone_blocks.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/empty.json index 2bde315c46..3130bc20b2 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/sandstone_blocks.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/empty.json @@ -1,12 +1,13 @@ { "replace": false, "values": [ + "minecraft:bucket", { - "id": "#c:uncolored_sandstone_blocks", + "id": "#c:buckets/empty", "required": false }, { - "id": "#c:red_sandstone_blocks", + "id": "#c:empty_buckets", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/entity_water_buckets.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/entity_water.json similarity index 52% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/entity_water_buckets.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/entity_water.json index db3afc465c..b2af4671ec 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/entity_water_buckets.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/entity_water.json @@ -6,6 +6,14 @@ "minecraft:pufferfish_bucket", "minecraft:tropical_fish_bucket", "minecraft:salmon_bucket", - "minecraft:tadpole_bucket" + "minecraft:tadpole_bucket", + { + "id": "#c:buckets/entity_water", + "required": false + }, + { + "id": "#c:entity_water_buckets", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/lava.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/lava.json new file mode 100644 index 0000000000..aeeaedc829 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/lava.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "minecraft:lava_bucket", + { + "id": "#c:buckets/lava", + "required": false + }, + { + "id": "#c:lava_buckets", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/milk.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/milk.json new file mode 100644 index 0000000000..174a40ae3f --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/milk.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "minecraft:milk_bucket", + { + "id": "#c:buckets/milk", + "required": false + }, + { + "id": "#c:milk_buckets", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/water.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/water.json new file mode 100644 index 0000000000..f0cc32ad75 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/water.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "minecraft:water_bucket", + { + "id": "#c:buckets/water", + "required": false + }, + { + "id": "#c:water_buckets", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/budding_blocks.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/budding_blocks.json new file mode 100644 index 0000000000..fb588b0e83 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/budding_blocks.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:budding_amethyst", + { + "id": "#c:budding_blocks", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/buds.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buds.json similarity index 54% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/buds.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buds.json index b20d30c88f..8cbc022463 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/buds.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buds.json @@ -3,6 +3,10 @@ "values": [ "minecraft:small_amethyst_bud", "minecraft:medium_amethyst_bud", - "minecraft:large_amethyst_bud" + "minecraft:large_amethyst_bud", + { + "id": "#c:buds", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/chests.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/chests.json similarity index 50% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/chests.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/chests.json index 7acec0eccc..2d7c0d4f46 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/chests.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/chests.json @@ -3,6 +3,10 @@ "values": [ "minecraft:chest", "minecraft:ender_chest", - "minecraft:trapped_chest" + "minecraft:trapped_chest", + { + "id": "#c:chests", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/clusters.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/clusters.json new file mode 100644 index 0000000000..658e58564d --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/clusters.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:amethyst_cluster", + { + "id": "#c:clusters", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/swords.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/coal.json similarity index 67% rename from fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/swords.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/coal.json index 1c39322455..925372a1c2 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/swords.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/coal.json @@ -2,11 +2,11 @@ "replace": false, "values": [ { - "id": "#c:swords", + "id": "#minecraft:coals", "required": false }, { - "id": "#fabric:swords", + "id": "#c:coal", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dusts.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dusts.json new file mode 100644 index 0000000000..d28bffb051 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dusts.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:glowstone_dust", + "minecraft:redstone", + { + "id": "#c:dusts", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/fortune.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dusts/glowstone.json similarity index 56% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/fortune.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dusts/glowstone.json index ce1c23ebc0..08d35494bb 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/fortune.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dusts/glowstone.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:fortune" + "minecraft:glowstone_dust" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/sandstone_slabs.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dusts/redstone.json similarity index 57% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/sandstone_slabs.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dusts/redstone.json index 5b3cffba92..fbfa6769d2 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/sandstone_slabs.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dusts/redstone.json @@ -1,12 +1,13 @@ { "replace": false, "values": [ + "minecraft:redstone", { - "id": "#c:uncolored_sandstone_slabs", + "id": "#c:dusts/redstone", "required": false }, { - "id": "#c:red_sandstone_slabs", + "id": "#c:dusts", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items.json new file mode 100644 index 0000000000..1b50b8b3af --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "#common:dyed_items/black", + "#common:dyed_items/blue", + "#common:dyed_items/brown", + "#common:dyed_items/cyan", + "#common:dyed_items/gray", + "#common:dyed_items/green", + "#common:dyed_items/light_blue", + "#common:dyed_items/light_gray", + "#common:dyed_items/lime", + "#common:dyed_items/magenta", + "#common:dyed_items/orange", + "#common:dyed_items/pink", + "#common:dyed_items/purple", + "#common:dyed_items/red", + "#common:dyed_items/white", + "#common:dyed_items/yellow" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/black.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/black.json new file mode 100644 index 0000000000..ebe31c9524 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/black.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:black_banner", + "minecraft:black_bed", + "minecraft:black_candle", + "minecraft:black_carpet", + "minecraft:black_concrete", + "minecraft:black_concrete_powder", + "minecraft:black_glazed_terracotta", + "minecraft:black_shulker_box", + "minecraft:black_stained_glass", + "minecraft:black_stained_glass_pane", + "minecraft:black_terracotta", + "minecraft:black_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/blue.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/blue.json new file mode 100644 index 0000000000..e3c6e2ca95 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/blue.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:blue_banner", + "minecraft:blue_bed", + "minecraft:blue_candle", + "minecraft:blue_carpet", + "minecraft:blue_concrete", + "minecraft:blue_concrete_powder", + "minecraft:blue_glazed_terracotta", + "minecraft:blue_shulker_box", + "minecraft:blue_stained_glass", + "minecraft:blue_stained_glass_pane", + "minecraft:blue_terracotta", + "minecraft:blue_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/brown.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/brown.json new file mode 100644 index 0000000000..d359c02cd1 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/brown.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:brown_banner", + "minecraft:brown_bed", + "minecraft:brown_candle", + "minecraft:brown_carpet", + "minecraft:brown_concrete", + "minecraft:brown_concrete_powder", + "minecraft:brown_glazed_terracotta", + "minecraft:brown_shulker_box", + "minecraft:brown_stained_glass", + "minecraft:brown_stained_glass_pane", + "minecraft:brown_terracotta", + "minecraft:brown_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/cyan.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/cyan.json new file mode 100644 index 0000000000..0fb94adcce --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/cyan.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:cyan_banner", + "minecraft:cyan_bed", + "minecraft:cyan_candle", + "minecraft:cyan_carpet", + "minecraft:cyan_concrete", + "minecraft:cyan_concrete_powder", + "minecraft:cyan_glazed_terracotta", + "minecraft:cyan_shulker_box", + "minecraft:cyan_stained_glass", + "minecraft:cyan_stained_glass_pane", + "minecraft:cyan_terracotta", + "minecraft:cyan_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/gray.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/gray.json new file mode 100644 index 0000000000..f93eeb0c38 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/gray.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:gray_banner", + "minecraft:gray_bed", + "minecraft:gray_candle", + "minecraft:gray_carpet", + "minecraft:gray_concrete", + "minecraft:gray_concrete_powder", + "minecraft:gray_glazed_terracotta", + "minecraft:gray_shulker_box", + "minecraft:gray_stained_glass", + "minecraft:gray_stained_glass_pane", + "minecraft:gray_terracotta", + "minecraft:gray_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/green.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/green.json new file mode 100644 index 0000000000..8b4261b21f --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/green.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:green_banner", + "minecraft:green_bed", + "minecraft:green_candle", + "minecraft:green_carpet", + "minecraft:green_concrete", + "minecraft:green_concrete_powder", + "minecraft:green_glazed_terracotta", + "minecraft:green_shulker_box", + "minecraft:green_stained_glass", + "minecraft:green_stained_glass_pane", + "minecraft:green_terracotta", + "minecraft:green_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/light_blue.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/light_blue.json new file mode 100644 index 0000000000..8bded9034a --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/light_blue.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:light_blue_banner", + "minecraft:light_blue_bed", + "minecraft:light_blue_candle", + "minecraft:light_blue_carpet", + "minecraft:light_blue_concrete", + "minecraft:light_blue_concrete_powder", + "minecraft:light_blue_glazed_terracotta", + "minecraft:light_blue_shulker_box", + "minecraft:light_blue_stained_glass", + "minecraft:light_blue_stained_glass_pane", + "minecraft:light_blue_terracotta", + "minecraft:light_blue_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/light_gray.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/light_gray.json new file mode 100644 index 0000000000..155b5fe129 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/light_gray.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:light_gray_banner", + "minecraft:light_gray_bed", + "minecraft:light_gray_candle", + "minecraft:light_gray_carpet", + "minecraft:light_gray_concrete", + "minecraft:light_gray_concrete_powder", + "minecraft:light_gray_glazed_terracotta", + "minecraft:light_gray_shulker_box", + "minecraft:light_gray_stained_glass", + "minecraft:light_gray_stained_glass_pane", + "minecraft:light_gray_terracotta", + "minecraft:light_gray_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/lime.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/lime.json new file mode 100644 index 0000000000..6191433953 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/lime.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:lime_banner", + "minecraft:lime_bed", + "minecraft:lime_candle", + "minecraft:lime_carpet", + "minecraft:lime_concrete", + "minecraft:lime_concrete_powder", + "minecraft:lime_glazed_terracotta", + "minecraft:lime_shulker_box", + "minecraft:lime_stained_glass", + "minecraft:lime_stained_glass_pane", + "minecraft:lime_terracotta", + "minecraft:lime_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/magenta.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/magenta.json new file mode 100644 index 0000000000..3c0960b9aa --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/magenta.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:magenta_banner", + "minecraft:magenta_bed", + "minecraft:magenta_candle", + "minecraft:magenta_carpet", + "minecraft:magenta_concrete", + "minecraft:magenta_concrete_powder", + "minecraft:magenta_glazed_terracotta", + "minecraft:magenta_shulker_box", + "minecraft:magenta_stained_glass", + "minecraft:magenta_stained_glass_pane", + "minecraft:magenta_terracotta", + "minecraft:magenta_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/orange.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/orange.json new file mode 100644 index 0000000000..6d443cdcda --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/orange.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:orange_banner", + "minecraft:orange_bed", + "minecraft:orange_candle", + "minecraft:orange_carpet", + "minecraft:orange_concrete", + "minecraft:orange_concrete_powder", + "minecraft:orange_glazed_terracotta", + "minecraft:orange_shulker_box", + "minecraft:orange_stained_glass", + "minecraft:orange_stained_glass_pane", + "minecraft:orange_terracotta", + "minecraft:orange_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/pink.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/pink.json new file mode 100644 index 0000000000..9d6aa1d83e --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/pink.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:pink_banner", + "minecraft:pink_bed", + "minecraft:pink_candle", + "minecraft:pink_carpet", + "minecraft:pink_concrete", + "minecraft:pink_concrete_powder", + "minecraft:pink_glazed_terracotta", + "minecraft:pink_shulker_box", + "minecraft:pink_stained_glass", + "minecraft:pink_stained_glass_pane", + "minecraft:pink_terracotta", + "minecraft:pink_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/purple.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/purple.json new file mode 100644 index 0000000000..330f6e2f55 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/purple.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:purple_banner", + "minecraft:purple_bed", + "minecraft:purple_candle", + "minecraft:purple_carpet", + "minecraft:purple_concrete", + "minecraft:purple_concrete_powder", + "minecraft:purple_glazed_terracotta", + "minecraft:purple_shulker_box", + "minecraft:purple_stained_glass", + "minecraft:purple_stained_glass_pane", + "minecraft:purple_terracotta", + "minecraft:purple_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/red.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/red.json new file mode 100644 index 0000000000..488a4ef6a6 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/red.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:red_banner", + "minecraft:red_bed", + "minecraft:red_candle", + "minecraft:red_carpet", + "minecraft:red_concrete", + "minecraft:red_concrete_powder", + "minecraft:red_glazed_terracotta", + "minecraft:red_shulker_box", + "minecraft:red_stained_glass", + "minecraft:red_stained_glass_pane", + "minecraft:red_terracotta", + "minecraft:red_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/white.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/white.json new file mode 100644 index 0000000000..b66e91b410 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/white.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:white_banner", + "minecraft:white_bed", + "minecraft:white_candle", + "minecraft:white_carpet", + "minecraft:white_concrete", + "minecraft:white_concrete_powder", + "minecraft:white_glazed_terracotta", + "minecraft:white_shulker_box", + "minecraft:white_stained_glass", + "minecraft:white_stained_glass_pane", + "minecraft:white_terracotta", + "minecraft:white_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/yellow.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/yellow.json new file mode 100644 index 0000000000..4a38b9a835 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/yellow.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:yellow_banner", + "minecraft:yellow_bed", + "minecraft:yellow_candle", + "minecraft:yellow_carpet", + "minecraft:yellow_concrete", + "minecraft:yellow_concrete_powder", + "minecraft:yellow_glazed_terracotta", + "minecraft:yellow_shulker_box", + "minecraft:yellow_stained_glass", + "minecraft:yellow_stained_glass_pane", + "minecraft:yellow_terracotta", + "minecraft:yellow_wool" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/dyes.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes.json similarity index 50% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/dyes.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes.json index d844993b11..a782789083 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/dyes.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes.json @@ -2,67 +2,71 @@ "replace": false, "values": [ { - "id": "#c:black_dyes", + "id": "#common:dyes/black", "required": false }, { - "id": "#c:blue_dyes", + "id": "#common:dyes/blue", "required": false }, { - "id": "#c:brown_dyes", + "id": "#common:dyes/brown", "required": false }, { - "id": "#c:green_dyes", + "id": "#common:dyes/green", "required": false }, { - "id": "#c:red_dyes", + "id": "#common:dyes/red", "required": false }, { - "id": "#c:white_dyes", + "id": "#common:dyes/white", "required": false }, { - "id": "#c:yellow_dyes", + "id": "#common:dyes/yellow", "required": false }, { - "id": "#c:light_gray_dyes", + "id": "#common:dyes/light_gray", "required": false }, { - "id": "#c:light_blue_dyes", + "id": "#common:dyes/light_blue", "required": false }, { - "id": "#c:lime_dyes", + "id": "#common:dyes/lime", "required": false }, { - "id": "#c:magenta_dyes", + "id": "#common:dyes/magenta", "required": false }, { - "id": "#c:orange_dyes", + "id": "#common:dyes/orange", "required": false }, { - "id": "#c:pink_dyes", + "id": "#common:dyes/pink", "required": false }, { - "id": "#c:cyan_dyes", + "id": "#common:dyes/cyan", "required": false }, { - "id": "#c:gray_dyes", + "id": "#common:dyes/gray", "required": false }, { - "id": "#c:purple_dyes", + "id": "#common:dyes/purple", + "required": false + }, + { + "id": "#c:dyes", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/black.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/black.json new file mode 100644 index 0000000000..cf83aebee3 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/black.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:black_dye", + { + "id": "#c:black_dyes", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/blue.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/blue.json new file mode 100644 index 0000000000..fd5ec30230 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/blue.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:blue_dye", + { + "id": "#c:blue_dyes", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/brown.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/brown.json new file mode 100644 index 0000000000..f55a4123fa --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/brown.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:brown_dye", + { + "id": "#c:brown_dyes", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/cyan.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/cyan.json new file mode 100644 index 0000000000..9df7fac00f --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/cyan.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:cyan_dye", + { + "id": "#c:cyan_dyes", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/gray.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/gray.json new file mode 100644 index 0000000000..fb7944ae24 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/gray.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:gray_dye", + { + "id": "#c:gray_dyes", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/green.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/green.json new file mode 100644 index 0000000000..1fbfe563a3 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/green.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:green_dye", + { + "id": "#c:green_dyes", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/light_blue.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/light_blue.json new file mode 100644 index 0000000000..0cfe0611d1 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/light_blue.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:light_blue_dye", + { + "id": "#c:light_blue_dyes", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/light_gray.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/light_gray.json new file mode 100644 index 0000000000..2fe9a39f43 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/light_gray.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:light_gray_dye", + { + "id": "#c:light_gray_dyes", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/lime.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/lime.json new file mode 100644 index 0000000000..0efd7ab27c --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/lime.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:lime_dye", + { + "id": "#c:lime_dyes", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/magenta.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/magenta.json new file mode 100644 index 0000000000..af5ba91d54 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/magenta.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:magenta_dye", + { + "id": "#c:magenta_dyes", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/orange.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/orange.json new file mode 100644 index 0000000000..5fcfee4da9 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/orange.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:orange_dye", + { + "id": "#c:orange_dyes", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/pink.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/pink.json new file mode 100644 index 0000000000..7bb8d7c0b8 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/pink.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:pink_dye", + { + "id": "#c:pink_dyes", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/purple.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/purple.json new file mode 100644 index 0000000000..f05e997c56 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/purple.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:purple_dye", + { + "id": "#c:purple_dyes", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/red.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/red.json new file mode 100644 index 0000000000..d787e9d436 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/red.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:red_dye", + { + "id": "#c:red_dyes", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/white.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/white.json new file mode 100644 index 0000000000..9a92c51c85 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/white.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:white_dye", + { + "id": "#c:white_dyes", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/yellow.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/yellow.json new file mode 100644 index 0000000000..7307cb919a --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/yellow.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:yellow_dye", + { + "id": "#c:yellow_dyes", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/foods.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/foods.json similarity index 92% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/foods.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/foods.json index a9bb5716de..580748a49a 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/foods.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/foods.json @@ -40,6 +40,10 @@ "minecraft:suspicious_stew", "minecraft:sweet_berries", "minecraft:glow_berries", - "minecraft:honey_bottle" + "minecraft:honey_bottle", + { + "id": "#c:foods", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/gems.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems.json similarity index 58% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/gems.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems.json index 9f186a1be2..45d3629800 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/gems.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems.json @@ -4,6 +4,10 @@ "minecraft:diamond", "minecraft:emerald", "minecraft:amethyst_shard", - "minecraft:lapis_lazuli" + "minecraft:lapis_lazuli", + { + "id": "#c:gems", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/looting.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/amethyst.json similarity index 56% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/looting.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/amethyst.json index 8ee65b0c35..10553e567e 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/looting.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/amethyst.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:looting" + "minecraft:amethyst_shard" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/diamond.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/diamond.json new file mode 100644 index 0000000000..db5b005277 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/diamond.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "minecraft:diamond", + { + "id": "#c:gems/diamond", + "required": false + }, + { + "id": "#c:diamonds", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/emerald.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/emerald.json new file mode 100644 index 0000000000..5a8ac9d573 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/emerald.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "minecraft:emerald", + { + "id": "#c:gems/emerald", + "required": false + }, + { + "id": "#c:emeralds", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/lapis.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/lapis.json new file mode 100644 index 0000000000..dfd23623e8 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/lapis.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "minecraft:lapis_lazuli", + { + "id": "#c:gems/lapis", + "required": false + }, + { + "id": "#c:lapis", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/budding_blocks.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/prismarine.json similarity index 53% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/budding_blocks.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/prismarine.json index 9313d69e58..6e3777b093 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/budding_blocks.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/prismarine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:budding_amethyst" + "minecraft:prismarine_crystals" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/forest.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/quartz.json similarity index 61% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/forest.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/quartz.json index 21192434b4..f062f80e01 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/forest.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/quartz.json @@ -1,8 +1,9 @@ { "replace": false, "values": [ + "minecraft:quartz", { - "id": "#minecraft:is_forest", + "id": "#c:quartz", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/glass_blocks.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/glass_blocks.json similarity index 86% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/glass_blocks.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/glass_blocks.json index 7d701ab396..dfe7184b2a 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/glass_blocks.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/glass_blocks.json @@ -18,6 +18,10 @@ "minecraft:red_stained_glass", "minecraft:tinted_glass", "minecraft:white_stained_glass", - "minecraft:yellow_stained_glass" + "minecraft:yellow_stained_glass", + { + "id": "#c:glass_blocks", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/glass_panes.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/glass_panes.json similarity index 86% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/glass_panes.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/glass_panes.json index ced01be246..f97c5c4c4c 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/glass_panes.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/glass_panes.json @@ -17,6 +17,10 @@ "minecraft:purple_stained_glass_pane", "minecraft:red_stained_glass_pane", "minecraft:white_stained_glass_pane", - "minecraft:yellow_stained_glass_pane" + "minecraft:yellow_stained_glass_pane", + { + "id": "#c:glass_panes", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/ingots.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots.json similarity index 57% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/ingots.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots.json index ca802dc016..18b838043e 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/ingots.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots.json @@ -4,6 +4,10 @@ "minecraft:copper_ingot", "minecraft:gold_ingot", "minecraft:iron_ingot", - "minecraft:netherite_ingot" + "minecraft:netherite_ingot", + { + "id": "#c:ingots", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/copper.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/copper.json new file mode 100644 index 0000000000..a6da07f64b --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/copper.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "minecraft:copper_ingot", + { + "id": "#c:ingots/copper", + "required": false + }, + { + "id": "#c:copper_ingots", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/sandstone_blocks.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/gold.json similarity index 56% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/sandstone_blocks.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/gold.json index 2bde315c46..4ad2f15b04 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/sandstone_blocks.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/gold.json @@ -1,12 +1,13 @@ { "replace": false, "values": [ + "minecraft:gold_ingot", { - "id": "#c:uncolored_sandstone_blocks", + "id": "#c:ingots/gold", "required": false }, { - "id": "#c:red_sandstone_blocks", + "id": "#c:gold_ingots", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/iron.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/iron.json new file mode 100644 index 0000000000..c9280f7208 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/iron.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "minecraft:iron_ingot", + { + "id": "#c:ingots/iron", + "required": false + }, + { + "id": "#c:iron_ingots", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/netherite.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/netherite.json new file mode 100644 index 0000000000..11160a6e46 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/netherite.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "minecraft:netherite_ingot", + { + "id": "#c:ingots/netherite", + "required": false + }, + { + "id": "#c:netherite_ingots", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/nuggets.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/nuggets.json new file mode 100644 index 0000000000..c4b20af346 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/nuggets.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:gold_nugget", + "minecraft:iron_nugget", + { + "id": "#c:nuggets", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/ores.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ores.json similarity index 73% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/ores.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ores.json index ce1eb6df6d..e8da2b9639 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/ores.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ores.json @@ -34,7 +34,19 @@ "required": false }, { - "id": "#c:quartz_ores", + "id": "#common:ores/quartz", + "required": false + }, + { + "id": "#c:ores", + "required": false + }, + { + "id": "#common:ores/quartz", + "required": false + }, + { + "id": "#common:ores/netherite_scrap", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/wooden_barrels.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ores/netherite_scrap.json similarity index 56% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/wooden_barrels.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ores/netherite_scrap.json index 01825818a4..6495885079 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/wooden_barrels.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ores/netherite_scrap.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:barrel" + "minecraft:ancient_debris" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ores/quartz.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ores/quartz.json new file mode 100644 index 0000000000..7beeaa2dd2 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ores/quartz.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "minecraft:nether_quartz_ore", + { + "id": "#c:ores/quartz", + "required": false + }, + { + "id": "#c:quartz_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/potions.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/potions.json similarity index 55% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/potions.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/potions.json index 3faa4304da..8a00f2f73c 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/potions.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/potions.json @@ -3,6 +3,10 @@ "values": [ "minecraft:lingering_potion", "minecraft:splash_potion", - "minecraft:potion" + "minecraft:potion", + { + "id": "#c:potions", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_gold_blocks.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks.json similarity index 52% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_gold_blocks.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks.json index 4ce9cc47d1..59e188828e 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_gold_blocks.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks.json @@ -1,6 +1,8 @@ { "replace": false, "values": [ + "minecraft:raw_iron_block", + "minecraft:raw_copper_block", "minecraft:raw_gold_block" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks/copper.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks/copper.json new file mode 100644 index 0000000000..009e618e9f --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks/copper.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_copper_block", + { + "id": "#c:raw_blocks/copper", + "required": false + }, + { + "id": "#c:raw_copper_blocks", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks/gold.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks/gold.json new file mode 100644 index 0000000000..d291947d09 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks/gold.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_gold_block", + { + "id": "#c:raw_blocks/gold", + "required": false + }, + { + "id": "#c:raw_gold_blocks", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks/iron.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks/iron.json new file mode 100644 index 0000000000..1cedf070b3 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks/iron.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_iron_block", + { + "id": "#c:raw_blocks/iron", + "required": false + }, + { + "id": "#c:raw_iron_blocks", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials.json new file mode 100644 index 0000000000..9fee8832e9 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials.json @@ -0,0 +1,28 @@ +{ + "replace": false, + "values": [ + { + "id": "#common:raw_materials/iron", + "required": false + }, + { + "id": "#common:raw_materials/copper", + "required": false + }, + { + "id": "#common:raw_materials/gold", + "required": false + }, + "minecraft:raw_iron", + "minecraft:raw_copper", + "minecraft:raw_gold", + { + "id": "#c:raw_materials", + "required": false + }, + { + "id": "#c:raw_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials/copper.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials/copper.json new file mode 100644 index 0000000000..7bbe84139c --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials/copper.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_copper", + { + "id": "#c:raw_copper_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials/gold.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials/gold.json new file mode 100644 index 0000000000..432fd17379 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials/gold.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_gold", + { + "id": "#c:raw_gold_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials/iron.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials/iron.json new file mode 100644 index 0000000000..9573eb14fe --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials/iron.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_iron", + { + "id": "#c:raw_iron_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/blocks.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/blocks.json new file mode 100644 index 0000000000..3c7666272a --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/blocks.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + { + "id": "#common:sandstone/uncolored_blocks", + "required": false + }, + { + "id": "#common:sandstone/red_blocks", + "required": false + }, + { + "id": "#c:sandstone_blocks", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/red_sandstone_blocks.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/red_blocks.json similarity index 56% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/red_sandstone_blocks.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/red_blocks.json index 1a08acdc4e..5006a1cb82 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/red_sandstone_blocks.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/red_blocks.json @@ -4,6 +4,10 @@ "minecraft:red_sandstone", "minecraft:chiseled_red_sandstone", "minecraft:cut_red_sandstone", - "minecraft:smooth_red_sandstone" + "minecraft:smooth_red_sandstone", + { + "id": "#c:red_sandstone_blocks", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/red_sandstone_slabs.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/red_slabs.json similarity index 50% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/red_sandstone_slabs.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/red_slabs.json index 22be9b64f8..cbd4deed72 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/red_sandstone_slabs.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/red_slabs.json @@ -3,6 +3,10 @@ "values": [ "minecraft:red_sandstone_slab", "minecraft:cut_red_sandstone_slab", - "minecraft:smooth_red_sandstone_slab" + "minecraft:smooth_red_sandstone_slab", + { + "id": "#c:red_sandstone_slabs", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/red_stairs.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/red_stairs.json new file mode 100644 index 0000000000..9d20c68208 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/red_stairs.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:red_sandstone_stairs", + "minecraft:smooth_red_sandstone_stairs", + { + "id": "#c:red_sandstone_stairs", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/slabs.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/slabs.json new file mode 100644 index 0000000000..6d75e8f765 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/slabs.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + { + "id": "#common:sandstone/uncolored_slabs", + "required": false + }, + { + "id": "#common:sandstone/red_slabs", + "required": false + }, + { + "id": "#c:sandstone_slabs", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/stairs.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/stairs.json new file mode 100644 index 0000000000..c6eca053fd --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/stairs.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + { + "id": "#common:sandstone/uncolored_stairs", + "required": false + }, + { + "id": "#common:sandstone/red_stairs", + "required": false + }, + { + "id": "#c:sandstone_stairs", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/uncolored_sandstone_blocks.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/uncolored_blocks.json similarity index 54% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/uncolored_sandstone_blocks.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/uncolored_blocks.json index f29b649052..f3c547fd05 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/uncolored_sandstone_blocks.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/uncolored_blocks.json @@ -4,6 +4,10 @@ "minecraft:sandstone", "minecraft:chiseled_sandstone", "minecraft:cut_sandstone", - "minecraft:smooth_sandstone" + "minecraft:smooth_sandstone", + { + "id": "#c:uncolored_sandstone_blocks", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/uncolored_slabs.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/uncolored_slabs.json new file mode 100644 index 0000000000..ac90e3f386 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/uncolored_slabs.json @@ -0,0 +1,12 @@ +{ + "replace": false, + "values": [ + "minecraft:sandstone_slab", + "minecraft:cut_sandstone_slab", + "minecraft:smooth_sandstone_slab", + { + "id": "#c:uncolored_sandstone_slabs", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/sandstone_stairs.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/uncolored_stairs.json similarity index 61% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/sandstone_stairs.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/uncolored_stairs.json index 233e65b97e..8a9fd9d6be 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/sandstone_stairs.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/uncolored_stairs.json @@ -1,13 +1,11 @@ { "replace": false, "values": [ + "minecraft:sandstone_stairs", + "minecraft:smooth_sandstone_stairs", { "id": "#c:uncolored_sandstone_stairs", "required": false - }, - { - "id": "#c:red_sandstone_stairs", - "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/shulker_boxes.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/shulker_boxes.json similarity index 85% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/shulker_boxes.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/shulker_boxes.json index 8a9b7c8ed2..b9d106097b 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/shulker_boxes.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/shulker_boxes.json @@ -17,6 +17,10 @@ "minecraft:red_shulker_box", "minecraft:white_shulker_box", "minecraft:yellow_shulker_box", - "minecraft:black_shulker_box" + "minecraft:black_shulker_box", + { + "id": "#c:shulker_boxes", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_hot.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools.json similarity index 53% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_hot.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools.json index 330e29947d..f261dd63c6 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_hot.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools.json @@ -2,28 +2,27 @@ "replace": false, "values": [ { - "id": "#c:jungle", + "id": "#common:tools/bows", "required": false }, { - "id": "#c:savanna", + "id": "#common:tools/crossbows", "required": false }, { - "id": "#c:desert", + "id": "#common:tools/shears", "required": false }, { - "id": "#c:badlands", + "id": "#common:tools/shields", "required": false }, - "minecraft:stony_peaks", { - "id": "#c:mushroom", + "id": "#common:tools/spears", "required": false }, { - "id": "#c:in_nether", + "id": "#common:tools/fishing_rods", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/bows.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/bows.json new file mode 100644 index 0000000000..f9092276b8 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/bows.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "minecraft:bow", + { + "id": "#c:tools/bows", + "required": false + }, + { + "id": "#c:bows", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/blue_dyes.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/crossbows.json similarity index 62% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/blue_dyes.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/crossbows.json index e794506ca0..ddc0358f2f 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/blue_dyes.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/crossbows.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:blue_dye" + "minecraft:crossbow" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/bookshelves.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/fishing_rods.json similarity index 59% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/bookshelves.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/fishing_rods.json index 6cdb0ddace..15a885ab6e 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/bookshelves.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/fishing_rods.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:bookshelf" + "minecraft:fishing_rod" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/shears.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/shears.json new file mode 100644 index 0000000000..54d48e9c40 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/shears.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "minecraft:shears", + { + "id": "#c:tools/shears", + "required": false + }, + { + "id": "#c:shears", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/sandstone_slabs.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/shields.json similarity index 58% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/sandstone_slabs.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/shields.json index 5b3cffba92..88b306282d 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/sandstone_slabs.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/shields.json @@ -1,12 +1,13 @@ { "replace": false, "values": [ + "minecraft:shield", { - "id": "#c:uncolored_sandstone_slabs", + "id": "#c:tools/shields", "required": false }, { - "id": "#c:red_sandstone_slabs", + "id": "#c:shields", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/spears.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/spears.json new file mode 100644 index 0000000000..893481b29d --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/spears.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "minecraft:trident", + { + "id": "#c:tools/spears", + "required": false + }, + { + "id": "#c:spears", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/villager_job_sites.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/villager_job_sites.json similarity index 78% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/villager_job_sites.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/villager_job_sites.json index 6cec2e3a75..bdd2ed34b7 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/villager_job_sites.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/villager_job_sites.json @@ -13,6 +13,10 @@ "minecraft:loom", "minecraft:smithing_table", "minecraft:smoker", - "minecraft:stonecutter" + "minecraft:stonecutter", + { + "id": "#c:villager_job_sites", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/ocean.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic.json similarity index 61% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/ocean.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic.json index 6858a9a7d7..c174dbcb57 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/ocean.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic.json @@ -2,15 +2,15 @@ "replace": false, "values": [ { - "id": "#c:deep_ocean", + "id": "#common:is_ocean", "required": false }, { - "id": "#c:shallow_ocean", + "id": "#common:is_river", "required": false }, { - "id": "#minecraft:is_ocean", + "id": "#c:is_aquatic", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/aquatic_icy.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic_icy.json similarity index 51% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/aquatic_icy.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic_icy.json index 3909a6b73d..cf8371ee9d 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/aquatic_icy.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic_icy.json @@ -3,6 +3,10 @@ "values": [ "minecraft:frozen_river", "minecraft:deep_frozen_ocean", - "minecraft:frozen_ocean" + "minecraft:frozen_ocean", + { + "id": "#c:is_aquatic_icy", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_ores.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_badlands.json similarity index 60% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_ores.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_badlands.json index 977d506ced..52b663d371 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_ores.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_badlands.json @@ -2,15 +2,15 @@ "replace": false, "values": [ { - "id": "#c:raw_iron_ores", + "id": "#minecraft:is_badlands", "required": false }, { - "id": "#c:raw_copper_ores", + "id": "#c:is_badlands", "required": false }, { - "id": "#c:raw_gold_ores", + "id": "#c:is_mesa", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_beach.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_beach.json new file mode 100644 index 0000000000..2d728a2d8f --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_beach.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + { + "id": "#minecraft:is_beach", + "required": false + }, + "minecraft:stony_shore", + { + "id": "#c:is_beach", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_birch_forest.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_birch_forest.json new file mode 100644 index 0000000000..004d0edbb5 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_birch_forest.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:birch_forest", + "minecraft:old_growth_birch_forest", + { + "id": "#c:is_birch_forest", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/caves.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_cave.json similarity index 53% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/caves.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_cave.json index 3683b730ee..ed79d41245 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/caves.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_cave.json @@ -3,6 +3,10 @@ "values": [ "minecraft:deep_dark", "minecraft:dripstone_caves", - "minecraft:lush_caves" + "minecraft:lush_caves", + { + "id": "#c:caves", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_cold.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_cold.json new file mode 100644 index 0000000000..58da1ef4db --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_cold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#common:is_cold/overworld" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_cold.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_cold/overworld.json similarity index 69% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_cold.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_cold/overworld.json index 876b1995ea..4be60a03b4 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_cold.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_cold/overworld.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "minecraft:snowy_plains", + "minecraft:snowy_slopes", "minecraft:grove", "minecraft:jagged_peaks", "minecraft:taiga", @@ -9,7 +10,11 @@ "minecraft:old_growth_spruce_taiga", "minecraft:old_growth_pine_taiga", { - "id": "#c:icy", + "id": "#common:is_icy", + "required": false + }, + { + "id": "#c:climate_cold", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_savanna.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dead.json similarity index 74% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_savanna.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dead.json index 3639d53cb9..db78d61bd8 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_savanna.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dead.json @@ -2,7 +2,7 @@ "replace": false, "values": [ { - "id": "#c:savanna", + "id": "#c:is_dead", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/deep_ocean.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_deep_ocean.json similarity index 60% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/deep_ocean.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_deep_ocean.json index 7fb9f956d6..da092a84bc 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/deep_ocean.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_deep_ocean.json @@ -4,6 +4,10 @@ "minecraft:deep_frozen_ocean", "minecraft:deep_lukewarm_ocean", "minecraft:deep_cold_ocean", - "minecraft:deep_ocean" + "minecraft:deep_ocean", + { + "id": "#c:is_deep_ocean", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation.json new file mode 100644 index 0000000000..76e00fdc7c --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + { + "id": "#common:is_dense_vegetation/overworld", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation/overworld.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation/overworld.json new file mode 100644 index 0000000000..cd5b17208c --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation/overworld.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + { + "id": "#common:is_jungle", + "required": false + }, + "minecraft:dark_forest", + { + "id": "#c:vegetation_dense", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_desert.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_desert.json new file mode 100644 index 0000000000..daf47906c8 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_desert.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:desert", + { + "id": "#c:is_desert", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dry.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dry.json new file mode 100644 index 0000000000..e80800099e --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dry.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#common:is_dry/overworld" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dry/overworld.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dry/overworld.json new file mode 100644 index 0000000000..8303ef4ddb --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dry/overworld.json @@ -0,0 +1,25 @@ +{ + "replace": false, + "values": [ + { + "id": "#common:is_nether", + "required": false + }, + { + "id": "#common:is_badlands", + "required": false + }, + { + "id": "#common:is_desert", + "required": false + }, + { + "id": "#common:is_savanna", + "required": false + }, + { + "id": "#c:climate_dry", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/fluids/lava.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_end_island.json similarity index 71% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/fluids/lava.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_end_island.json index 8d87ec53f4..c803cb50be 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/fluids/lava.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_end_island.json @@ -2,7 +2,7 @@ "replace": false, "values": [ { - "id": "#minecraft:lava", + "id": "#c:end_islands", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/windswept.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_extreme_hills.json similarity index 62% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/windswept.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_extreme_hills.json index 8df5621ae5..d4f7479323 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/windswept.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_extreme_hills.json @@ -1,9 +1,11 @@ { "replace": false, "values": [ - "minecraft:windswept_hills", "minecraft:windswept_gravelly_hills", - "minecraft:windswept_forest", - "minecraft:windswept_savanna" + "minecraft:windswept_hills", + { + "id": "#c:is_extreme_hills", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/floral.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_floral.json similarity index 61% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/floral.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_floral.json index 393f0d0626..3a7819a147 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/floral.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_floral.json @@ -5,7 +5,11 @@ "minecraft:meadow", "minecraft:cherry_grove", { - "id": "#c:flower_forests", + "id": "#common:is_flower_forest", + "required": false + }, + { + "id": "#c:is_floral", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_flower_forest.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_flower_forest.json new file mode 100644 index 0000000000..20a0f1d8ac --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_flower_forest.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "minecraft:flower_forest", + { + "id": "#c:flower_forests", + "required": false + }, + { + "id": "#c:flower_forests", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_forest.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_forest.json new file mode 100644 index 0000000000..ee8f06761c --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_forest.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#minecraft:is_forest", + "required": false + }, + { + "id": "#c:is_forest", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_hot.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_hot.json new file mode 100644 index 0000000000..51920e2162 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_hot.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#common:is_hot/overworld" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_hot/overworld.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_hot/overworld.json new file mode 100644 index 0000000000..405ea29417 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_hot/overworld.json @@ -0,0 +1,34 @@ +{ + "replace": false, + "values": [ + { + "id": "#common:is_jungle", + "required": false + }, + { + "id": "#common:is_savanna", + "required": false + }, + { + "id": "#common:is_desert", + "required": false + }, + { + "id": "#common:is_badlands", + "required": false + }, + "minecraft:stony_peaks", + { + "id": "#common:is_mushroom", + "required": false + }, + { + "id": "#common:is_nether", + "required": false + }, + { + "id": "#c:climate_hot", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_icy.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_icy.json new file mode 100644 index 0000000000..ce3febcd3b --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_icy.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:frozen_peaks", + "minecraft:ice_spikes", + { + "id": "#c:is_icy", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_jungle.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_jungle.json new file mode 100644 index 0000000000..d2fc0a56af --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_jungle.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#minecraft:is_jungle", + "required": false + }, + { + "id": "#c:is_jungle", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mountain.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mountain.json similarity index 63% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mountain.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mountain.json index 0645b033cf..a2ea40fc1c 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mountain.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mountain.json @@ -4,6 +4,10 @@ { "id": "#minecraft:is_mountain", "required": false + }, + { + "id": "#c:is_mountain", + "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mountain_peak.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/peak.json similarity index 51% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mountain_peak.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/peak.json index 2efc274e5a..150c775718 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mountain_peak.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/peak.json @@ -3,6 +3,10 @@ "values": [ "minecraft:frozen_peaks", "minecraft:jagged_peaks", - "minecraft:stony_peaks" + "minecraft:stony_peaks", + { + "id": "#c:mountain_peak", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/slope.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/slope.json new file mode 100644 index 0000000000..7a0451964d --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/slope.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:snowy_slopes", + { + "id": "#c:mountain_slope", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mushroom.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mushroom.json new file mode 100644 index 0000000000..2d54019c09 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mushroom.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:mushroom_fields", + { + "id": "#c:is_mushroom", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/in_nether.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_nether.json similarity index 71% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/in_nether.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_nether.json index 5fedecf585..c2ebcf2682 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/in_nether.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_nether.json @@ -9,6 +9,10 @@ "minecraft:warped_forest", "minecraft:nether_wastes", "minecraft:soul_sand_valley", - "minecraft:basalt_deltas" + "minecraft:basalt_deltas", + { + "id": "#c:in_nether", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_nether_forest.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_nether_forest.json new file mode 100644 index 0000000000..f0edd6a24c --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_nether_forest.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:warped_forest", + "minecraft:crimson_forest", + { + "id": "#c:nether_forests", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_dry.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_ocean.json similarity index 57% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_dry.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_ocean.json index 3e3b2d0937..a1c90f1b27 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_dry.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_ocean.json @@ -2,19 +2,19 @@ "replace": false, "values": [ { - "id": "#c:in_nether", + "id": "#common:is_deep_ocean", "required": false }, { - "id": "#c:badlands", + "id": "#common:is_shallow_ocean", "required": false }, { - "id": "#c:desert", + "id": "#minecraft:is_ocean", "required": false }, { - "id": "#c:savanna", + "id": "#c:is_ocean", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/in_overworld.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_overworld.json similarity index 94% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/in_overworld.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_overworld.json index b807c3a6a1..7168fc741d 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/in_overworld.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_overworld.json @@ -57,6 +57,10 @@ "minecraft:stony_shore", "minecraft:deep_dark", "minecraft:mangrove_swamp", - "minecraft:cherry_grove" + "minecraft:cherry_grove", + { + "id": "#c:in_the_overworld", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_plains.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_plains.json new file mode 100644 index 0000000000..35cec01518 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_plains.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:sunflower_plains", + "minecraft:plains", + { + "id": "#c:is_plains", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/hoes.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_river.json similarity index 64% rename from fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/hoes.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_river.json index 0c964bd43a..93a54c9b1e 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/hoes.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_river.json @@ -2,11 +2,11 @@ "replace": false, "values": [ { - "id": "#c:hoes", + "id": "#minecraft:is_river", "required": false }, { - "id": "#fabric:hoes", + "id": "#c:is_river", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/savanna.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_savanna.json similarity index 67% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/savanna.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_savanna.json index 4e6172601b..fb814ceafd 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/savanna.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_savanna.json @@ -7,6 +7,10 @@ }, "minecraft:savanna_plateau", "minecraft:windswept_savanna", - "minecraft:savanna" + "minecraft:savanna", + { + "id": "#c:is_savanna", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/shallow_ocean.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_shallow_ocean.json similarity index 60% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/shallow_ocean.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_shallow_ocean.json index 03e9c44ee4..99e26c0e57 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/shallow_ocean.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_shallow_ocean.json @@ -5,6 +5,10 @@ "minecraft:lukewarm_ocean", "minecraft:frozen_ocean", "minecraft:cold_ocean", - "minecraft:warm_ocean" + "minecraft:warm_ocean", + { + "id": "#c:is_shallow_ocean", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/snowy.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_snowy.json similarity index 58% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/snowy.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_snowy.json index 1df88f66c4..a82e88a58e 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/snowy.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_snowy.json @@ -4,6 +4,10 @@ "minecraft:snowy_beach", "minecraft:snowy_plains", "minecraft:snowy_slopes", - "minecraft:snowy_taiga" + "minecraft:snowy_taiga", + { + "id": "#c:is_snowy", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_snowy_plains.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_snowy_plains.json new file mode 100644 index 0000000000..0e8f18976c --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_snowy_plains.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:snowy_plains", + { + "id": "#c:is_snowy_plains", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation.json new file mode 100644 index 0000000000..14b88f5868 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + { + "id": "#common:is_sparse_vegetation/overworld", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation/overworld.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation/overworld.json new file mode 100644 index 0000000000..659f7e308f --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation/overworld.json @@ -0,0 +1,25 @@ +{ + "replace": false, + "values": [ + { + "id": "#common:is_savanna", + "required": false + }, + { + "id": "#common:is_desert", + "required": false + }, + { + "id": "#common:is_dead", + "required": false + }, + { + "id": "#common:is_wasteland", + "required": false + }, + { + "id": "#c:vegetation_sparse", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_stony_shores.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_stony_shores.json new file mode 100644 index 0000000000..397b49607f --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_stony_shores.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:stony_shore", + { + "id": "#c:is_stony_shores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_swamp.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_swamp.json new file mode 100644 index 0000000000..0376dd6db3 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_swamp.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:mangrove_swamp", + "minecraft:swamp", + { + "id": "#c:is_swamp", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/badlands.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_taiga.json similarity index 64% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/badlands.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_taiga.json index 3baae9ae65..8d2cdc6c62 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/badlands.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_taiga.json @@ -2,11 +2,11 @@ "replace": false, "values": [ { - "id": "#c:mesa", + "id": "#minecraft:is_taiga", "required": false }, { - "id": "#minecraft:is_badlands", + "id": "#c:is_taiga", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/clusters.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_temperate.json similarity index 52% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/clusters.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_temperate.json index 932252eca6..06faeda1a3 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/clusters.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_temperate.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:amethyst_cluster" + "#common:is_temperate/overworld" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_temperate.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_temperate/overworld.json similarity index 76% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_temperate.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_temperate/overworld.json index 683c6799ce..9f6d5067ed 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_temperate.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_temperate/overworld.json @@ -10,6 +10,10 @@ "minecraft:birch_forest", "minecraft:old_growth_birch_forest", "minecraft:meadow", - "minecraft:plains" + "minecraft:plains", + { + "id": "#c:climate_temperate", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/in_the_end.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_the_end.json similarity index 69% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/in_the_end.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_the_end.json index f2935d4b25..3f25adb4f6 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/in_the_end.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_the_end.json @@ -9,6 +9,10 @@ "minecraft:end_midlands", "minecraft:end_highlands", "minecraft:the_end", - "minecraft:small_end_islands" + "minecraft:small_end_islands", + { + "id": "#c:in_the_end", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/coniferous.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/coniferous.json new file mode 100644 index 0000000000..5d2d0459d8 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/coniferous.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "minecraft:grove", + { + "id": "#common:is_taiga", + "required": false + }, + { + "id": "#c:tree_coniferous", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_deciduous.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/deciduous.json similarity index 63% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_deciduous.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/deciduous.json index 10acad2815..7c5613f12a 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_deciduous.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/deciduous.json @@ -6,6 +6,10 @@ "minecraft:flower_forest", "minecraft:birch_forest", "minecraft:dark_forest", - "minecraft:old_growth_birch_forest" + "minecraft:old_growth_birch_forest", + { + "id": "#c:tree_deciduous", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/jungle.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/jungle.json new file mode 100644 index 0000000000..6fed2b2e7f --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/jungle.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#common:is_jungle", + "required": false + }, + { + "id": "#c:tree_jungle", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/savanna.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/savanna.json new file mode 100644 index 0000000000..b904991e53 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/savanna.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#common:is_savanna", + "required": false + }, + { + "id": "#c:tree_savanna", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_underground.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_underground.json new file mode 100644 index 0000000000..6ac0097e7f --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_underground.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#common:is_cave", + "required": false + }, + { + "id": "#c:is_underground", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_void.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_void.json new file mode 100644 index 0000000000..c9584420c2 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_void.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:the_void", + { + "id": "#c:is_void", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_wasteland.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_wasteland.json new file mode 100644 index 0000000000..246bfc0c07 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_wasteland.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + { + "id": "#c:is_wasteland", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_wet.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_wet.json new file mode 100644 index 0000000000..208f5207a2 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_wet.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#common:is_wet/overworld" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/vegetation_sparse.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_wet/overworld.json similarity index 62% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/vegetation_sparse.json rename to fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_wet/overworld.json index 19aa4173dc..df1ab678f0 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/vegetation_sparse.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_wet/overworld.json @@ -2,20 +2,20 @@ "replace": false, "values": [ { - "id": "#c:savanna", + "id": "#common:is_aquatic", "required": false }, { - "id": "#c:desert", + "id": "#common:is_swamp", "required": false }, + "minecraft:lush_caves", { - "id": "#c:dead", + "id": "#common:is_jungle", "required": false }, - "minecraft:lush_caves", { - "id": "#c:wasteland", + "id": "#c:climate_wet", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_windswept.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_windswept.json new file mode 100644 index 0000000000..7b574e5e6f --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_windswept.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "minecraft:windswept_hills", + "minecraft:windswept_gravelly_hills", + "minecraft:windswept_forest", + "minecraft:windswept_savanna", + { + "id": "#c:is_windswept", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/pickaxes.json b/fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/pickaxes.json deleted file mode 100644 index b94dffcc00..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/pickaxes.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "#c:pickaxes", - "required": false - }, - { - "id": "#fabric:pickaxes", - "required": false - } - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/shovels.json b/fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/shovels.json deleted file mode 100644 index 3d1b0b12b3..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/shovels.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "#c:shovels", - "required": false - }, - { - "id": "#fabric:shovels", - "required": false - } - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java index ec5ce54fb8..1a8e75c11f 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java +++ b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java @@ -34,106 +34,112 @@ private ConventionalBiomeTags() { /** * Biomes that spawn in the Overworld. */ - public static final TagKey IN_OVERWORLD = register("in_overworld"); + public static final TagKey IS_OVERWORLD = register("is_overworld"); // The following are based on Biome categories, see Biome$Category for details /** * Biomes that spawn in the End. */ - public static final TagKey IN_THE_END = register("in_the_end"); + public static final TagKey IS_THE_END = register("is_the_end"); /** * Biomes that spawn in the Nether. */ - public static final TagKey IN_NETHER = register("in_nether"); - public static final TagKey TAIGA = register("taiga"); - public static final TagKey EXTREME_HILLS = register("extreme_hills"); - public static final TagKey WINDSWEPT = register("windswept"); - public static final TagKey JUNGLE = register("jungle"); - public static final TagKey MESA = register("mesa"); + public static final TagKey IS_NETHER = register("is_nether"); + public static final TagKey IS_TAIGA = register("is_taiga"); + public static final TagKey IS_EXTREME_HILLS = register("is_extreme_hills"); + public static final TagKey IS_WINDSWEPT = register("is_windswept"); + public static final TagKey IS_JUNGLE = register("is_jungle"); /** * For temperate or warmer plains-like biomes. - * For snowy plains-like biomes, see {@link ConventionalBiomeTags#SNOWY_PLAINS}. + * For snowy plains-like biomes, see {@link ConventionalBiomeTags#IS_SNOWY_PLAINS}. */ - public static final TagKey PLAINS = register("plains"); - public static final TagKey SAVANNA = register("savanna"); + public static final TagKey IS_PLAINS = register("is_plains"); + public static final TagKey IS_SAVANNA = register("is_savanna"); /** * For land biomes where ice naturally spawns. - * For biomes where snow alone spawns, see {@link ConventionalBiomeTags#SNOWY}. + * For biomes where snow alone spawns, see {@link ConventionalBiomeTags#IS_SNOWY}. */ - public static final TagKey ICY = register("icy"); + public static final TagKey IS_ICY = register("is_icy"); /** * For water biomes where ice naturally spawns. - * For biomes where snow alone spawns, see {@link ConventionalBiomeTags#SNOWY}. + * For biomes where snow alone spawns, see {@link ConventionalBiomeTags#IS_SNOWY}. */ - public static final TagKey AQUATIC_ICY = register("aquatic_icy"); + public static final TagKey IS_AQUATIC_ICY = register("is_aquatic_icy"); /** * Biomes that exist on the shoreline of a body of water. */ - public static final TagKey BEACH = register("beach"); + public static final TagKey IS_BEACH = register("is_beach"); /** * Biomes densely populated with deciduous trees. */ - public static final TagKey FOREST = register("forest"); - public static final TagKey BIRCH_FOREST = register("birch_forest"); - public static final TagKey OCEAN = register("ocean"); - public static final TagKey DESERT = register("desert"); - public static final TagKey RIVER = register("river"); - public static final TagKey SWAMP = register("swamp"); - public static final TagKey MUSHROOM = register("mushroom"); - public static final TagKey UNDERGROUND = register("underground"); - public static final TagKey MOUNTAIN = register("mountain"); + public static final TagKey IS_FOREST = register("is_forest"); + public static final TagKey IS_BIRCH_FOREST = register("is_birch_forest"); + public static final TagKey IS_OCEAN = register("is_ocean"); + public static final TagKey IS_DESERT = register("is_desert"); + public static final TagKey IS_RIVER = register("is_river"); + public static final TagKey IS_SWAMP = register("is_swamp"); + public static final TagKey IS_MUSHROOM = register("is_mushroom"); + public static final TagKey IS_UNDERGROUND = register("is_underground"); + public static final TagKey IS_MOUNTAIN = register("is_mountain"); - public static final TagKey CLIMATE_HOT = register("climate_hot"); - public static final TagKey CLIMATE_TEMPERATE = register("climate_temperate"); - public static final TagKey CLIMATE_COLD = register("climate_cold"); - public static final TagKey CLIMATE_WET = register("climate_wet"); - public static final TagKey CLIMATE_DRY = register("climate_dry"); - public static final TagKey VEGETATION_SPARSE = register("vegetation_sparse"); - public static final TagKey VEGETATION_DENSE = register("vegetation_dense"); - public static final TagKey TREE_CONIFEROUS = register("tree_coniferous"); - public static final TagKey TREE_SAVANNA = register("tree_savanna"); - public static final TagKey TREE_JUNGLE = register("tree_jungle"); - public static final TagKey TREE_DECIDUOUS = register("tree_deciduous"); - public static final TagKey VOID = register("void"); - public static final TagKey MOUNTAIN_PEAK = register("mountain_peak"); - public static final TagKey MOUNTAIN_SLOPE = register("mountain_slope"); + public static final TagKey IS_HOT_OVERWORLD = register("is_hot/overworld"); + public static final TagKey IS_HOT = register("is_hot"); + public static final TagKey IS_TEMPERATE_OVERWORLD = register("is_temperate/overworld"); + public static final TagKey IS_TEMPERATE = register("is_temperate"); + public static final TagKey IS_COLD_OVERWORLD = register("is_cold/overworld"); + public static final TagKey IS_COLD = register("is_cold"); + public static final TagKey IS_WET_OVERWORLD = register("is_wet/overworld"); + public static final TagKey IS_WET = register("is_wet"); + public static final TagKey IS_DRY_OVERWORLD = register("is_dry/overworld"); + public static final TagKey IS_DRY = register("is_dry"); + 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_DENSE = register("is_dense_vegetation"); + public static final TagKey IS_VEGETATION_DENSE_OVERWORLD = register("is_dense_vegetation/overworld"); + public static final TagKey IS_TREE_CONIFEROUS = register("is_tree/coniferous"); + public static final TagKey IS_TREE_SAVANNA = register("is_tree/savanna"); + public static final TagKey IS_TREE_JUNGLE = register("is_tree/jungle"); + public static final TagKey IS_TREE_DECIDUOUS = register("is_tree/deciduous"); + public static final TagKey IS_VOID = register("is_void"); + public static final TagKey IS_MOUNTAIN_PEAK = register("is_mountain/peak"); + public static final TagKey IS_MOUNTAIN_SLOPE = register("is_mountain/slope"); /** * Biomes consisting primarily of water. */ - public static final TagKey AQUATIC = register("aquatic"); + public static final TagKey IS_AQUATIC = register("is_aquatic"); /** * Barren biomes that lack vegetation. */ - public static final TagKey WASTELAND = register("wasteland"); + public static final TagKey IS_WASTELAND = register("is_wasteland"); /** * Biomes whose flora primarily consists of dead or decaying vegetation. */ - public static final TagKey DEAD = register("dead"); + public static final TagKey IS_DEAD = register("is_dead"); /** * Biomes with a large amount of flowers. */ - public static final TagKey FLORAL = register("floral"); + public static final TagKey IS_FLORAL = register("is_floral"); /** * For biomes where snow, and not ice, naturally spawns as a predominant feature. - * For biomes where ice is a predominant feature, see {@link ConventionalBiomeTags#ICY}. + * For biomes where ice is a predominant feature, see {@link ConventionalBiomeTags#IS_ICY}. */ - public static final TagKey SNOWY = register("snowy"); + public static final TagKey IS_SNOWY = register("is_snowy"); - public static final TagKey BADLANDS = register("badlands"); - public static final TagKey CAVES = register("caves"); + public static final TagKey IS_BADLANDS = register("is_badlands"); + public static final TagKey IS_CAVE = register("is_cave"); /** * Biomes that spawn as or on islands in the End. */ - public static final TagKey END_ISLANDS = register("end_islands"); - public static final TagKey NETHER_FORESTS = register("nether_forests"); + public static final TagKey IS_END_ISLAND = register("is_end_island"); + public static final TagKey IS_NETHER_FOREST = register("is_nether_forest"); /** * For snowy plains-like biomes. - * For warmer plains-like biomes, see {@link ConventionalBiomeTags#PLAINS}. + * For warmer plains-like biomes, see {@link ConventionalBiomeTags#IS_PLAINS}. */ - public static final TagKey SNOWY_PLAINS = register("snowy_plains"); - public static final TagKey STONY_SHORES = register("stony_shores"); - public static final TagKey FLOWER_FORESTS = register("flower_forests"); - public static final TagKey DEEP_OCEAN = register("deep_ocean"); - public static final TagKey SHALLOW_OCEAN = register("shallow_ocean"); + public static final TagKey IS_SNOWY_PLAINS = register("is_snowy_plains"); + public static final TagKey IS_STONY_SHORES = register("is_stony_shores"); + public static final TagKey IS_FLOWER_FOREST = register("is_flower_forest"); + public static final TagKey IS_DEEP_OCEAN = register("is_deep_ocean"); + public static final TagKey IS_SHALLOW_OCEAN = register("is_shallow_ocean"); private static TagKey register(String tagID) { return TagRegistration.BIOME_TAG_REGISTRATION.registerCommon(tagID); diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockEntityTypeTags.java b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockEntityTypeTags.java new file mode 100644 index 0000000000..aebf6a5df6 --- /dev/null +++ b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockEntityTypeTags.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.api.tag.convention.v1; + +import net.fabricmc.fabric.impl.tag.convention.TagRegistration; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.entity.EntityType; +import net.minecraft.registry.tag.TagKey; + +public final class ConventionalBlockEntityTypeTags { + private ConventionalBlockEntityTypeTags() { + } + + /** + * Blocks should be included in this tag if their movement can cause serious issues such as world corruption + * upon being moved, such as chunk loaders or pipes, for mods that move block entities. + */ + public static final TagKey> RELOCATION_NOT_SUPPORTED = register("relocation_not_supported"); + + private static TagKey> register(String tagID) { + return TagRegistration.BLOCK_ENTITY_TYPE_TAG_REGISTRATION.registerCommon(tagID); + } +} diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java index 8e65d0c157..870c7a9f50 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java +++ b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java @@ -33,14 +33,15 @@ private ConventionalBlockTags() { // Ores and ingots - broad categories public static final TagKey ORES = register("ores"); // Ores and ingots - vanilla instances - public static final TagKey QUARTZ_ORES = register("quartz_ores"); + public static final TagKey ORES_QUARTZ = register("ores/quartz"); + public static final TagKey BARRELS = register("barrels"); + public static final TagKey BARRELS_WOODEN = register("barrels/wooden"); public static final TagKey BOOKSHELVES = register("bookshelves"); public static final TagKey CHESTS = register("chests"); public static final TagKey GLASS_BLOCKS = register("glass_blocks"); public static final TagKey GLASS_PANES = register("glass_panes"); public static final TagKey SHULKER_BOXES = register("shulker_boxes"); - public static final TagKey WOODEN_BARRELS = register("wooden_barrels"); // Related to budding mechanics public static final TagKey BUDDING_BLOCKS = register("budding_blocks"); @@ -50,22 +51,41 @@ private ConventionalBlockTags() { public static final TagKey VILLAGER_JOB_SITES = register("villager_job_sites"); // Sandstone - public static final TagKey SANDSTONE_BLOCKS = register("sandstone_blocks"); - public static final TagKey SANDSTONE_SLABS = register("sandstone_slabs"); - public static final TagKey SANDSTONE_STAIRS = register("sandstone_stairs"); - public static final TagKey RED_SANDSTONE_BLOCKS = register("red_sandstone_blocks"); - public static final TagKey RED_SANDSTONE_SLABS = register("red_sandstone_slabs"); - public static final TagKey RED_SANDSTONE_STAIRS = register("red_sandstone_stairs"); - public static final TagKey UNCOLORED_SANDSTONE_BLOCKS = register("uncolored_sandstone_blocks"); - public static final TagKey UNCOLORED_SANDSTONE_SLABS = register("uncolored_sandstone_slabs"); - public static final TagKey UNCOLORED_SANDSTONE_STAIRS = register("uncolored_sandstone_stairs"); + public static final TagKey SANDSTONE_BLOCKS = register("sandstone/blocks"); + public static final TagKey SANDSTONE_SLABS = register("sandstone/slabs"); + public static final TagKey SANDSTONE_STAIRS = register("sandstone/stairs"); + public static final TagKey RED_SANDSTONE_BLOCKS = register("sandstone/red_blocks"); + public static final TagKey RED_SANDSTONE_SLABS = register("sandstone/red_slabs"); + public static final TagKey RED_SANDSTONE_STAIRS = register("sandstone/red_stairs"); + public static final TagKey UNCOLORED_SANDSTONE_BLOCKS = register("sandstone/uncolored_blocks"); + public static final TagKey UNCOLORED_SANDSTONE_SLABS = register("sandstone/uncolored_slabs"); + public static final TagKey UNCOLORED_SANDSTONE_STAIRS = register("sandstone/uncolored_stairs"); + + // Blocks created with dyes + public static final TagKey DYED_BLOCKS = register("dyed_blocks"); + public static final TagKey DYED_BLOCKS_BLACK = register("dyed_blocks/black"); + public static final TagKey DYED_BLOCKS_BLUE = register("dyed_blocks/blue"); + public static final TagKey DYED_BLOCKS_BROWN = register("dyed_blocks/brown"); + public static final TagKey DYED_BLOCKS_CYAN = register("dyed_blocks/cyan"); + public static final TagKey DYED_BLOCKS_GRAY = register("dyed_blocks/gray"); + public static final TagKey DYED_BLOCKS_GREEN = register("dyed_blocks/green"); + public static final TagKey DYED_BLOCKS_LIGHT_BLUE = register("dyed_blocks/light_blue"); + public static final TagKey DYED_BLOCKS_LIGHT_GRAY = register("dyed_blocks/light_gray"); + public static final TagKey DYED_BLOCKS_LIME = register("dyed_blocks/lime"); + public static final TagKey DYED_BLOCKS_MAGENTA = register("dyed_blocks/magenta"); + public static final TagKey DYED_BLOCKS_ORANGE = register("dyed_blocks/orange"); + public static final TagKey DYED_BLOCKS_PINK = register("dyed_blocks/pink"); + public static final TagKey DYED_BLOCKS_PURPLE = register("dyed_blocks/purple"); + public static final TagKey DYED_BLOCKS_RED = register("dyed_blocks/red"); + public static final TagKey DYED_BLOCKS_WHITE = register("dyed_blocks/white"); + public static final TagKey DYED_BLOCKS_YELLOW = register("dyed_blocks/yellow"); /** * Blocks should be included in this tag if their movement can cause serious issues such as world corruption * upon being moved, such as chunk loaders or pipes, * for mods that move blocks but do not respect {@link AbstractBlock.AbstractBlockState#getPistonBehavior}. */ - public static final TagKey MOVEMENT_RESTRICTED = register("movement_restricted"); + public static final TagKey RELOCATION_NOT_SUPPORTED = register("relocation_not_supported"); private static TagKey register(String tagID) { return TagRegistration.BLOCK_TAG_REGISTRATION.registerCommon(tagID); diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java index f9c18926b3..d3d333ca69 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java +++ b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java @@ -17,7 +17,6 @@ package net.fabricmc.fabric.api.tag.convention.v1; import net.minecraft.item.Item; -import net.minecraft.registry.tag.ItemTags; import net.minecraft.registry.tag.TagKey; import net.fabricmc.fabric.impl.tag.convention.TagRegistration; @@ -31,38 +30,57 @@ private ConventionalItemTags() { } // Tool tags - public static final TagKey SHEARS = register("shears"); + public static final TagKey TOOLS = register("tools"); + public static final TagKey TOOLS_SHEARS = register("tools/shears"); /** * For throwable weapons, like Minecraft tridents. */ - public static final TagKey SPEARS = register("spears"); - public static final TagKey BOWS = register("bows"); - public static final TagKey SHIELDS = register("shields"); + public static final TagKey TOOLS_SPEARS = register("tools/spears"); + public static final TagKey TOOLS_BOWS = register("tools/bows"); + public static final TagKey TOOLS_CROSSBOWS = register("tools/crossbows"); + public static final TagKey TOOLS_SHIELDS = register("tools/shields"); + public static final TagKey TOOLS_FISHING_RODS = register("tools/fishing_rods"); + // Ores and ingots - categories public static final TagKey DUSTS = register("dusts"); public static final TagKey GEMS = register("gems"); public static final TagKey INGOTS = register("ingots"); public static final TagKey NUGGETS = register("nuggets"); public static final TagKey ORES = register("ores"); - public static final TagKey RAW_ORES = register("raw_ores"); - // Ores and ingots - vanilla instances - public static final TagKey IRON_INGOTS = register("iron_ingots"); - public static final TagKey RAW_IRON_ORES = register("raw_iron_ores"); - public static final TagKey RAW_IRON_BLOCKS = register("raw_iron_blocks"); - public static final TagKey RAW_GOLD_ORES = register("raw_gold_ores"); - public static final TagKey RAW_GOLD_BLOCKS = register("raw_gold_blocks"); - public static final TagKey GOLD_INGOTS = register("gold_ingots"); - public static final TagKey REDSTONE_DUSTS = register("redstone_dusts"); - public static final TagKey COPPER_INGOTS = register("copper_ingots"); - public static final TagKey RAW_COPPER_ORES = register("raw_copper_ores"); - public static final TagKey RAW_COPPER_BLOCKS = register("raw_copper_blocks"); - public static final TagKey NETHERITE_INGOTS = register("netherite_ingots"); - public static final TagKey QUARTZ_ORES = register("quartz_ores"); - public static final TagKey QUARTZ = register("quartz"); - public static final TagKey LAPIS = register("lapis"); - public static final TagKey DIAMONDS = register("diamonds"); - public static final TagKey EMERALDS = register("emeralds"); + public static final TagKey RAW_MATERIALS = register("raw_materials"); + public static final TagKey RAW_BLOCKS = register("raw_blocks"); + + // Raw material and blocks - vanilla instances + public static final TagKey RAW_MATERIALS_IRON = register("raw_materials/iron"); + public static final TagKey RAW_MATERIALS_GOLD = register("raw_materials/gold"); + public static final TagKey RAW_MATERIALS_COPPER = register("raw_materials/copper"); + public static final TagKey RAW_BLOCKS_IRON = register("raw_blocks/iron"); + public static final TagKey RAW_BLOCKS_GOLD = register("raw_blocks/gold"); + public static final TagKey RAW_BLOCKS_COPPER = register("raw_blocks/copper"); + + // Ingots - vanilla instances + public static final TagKey INGOTS_IRON = register("ingots/iron"); + public static final TagKey INGOTS_GOLD = register("ingots/gold"); + public static final TagKey INGOTS_COPPER = register("ingots/copper"); + public static final TagKey INGOTS_NETHERITE = register("ingots/netherite"); + + // Ores - vanilla instances + public static final TagKey ORES_NETHERITE_SCRAP = register("ores/netherite_scrap"); + public static final TagKey ORES_QUARTZ = register("ores/quartz"); + + // Gems - vanilla instances + public static final TagKey GEMS_QUARTZ = register("gems/quartz"); + public static final TagKey GEMS_LAPIS = register("gems/lapis"); + public static final TagKey GEMS_DIAMOND = register("gems/diamond"); + public static final TagKey GEMS_AMETHYST = register("gems/amethyst"); + public static final TagKey GEMS_EMERALD = register("gems/emerald"); + public static final TagKey GEMS_PRISMARINE = register("gems/prismarine"); + + // Dusts and Misc - vanilla instances + public static final TagKey DUSTS_REDSTONE = register("dusts/redstone"); + public static final TagKey DUSTS_GLOWSTONE = register("dusts/glowstone"); public static final TagKey COAL = register("coal"); + // Consumables public static final TagKey FOODS = register("foods"); public static final TagKey POTIONS = register("potions"); @@ -70,18 +88,19 @@ private ConventionalItemTags() { /** * Does not include entity water buckets. */ - public static final TagKey WATER_BUCKETS = register("water_buckets"); - public static final TagKey ENTITY_WATER_BUCKETS = register("entity_water_buckets"); - public static final TagKey LAVA_BUCKETS = register("lava_buckets"); - public static final TagKey MILK_BUCKETS = register("milk_buckets"); - public static final TagKey EMPTY_BUCKETS = register("empty_buckets"); + public static final TagKey BUCKETS_WATER = register("buckets/water"); + public static final TagKey BUCKETS_ENTITY_WATER = register("buckets/entity_water"); + public static final TagKey BUCKETS_LAVA = register("buckets/lava"); + public static final TagKey BUCKETS_MILK = register("buckets/milk"); + public static final TagKey BUCKETS_EMPTY = register("buckets/empty"); + public static final TagKey BARRELS = register("barrels"); + public static final TagKey BARRELS_WOODEN = register("barrels/wooden"); public static final TagKey BOOKSHELVES = register("bookshelves"); public static final TagKey CHESTS = register("chests"); public static final TagKey GLASS_BLOCKS = register("glass_blocks"); public static final TagKey GLASS_PANES = register("glass_panes"); public static final TagKey SHULKER_BOXES = register("shulker_boxes"); - public static final TagKey WOODEN_BARRELS = register("wooden_barrels"); // Related to budding mechanics public static final TagKey BUDDING_BLOCKS = register("budding_blocks"); @@ -91,64 +110,53 @@ private ConventionalItemTags() { public static final TagKey VILLAGER_JOB_SITES = register("villager_job_sites"); // Sandstone - public static final TagKey SANDSTONE_BLOCKS = register("sandstone_blocks"); - public static final TagKey SANDSTONE_SLABS = register("sandstone_slabs"); - public static final TagKey SANDSTONE_STAIRS = register("sandstone_stairs"); - public static final TagKey RED_SANDSTONE_BLOCKS = register("red_sandstone_blocks"); - public static final TagKey RED_SANDSTONE_SLABS = register("red_sandstone_slabs"); - public static final TagKey RED_SANDSTONE_STAIRS = register("red_sandstone_stairs"); - public static final TagKey UNCOLORED_SANDSTONE_BLOCKS = register("uncolored_sandstone_blocks"); - public static final TagKey UNCOLORED_SANDSTONE_SLABS = register("uncolored_sandstone_slabs"); - public static final TagKey UNCOLORED_SANDSTONE_STAIRS = register("uncolored_sandstone_stairs"); + public static final TagKey SANDSTONE_BLOCKS = register("sandstone/blocks"); + public static final TagKey SANDSTONE_SLABS = register("sandstone/slabs"); + public static final TagKey SANDSTONE_STAIRS = register("sandstone/stairs"); + public static final TagKey RED_SANDSTONE_BLOCKS = register("sandstone/red_blocks"); + public static final TagKey RED_SANDSTONE_SLABS = register("sandstone/red_slabs"); + public static final TagKey RED_SANDSTONE_STAIRS = register("sandstone/red_stairs"); + public static final TagKey UNCOLORED_SANDSTONE_BLOCKS = register("sandstone/uncolored_blocks"); + public static final TagKey UNCOLORED_SANDSTONE_SLABS = register("sandstone/uncolored_slabs"); + public static final TagKey UNCOLORED_SANDSTONE_STAIRS = register("sandstone/uncolored_stairs"); // Dyes public static final TagKey DYES = register("dyes"); - public static final TagKey BLACK_DYES = register("black_dyes"); - public static final TagKey BLUE_DYES = register("blue_dyes"); - public static final TagKey BROWN_DYES = register("brown_dyes"); - public static final TagKey CYAN_DYES = register("cyan_dyes"); - public static final TagKey GRAY_DYES = register("gray_dyes"); - public static final TagKey GREEN_DYES = register("green_dyes"); - public static final TagKey LIGHT_BLUE_DYES = register("light_blue_dyes"); - public static final TagKey LIGHT_GRAY_DYES = register("light_gray_dyes"); - public static final TagKey LIME_DYES = register("lime_dyes"); - public static final TagKey MAGENTA_DYES = register("magenta_dyes"); - public static final TagKey ORANGE_DYES = register("orange_dyes"); - public static final TagKey PINK_DYES = register("pink_dyes"); - public static final TagKey PURPLE_DYES = register("purple_dyes"); - public static final TagKey RED_DYES = register("red_dyes"); - public static final TagKey WHITE_DYES = register("white_dyes"); - public static final TagKey YELLOW_DYES = register("yellow_dyes"); - - // Deprecated - /** @deprecated Replaced with {@link #WATER_BUCKETS}. */ - @Deprecated(forRemoval = true) - public static final TagKey WATER_BUCKET = WATER_BUCKETS; - /** @deprecated Replaced with {@link #LAVA_BUCKETS}. */ - @Deprecated(forRemoval = true) - public static final TagKey LAVA_BUCKET = LAVA_BUCKETS; - /** @deprecated Replaced with {@link #MILK_BUCKETS}. */ - @Deprecated(forRemoval = true) - public static final TagKey MILK_BUCKET = MILK_BUCKETS; - /** @deprecated Replaced with {@link #EMPTY_BUCKETS}. */ - @Deprecated(forRemoval = true) - public static final TagKey EMPTY_BUCKET = EMPTY_BUCKETS; - - /** @deprecated Replaced with {@link ItemTags#PICKAXES}. */ - @Deprecated(forRemoval = true) - public static final TagKey PICKAXES = register("pickaxes"); - /** @deprecated Replaced with {@link ItemTags#SHOVELS}. */ - @Deprecated(forRemoval = true) - public static final TagKey SHOVELS = register("shovels"); - /** @deprecated Replaced with {@link ItemTags#HOES}. */ - @Deprecated(forRemoval = true) - public static final TagKey HOES = register("hoes"); - /** @deprecated Replaced with {@link ItemTags#AXES}. */ - @Deprecated(forRemoval = true) - public static final TagKey AXES = register("axes"); - /** @deprecated Replaced with {@link ItemTags#SWORDS}. */ - @Deprecated(forRemoval = true) - public static final TagKey SWORDS = register("swords"); + public static final TagKey DYES_BLACK = register("dyes/black"); + public static final TagKey DYES_BLUE = register("dyes/blue"); + public static final TagKey DYES_BROWN = register("dyes/brown"); + public static final TagKey DYES_CYAN = register("dyes/cyan"); + public static final TagKey DYES_GRAY = register("dyes/gray"); + public static final TagKey DYES_GREEN = register("dyes/green"); + public static final TagKey DYES_LIGHT_BLUE = register("dyes/light_blue"); + public static final TagKey DYES_LIGHT_GRAY = register("dyes/light_gray"); + public static final TagKey DYES_LIME = register("dyes/lime"); + public static final TagKey DYES_MAGENTA = register("dyes/magenta"); + public static final TagKey DYES_ORANGE = register("dyes/orange"); + public static final TagKey DYES_PINK = register("dyes/pink"); + public static final TagKey DYES_PURPLE = register("dyes/purple"); + public static final TagKey DYES_RED = register("dyes/red"); + public static final TagKey DYES_WHITE = register("dyes/white"); + public static final TagKey DYES_YELLOW = register("dyes/yellow"); + + // Items created with dyes + public static final TagKey DYED_ITEMS = register("dyed_items"); + public static final TagKey DYED_ITEMS_BLACK = register("dyed_items/black"); + public static final TagKey DYED_ITEMS_BLUE = register("dyed_items/blue"); + public static final TagKey DYED_ITEMS_BROWN = register("dyed_items/brown"); + public static final TagKey DYED_ITEMS_CYAN = register("dyed_items/cyan"); + public static final TagKey DYED_ITEMS_GRAY = register("dyed_items/gray"); + public static final TagKey DYED_ITEMS_GREEN = register("dyed_items/green"); + public static final TagKey DYED_ITEMS_LIGHT_BLUE = register("dyed_items/light_blue"); + public static final TagKey DYED_ITEMS_LIGHT_GRAY = register("dyed_items/light_gray"); + public static final TagKey DYED_ITEMS_LIME = register("dyed_items/lime"); + public static final TagKey DYED_ITEMS_MAGENTA = register("dyed_items/magenta"); + public static final TagKey DYED_ITEMS_ORANGE = register("dyed_items/orange"); + public static final TagKey DYED_ITEMS_PINK = register("dyed_items/pink"); + public static final TagKey DYED_ITEMS_PURPLE = register("dyed_items/purple"); + public static final TagKey DYED_ITEMS_RED = register("dyed_items/red"); + public static final TagKey DYED_ITEMS_WHITE = register("dyed_items/white"); + public static final TagKey DYED_ITEMS_YELLOW = register("dyed_items/yellow"); private static TagKey register(String tagID) { return TagRegistration.ITEM_TAG_REGISTRATION.registerCommon(tagID); diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java index 5f29f8377c..4e8b72ec58 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java +++ b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java @@ -17,6 +17,7 @@ package net.fabricmc.fabric.impl.tag.convention; import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.registry.RegistryKeys; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.EntityType; @@ -31,6 +32,7 @@ public class TagRegistration { public static final TagRegistration ITEM_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.ITEM); public static final TagRegistration BLOCK_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.BLOCK); + public static final TagRegistration> BLOCK_ENTITY_TYPE_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.BLOCK_ENTITY_TYPE); public static final TagRegistration BIOME_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.BIOME); public static final TagRegistration FLUID_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.FLUID); public static final TagRegistration> ENTITY_TYPE_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.ENTITY_TYPE); @@ -46,6 +48,6 @@ public TagKey registerFabric(String tagId) { } public TagKey registerCommon(String tagId) { - return TagKey.of(registryKey, new Identifier("c", tagId)); + return TagKey.of(registryKey, new Identifier("common", tagId)); } } diff --git a/fabric-convention-tags-v1/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v1/TagUtilTest.java b/fabric-convention-tags-v1/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v1/TagUtilTest.java index f68080ed22..978a2daa3a 100644 --- a/fabric-convention-tags-v1/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v1/TagUtilTest.java +++ b/fabric-convention-tags-v1/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v1/TagUtilTest.java @@ -41,12 +41,12 @@ public void onInitialize() { throw new AssertionError("Failed to find fortune in c:fortune!"); } - if (TagUtil.isIn(ConventionalBiomeTags.IN_OVERWORLD, server.getRegistryManager().get(RegistryKeys.BIOME).get(BiomeKeys.BADLANDS))) { + if (TagUtil.isIn(ConventionalBiomeTags.IS_OVERWORLD, server.getRegistryManager().get(RegistryKeys.BIOME).get(BiomeKeys.BADLANDS))) { throw new AssertionError("Found a dynamic entry in a static registry?!"); } // If this fails, the tag is missing a biome or the util is broken - if (!TagUtil.isIn(server.getRegistryManager(), ConventionalBiomeTags.IN_OVERWORLD, server.getRegistryManager().get(RegistryKeys.BIOME).get(BiomeKeys.BADLANDS))) { + if (!TagUtil.isIn(server.getRegistryManager(), ConventionalBiomeTags.IS_OVERWORLD, server.getRegistryManager().get(RegistryKeys.BIOME).get(BiomeKeys.BADLANDS))) { throw new AssertionError("Failed to find an overworld biome (%s) in c:in_overworld!".formatted(BiomeKeys.BADLANDS)); } diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java index 849922531f..b9b67c7a41 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java @@ -27,6 +27,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import net.minecraft.registry.tag.TagKey; import org.jetbrains.annotations.ApiStatus; import net.minecraft.block.Block; @@ -222,6 +223,22 @@ default void add(Identifier identifier, String value) { add(identifier.toTranslationKey(), value); } + /** + * Adds a translation for an {@link TagKey}. + * + * @param tagKey The {@link TagKey} to get the translation key from. + * @param value The value of the entry. + */ + default void add(TagKey tagKey, String value) { + String tagTranslationkey = + "tag." + + tagKey.registry().getValue().getPath().replace("\\", ".") + + "." + + tagKey.id().getPath().replace("\\", "."); + add(tagTranslationkey, value); + } + + /** * Merges an existing language file into the generated language file. * diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagProvider.java index b7cc0077a2..f066a5c4d4 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagProvider.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagProvider.java @@ -22,6 +22,7 @@ import java.util.function.Function; import java.util.stream.Stream; +import net.minecraft.block.entity.BlockEntityType; import org.jetbrains.annotations.Nullable; import net.minecraft.block.Block; @@ -131,6 +132,20 @@ protected RegistryKey reverseLookup(Block element) { } } + /** + * Extend this class to create {@link BlockEntityType} tags in the "/block_entity_type" tag directory. + */ + public abstract static class BlockEntityTypeTagProvider extends FabricTagProvider> { + public BlockEntityTypeTagProvider(FabricDataOutput output, CompletableFuture completableFuture) { + super(output, RegistryKeys.BLOCK_ENTITY_TYPE, completableFuture); + } + + @Override + protected RegistryKey> reverseLookup(BlockEntityType element) { + return element.getRegistryEntry().registryKey(); + } + } + /** * Extend this class to create {@link Item} tags in the "/items" tag directory. */ From a712db21611f3d686c3bf1421d153906724a7009 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 9 Sep 2023 13:26:47 -0400 Subject: [PATCH 002/123] Added tag translations --- .../BlockEntityTypeTagGenerator.java | 4 - .../datagen/generators/BlockTagGenerator.java | 44 ++-- .../generators/EnglishTagLangGenerator.java | 224 ++++++++++++++++++ .../datagen/generators/ItemTagGenerator.java | 12 +- .../lang/en_us.json | 207 +++++++++++++++- .../data/common/tags/blocks/ores.json | 4 + .../tags/blocks/ores/netherite_scrap.json | 6 + .../data/common/tags/items/ores.json | 4 + .../convention/v1/ConventionalBlockTags.java | 14 +- .../convention/v1/ConventionalItemTags.java | 12 +- .../v1/provider/FabricLanguageProvider.java | 4 +- 11 files changed, 488 insertions(+), 47 deletions(-) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores/netherite_scrap.json diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java index 9e2cb5f000..c975e3c60b 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java @@ -19,11 +19,7 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockEntityTypeTags; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalEntityTypeTags; -import net.minecraft.entity.EntityType; import net.minecraft.registry.RegistryWrapper; -import net.minecraft.registry.tag.TagKey; -import net.minecraft.util.Identifier; import java.util.concurrent.CompletableFuture; diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java index 18ed328196..aa89dba3d2 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java @@ -24,13 +24,10 @@ import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.BlockTags; import net.minecraft.registry.tag.TagKey; -import net.minecraft.util.DyeColor; import net.minecraft.util.Identifier; import java.util.List; -import java.util.Locale; import java.util.concurrent.CompletableFuture; -import java.util.function.Consumer; public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { static List VILLAGER_JOB_SITE_BLOCKS = List.of( @@ -60,6 +57,8 @@ public BlockTagGenerator(FabricDataOutput output, CompletableFuture tag) diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 0d90cd7132..c859cd04c1 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -3,6 +3,12 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider; import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBiomeTags; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockEntityTypeTags; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalEnchantmentTags; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalEntityTypeTags; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalFluidTags; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalItemTags; public class EnglishTagLangGenerator extends FabricLanguageProvider { public EnglishTagLangGenerator(FabricDataOutput output) { @@ -11,6 +17,224 @@ public EnglishTagLangGenerator(FabricDataOutput output) { @Override public void generateTranslations(FabricLanguageProvider.TranslationBuilder translationBuilder) { + // Blocks + translationBuilder.add(ConventionalBlockTags.ORES, "Ores"); + translationBuilder.add(ConventionalBlockTags.ORES_QUARTZ, "Quartz Ores"); + translationBuilder.add(ConventionalBlockTags.ORES_NETHERITE_SCRAP, "Netherite Scrapes Ores"); + translationBuilder.add(ConventionalBlockTags.BARRELS, "Barrels"); + translationBuilder.add(ConventionalBlockTags.BARRELS_WOODEN, "Barrels Wooden"); + translationBuilder.add(ConventionalBlockTags.BOOKSHELVES, "Bookshelves"); + translationBuilder.add(ConventionalBlockTags.CHESTS, "Chests"); + translationBuilder.add(ConventionalBlockTags.GLASS_BLOCKS, "Glass Blocks"); + translationBuilder.add(ConventionalBlockTags.GLASS_PANES, "Glass Panes"); + translationBuilder.add(ConventionalBlockTags.SHULKER_BOXES, "Shulker Boxes"); + translationBuilder.add(ConventionalBlockTags.BUDDING_BLOCKS, "Budding Blocks"); + translationBuilder.add(ConventionalBlockTags.BUDS, "Buds"); + translationBuilder.add(ConventionalBlockTags.CLUSTERS, "Clusters"); + translationBuilder.add(ConventionalBlockTags.VILLAGER_JOB_SITES, "Villager Job Sites"); + translationBuilder.add(ConventionalBlockTags.SANDSTONE_BLOCKS, "Sandstone Blocks"); + translationBuilder.add(ConventionalBlockTags.SANDSTONE_SLABS, "Sandstone Slabs"); + translationBuilder.add(ConventionalBlockTags.SANDSTONE_STAIRS, "Sandstone Stairs"); + translationBuilder.add(ConventionalBlockTags.SANDSTONE_RED_BLOCKS, "Red Sandstone Blocks"); + translationBuilder.add(ConventionalBlockTags.SANDSTONE_RED_SLABS, "Red Sandstone Slabs"); + translationBuilder.add(ConventionalBlockTags.SANDSTONE_RED_STAIRS, "Red Sandstone Stairs"); + translationBuilder.add(ConventionalBlockTags.SANDSTONE_UNCOLORED_BLOCKS, "Uncolored Sandstone Blocks"); + translationBuilder.add(ConventionalBlockTags.SANDSTONE_UNCOLORED_SLABS, "Uncolored Sandstone Slabs"); + translationBuilder.add(ConventionalBlockTags.SANDSTONE_UNCOLORED_STAIRS, "Uncolored Sandstone Stairs"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS, "Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_BLACK, "Black Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_BLUE, "Blue Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_BROWN, "Brown Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_CYAN, "Cyan Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_GRAY, "Gray Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_GREEN, "Green Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_LIGHT_BLUE, "Light Blue Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_LIGHT_GRAY, "Light Gray Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_LIME, "Lime Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_MAGENTA, "Magenta Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_ORANGE, "Orange Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_PINK, "Pink Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_PURPLE, "Purple Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_RED, "Red Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_WHITE, "White Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_YELLOW, "Yellow Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.RELOCATION_NOT_SUPPORTED, "Relocation Not Supported"); + // Block Entity Types + translationBuilder.add(ConventionalBlockEntityTypeTags.RELOCATION_NOT_SUPPORTED, "Relocation Not Supported"); + + // Items + translationBuilder.add(ConventionalItemTags.TOOLS, "Tools"); + translationBuilder.add(ConventionalItemTags.TOOLS_SHEARS, "Shears"); + translationBuilder.add(ConventionalItemTags.TOOLS_SPEARS, "Spears"); + translationBuilder.add(ConventionalItemTags.TOOLS_BOWS, "Bows"); + translationBuilder.add(ConventionalItemTags.TOOLS_CROSSBOWS, "Crossbows"); + translationBuilder.add(ConventionalItemTags.TOOLS_SHIELDS, "Shields"); + translationBuilder.add(ConventionalItemTags.TOOLS_FISHING_RODS, "Fishing Rods"); + translationBuilder.add(ConventionalItemTags.DUSTS, "Dusts"); + translationBuilder.add(ConventionalItemTags.GEMS, "Gems"); + translationBuilder.add(ConventionalItemTags.INGOTS, "Ingots"); + translationBuilder.add(ConventionalItemTags.NUGGETS, "Nuggets"); + translationBuilder.add(ConventionalItemTags.ORES, "Ores"); + translationBuilder.add(ConventionalItemTags.RAW_MATERIALS, "Raw Materials"); + translationBuilder.add(ConventionalItemTags.RAW_BLOCKS, "Raw Blocks"); + translationBuilder.add(ConventionalItemTags.RAW_MATERIALS_IRON, "Raw Materials Iron"); + translationBuilder.add(ConventionalItemTags.RAW_MATERIALS_GOLD, "Raw Materials Gold"); + translationBuilder.add(ConventionalItemTags.RAW_MATERIALS_COPPER, "Raw Materials Copper"); + translationBuilder.add(ConventionalItemTags.RAW_BLOCKS_IRON, "Raw Blocks Iron"); + translationBuilder.add(ConventionalItemTags.RAW_BLOCKS_GOLD, "Raw Blocks Gold"); + translationBuilder.add(ConventionalItemTags.RAW_BLOCKS_COPPER, "Raw Blocks Copper"); + translationBuilder.add(ConventionalItemTags.INGOTS_IRON, "Ingots Iron"); + translationBuilder.add(ConventionalItemTags.INGOTS_GOLD, "Ingots Gold"); + translationBuilder.add(ConventionalItemTags.INGOTS_COPPER, "Ingots Copper"); + translationBuilder.add(ConventionalItemTags.INGOTS_NETHERITE, "Ingots Netherite"); + translationBuilder.add(ConventionalItemTags.ORES_NETHERITE_SCRAP, "Netherite Scrap Ores"); + translationBuilder.add(ConventionalItemTags.ORES_QUARTZ, "Quartz Ores"); + translationBuilder.add(ConventionalItemTags.GEMS_QUARTZ, "Quartz Gems"); + translationBuilder.add(ConventionalItemTags.GEMS_LAPIS, "Lapis Gems"); + translationBuilder.add(ConventionalItemTags.GEMS_DIAMOND, "Diamond Gems"); + translationBuilder.add(ConventionalItemTags.GEMS_AMETHYST, "Amethyst Gems"); + translationBuilder.add(ConventionalItemTags.GEMS_EMERALD, "Emerald Gems"); + translationBuilder.add(ConventionalItemTags.GEMS_PRISMARINE, "Prismarine Gems"); + translationBuilder.add(ConventionalItemTags.DUSTS_REDSTONE, "Redstone Dusts"); + translationBuilder.add(ConventionalItemTags.DUSTS_GLOWSTONE, "Glowstone Dusts"); + translationBuilder.add(ConventionalItemTags.COAL, "Coal"); + translationBuilder.add(ConventionalItemTags.FOODS, "Foods"); + translationBuilder.add(ConventionalItemTags.POTIONS, "Potions"); + translationBuilder.add(ConventionalItemTags.BUCKETS_WATER, "Water Buckets"); + translationBuilder.add(ConventionalItemTags.BUCKETS_ENTITY_WATER, "Entity Water Buckets"); + translationBuilder.add(ConventionalItemTags.BUCKETS_LAVA, "Lava Buckets"); + translationBuilder.add(ConventionalItemTags.BUCKETS_MILK, "Milk Buckets"); + translationBuilder.add(ConventionalItemTags.BUCKETS_EMPTY, "Empty Buckets"); + translationBuilder.add(ConventionalItemTags.BARRELS, "Barrels"); + translationBuilder.add(ConventionalItemTags.BARRELS_WOODEN, "Wooden Barrels"); + translationBuilder.add(ConventionalItemTags.BOOKSHELVES, "Bookshelves"); + translationBuilder.add(ConventionalItemTags.CHESTS, "Chests"); + translationBuilder.add(ConventionalItemTags.GLASS_BLOCKS, "Glass Blocks"); + translationBuilder.add(ConventionalItemTags.GLASS_PANES, "Glass Panes"); + translationBuilder.add(ConventionalItemTags.SHULKER_BOXES, "Shulker Boxes"); + translationBuilder.add(ConventionalItemTags.BUDDING_BLOCKS, "Budding Blocks"); + translationBuilder.add(ConventionalItemTags.BUDS, "Buds"); + translationBuilder.add(ConventionalItemTags.CLUSTERS, "Clusters"); + translationBuilder.add(ConventionalItemTags.VILLAGER_JOB_SITES, "Villager Job Sites"); + translationBuilder.add(ConventionalItemTags.SANDSTONE_BLOCKS, "Sandstone Blocks"); + translationBuilder.add(ConventionalItemTags.SANDSTONE_SLABS, "Sandstone Slabs"); + translationBuilder.add(ConventionalItemTags.SANDSTONE_STAIRS, "Sandstone Stairs"); + translationBuilder.add(ConventionalItemTags.SANDSTONE_RED_BLOCKS, "Red Sandstone Blocks"); + translationBuilder.add(ConventionalItemTags.SANDSTONE_RED_SLABS, "Red Sandstone Slabs"); + translationBuilder.add(ConventionalItemTags.SANDSTONE_RED_STAIRS, "Red Sandstone Stairs"); + translationBuilder.add(ConventionalItemTags.SANDSTONE_UNCOLORED_BLOCKS, "Uncolored Sandstone Blocks"); + translationBuilder.add(ConventionalItemTags.SANDSTONE_UNCOLORED_SLABS, "Uncolored Sandstone Slabs"); + translationBuilder.add(ConventionalItemTags.SANDSTONE_UNCOLORED_STAIRS, "Uncolored Sandstone Stairs"); + translationBuilder.add(ConventionalItemTags.DYES, "Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_BLACK, "Black Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_BLUE, "Blue Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_BROWN, "Brown Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_CYAN, "Cyan Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_GRAY, "Gray Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_GREEN, "Green Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_LIGHT_BLUE, "Light Blue Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_LIGHT_GRAY, "Light Gray Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_LIME, "Lime Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_MAGENTA, "Magenta Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_ORANGE, "Orange Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_PINK, "Pink Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_PURPLE, "Purple Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_RED, "Red Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_WHITE, "White Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_YELLOW, "Yellow Dyes"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS, "Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_BLACK, "Black Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_BLUE, "Blue Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_BROWN, "Brown Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_CYAN, "Cyan Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_GRAY, "Gray Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_GREEN, "Green Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_LIGHT_BLUE, "Light Blue Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_LIGHT_GRAY, "Light Gray Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_LIME, "Lime Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_MAGENTA, "Magenta Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_ORANGE, "Orange Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_PINK, "Pink Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_PURPLE, "Purple Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_RED, "Red Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_WHITE, "White Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_YELLOW, "Yellow Dyed Items"); + + // Enchantments + translationBuilder.add(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS, "Increases Block Drops"); + translationBuilder.add(ConventionalEnchantmentTags.INCREASES_ENTITY_DROPS, "Increases Entity Drops"); + translationBuilder.add(ConventionalEnchantmentTags.WEAPON_DAMAGE_ENHANCEMENT, "Weapon Damage Enhancements"); + translationBuilder.add(ConventionalEnchantmentTags.ENTITY_MOVEMENT_ENHANCEMENT, "Entity Movement Enhancements"); + translationBuilder.add(ConventionalEnchantmentTags.ENTITY_DEFENSE_ENHANCEMENT, "Entity Defense Enhancements"); + + // Entity Types + translationBuilder.add(ConventionalEntityTypeTags.BOSSES, "Bosses"); + translationBuilder.add(ConventionalEntityTypeTags.MINECARTS, "Minecarts"); + translationBuilder.add(ConventionalEntityTypeTags.BOATS, "Boats"); + + // Fluids + translationBuilder.add(ConventionalFluidTags.LAVA, "Lava"); + translationBuilder.add(ConventionalFluidTags.WATER, "Water"); + translationBuilder.add(ConventionalFluidTags.MILK, "Milk"); + translationBuilder.add(ConventionalFluidTags.HONEY, "Honey"); + + // Biomes + translationBuilder.add(ConventionalBiomeTags.IS_OVERWORLD, "Overworld"); + translationBuilder.add(ConventionalBiomeTags.IS_THE_END, "The End"); + translationBuilder.add(ConventionalBiomeTags.IS_NETHER, "Nether"); + translationBuilder.add(ConventionalBiomeTags.IS_TAIGA, "Taiga"); + translationBuilder.add(ConventionalBiomeTags.IS_EXTREME_HILLS, "Extreme Hills"); + translationBuilder.add(ConventionalBiomeTags.IS_WINDSWEPT, "Windswept"); + translationBuilder.add(ConventionalBiomeTags.IS_JUNGLE, "Jungle"); + translationBuilder.add(ConventionalBiomeTags.IS_PLAINS, "Plains"); + translationBuilder.add(ConventionalBiomeTags.IS_SAVANNA, "Savanna"); + translationBuilder.add(ConventionalBiomeTags.IS_ICY, "Icy"); + translationBuilder.add(ConventionalBiomeTags.IS_AQUATIC_ICY, "Icy Aquatic"); + translationBuilder.add(ConventionalBiomeTags.IS_BEACH, "Beach"); + translationBuilder.add(ConventionalBiomeTags.IS_FOREST, "Forest"); + translationBuilder.add(ConventionalBiomeTags.IS_BIRCH_FOREST, "Birch Forest"); + translationBuilder.add(ConventionalBiomeTags.IS_OCEAN, "Ocean"); + translationBuilder.add(ConventionalBiomeTags.IS_DESERT, "Desert"); + translationBuilder.add(ConventionalBiomeTags.IS_RIVER, "River"); + translationBuilder.add(ConventionalBiomeTags.IS_SWAMP, "Swamp"); + translationBuilder.add(ConventionalBiomeTags.IS_MUSHROOM, "Mushroom"); + translationBuilder.add(ConventionalBiomeTags.IS_UNDERGROUND, "Underground"); + translationBuilder.add(ConventionalBiomeTags.IS_MOUNTAIN, "Mountain"); + translationBuilder.add(ConventionalBiomeTags.IS_HOT_OVERWORLD, "Hot Overworld"); + translationBuilder.add(ConventionalBiomeTags.IS_HOT, "Hot"); + translationBuilder.add(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD, "Temperate Overworld"); + translationBuilder.add(ConventionalBiomeTags.IS_TEMPERATE, "Temperate"); + translationBuilder.add(ConventionalBiomeTags.IS_COLD_OVERWORLD, "Cold Overworld"); + translationBuilder.add(ConventionalBiomeTags.IS_COLD, "Cold"); + translationBuilder.add(ConventionalBiomeTags.IS_WET_OVERWORLD, "Wet Overworld"); + translationBuilder.add(ConventionalBiomeTags.IS_WET, "Wet"); + translationBuilder.add(ConventionalBiomeTags.IS_DRY_OVERWORLD, "Dry Overworld"); + translationBuilder.add(ConventionalBiomeTags.IS_DRY, "Dry"); + translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_SPARSE, "Sparse Vegetation"); + translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD, "Sparse Overworld Vegetation"); + translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_DENSE, "Dense Vegetation"); + translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD, "Dense Overworld Vegetation"); + translationBuilder.add(ConventionalBiomeTags.IS_TREE_CONIFEROUS, "Coniferous Tree"); + translationBuilder.add(ConventionalBiomeTags.IS_TREE_SAVANNA, "Savanna Tree"); + translationBuilder.add(ConventionalBiomeTags.IS_TREE_JUNGLE, "Jungle Tree"); + translationBuilder.add(ConventionalBiomeTags.IS_TREE_DECIDUOUS, "Deciduous Tree"); + translationBuilder.add(ConventionalBiomeTags.IS_VOID, "Void"); + translationBuilder.add(ConventionalBiomeTags.IS_MOUNTAIN_PEAK, "Mountain Peak"); + translationBuilder.add(ConventionalBiomeTags.IS_MOUNTAIN_SLOPE, "Mountain Slope"); + translationBuilder.add(ConventionalBiomeTags.IS_AQUATIC, "Aquatic"); + translationBuilder.add(ConventionalBiomeTags.IS_WASTELAND, "Wasteland"); + translationBuilder.add(ConventionalBiomeTags.IS_DEAD, "Dead"); + translationBuilder.add(ConventionalBiomeTags.IS_FLORAL, "Floral"); + translationBuilder.add(ConventionalBiomeTags.IS_SNOWY, "Snowy"); + translationBuilder.add(ConventionalBiomeTags.IS_BADLANDS, "Badlands"); + translationBuilder.add(ConventionalBiomeTags.IS_CAVE, "Cave"); + translationBuilder.add(ConventionalBiomeTags.IS_END_ISLAND, "End Island"); + translationBuilder.add(ConventionalBiomeTags.IS_NETHER_FOREST, "Nether Forest"); + translationBuilder.add(ConventionalBiomeTags.IS_SNOWY_PLAINS, "Snowy Plains"); + translationBuilder.add(ConventionalBiomeTags.IS_STONY_SHORES, "Stony Shores"); + translationBuilder.add(ConventionalBiomeTags.IS_FLOWER_FOREST, "Flower Forest"); + translationBuilder.add(ConventionalBiomeTags.IS_DEEP_OCEAN, "Deep Ocean"); + translationBuilder.add(ConventionalBiomeTags.IS_SHALLOW_OCEAN, "Shallow Ocean"); } } diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index 56cacb9c83..672ce222d6 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -66,12 +66,12 @@ private void copyItemTags() { copy(ConventionalBlockTags.SANDSTONE_BLOCKS, ConventionalItemTags.SANDSTONE_BLOCKS); copy(ConventionalBlockTags.SANDSTONE_SLABS, ConventionalItemTags.SANDSTONE_SLABS); copy(ConventionalBlockTags.SANDSTONE_STAIRS, ConventionalItemTags.SANDSTONE_STAIRS); - copy(ConventionalBlockTags.RED_SANDSTONE_BLOCKS, ConventionalItemTags.RED_SANDSTONE_BLOCKS); - copy(ConventionalBlockTags.RED_SANDSTONE_SLABS, ConventionalItemTags.RED_SANDSTONE_SLABS); - copy(ConventionalBlockTags.RED_SANDSTONE_STAIRS, ConventionalItemTags.RED_SANDSTONE_STAIRS); - copy(ConventionalBlockTags.UNCOLORED_SANDSTONE_BLOCKS, ConventionalItemTags.UNCOLORED_SANDSTONE_BLOCKS); - copy(ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS, ConventionalItemTags.UNCOLORED_SANDSTONE_SLABS); - copy(ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS, ConventionalItemTags.UNCOLORED_SANDSTONE_STAIRS); + copy(ConventionalBlockTags.SANDSTONE_RED_BLOCKS, ConventionalItemTags.SANDSTONE_RED_BLOCKS); + copy(ConventionalBlockTags.SANDSTONE_RED_SLABS, ConventionalItemTags.SANDSTONE_RED_SLABS); + copy(ConventionalBlockTags.SANDSTONE_RED_STAIRS, ConventionalItemTags.SANDSTONE_RED_STAIRS); + copy(ConventionalBlockTags.SANDSTONE_UNCOLORED_BLOCKS, ConventionalItemTags.SANDSTONE_UNCOLORED_BLOCKS); + copy(ConventionalBlockTags.SANDSTONE_UNCOLORED_SLABS, ConventionalItemTags.SANDSTONE_UNCOLORED_SLABS); + copy(ConventionalBlockTags.SANDSTONE_UNCOLORED_STAIRS, ConventionalItemTags.SANDSTONE_UNCOLORED_STAIRS); } private void generateDyeTags() { diff --git a/fabric-convention-tags-v1/src/generated/resources/assets/fabric-convention-tags-v1-datagen/lang/en_us.json b/fabric-convention-tags-v1/src/generated/resources/assets/fabric-convention-tags-v1-datagen/lang/en_us.json index 1f37d03f3f..210623ea8f 100644 --- a/fabric-convention-tags-v1/src/generated/resources/assets/fabric-convention-tags-v1-datagen/lang/en_us.json +++ b/fabric-convention-tags-v1/src/generated/resources/assets/fabric-convention-tags-v1-datagen/lang/en_us.json @@ -1,3 +1,208 @@ { - "common.is_aquatic": "Identifier Test" + "tag.block.barrels": "Barrels", + "tag.block.barrels.wooden": "Barrels Wooden", + "tag.block.bookshelves": "Bookshelves", + "tag.block.budding_blocks": "Budding Blocks", + "tag.block.buds": "Buds", + "tag.block.chests": "Chests", + "tag.block.clusters": "Clusters", + "tag.block.dyed_blocks": "Dyed Blocks", + "tag.block.dyed_blocks.black": "Black Dyed Blocks", + "tag.block.dyed_blocks.blue": "Blue Dyed Blocks", + "tag.block.dyed_blocks.brown": "Brown Dyed Blocks", + "tag.block.dyed_blocks.cyan": "Cyan Dyed Blocks", + "tag.block.dyed_blocks.gray": "Gray Dyed Blocks", + "tag.block.dyed_blocks.green": "Green Dyed Blocks", + "tag.block.dyed_blocks.light_blue": "Light Blue Dyed Blocks", + "tag.block.dyed_blocks.light_gray": "Light Gray Dyed Blocks", + "tag.block.dyed_blocks.lime": "Lime Dyed Blocks", + "tag.block.dyed_blocks.magenta": "Magenta Dyed Blocks", + "tag.block.dyed_blocks.orange": "Orange Dyed Blocks", + "tag.block.dyed_blocks.pink": "Pink Dyed Blocks", + "tag.block.dyed_blocks.purple": "Purple Dyed Blocks", + "tag.block.dyed_blocks.red": "Red Dyed Blocks", + "tag.block.dyed_blocks.white": "White Dyed Blocks", + "tag.block.dyed_blocks.yellow": "Yellow Dyed Blocks", + "tag.block.glass_blocks": "Glass Blocks", + "tag.block.glass_panes": "Glass Panes", + "tag.block.ores": "Ores", + "tag.block.ores.netherite_scrap": "Netherite Scrapes Ores", + "tag.block.ores.quartz": "Quartz Ores", + "tag.block.relocation_not_supported": "Relocation Not Supported", + "tag.block.sandstone.blocks": "Sandstone Blocks", + "tag.block.sandstone.red_blocks": "Red Sandstone Blocks", + "tag.block.sandstone.red_slabs": "Red Sandstone Slabs", + "tag.block.sandstone.red_stairs": "Red Sandstone Stairs", + "tag.block.sandstone.slabs": "Sandstone Slabs", + "tag.block.sandstone.stairs": "Sandstone Stairs", + "tag.block.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", + "tag.block.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", + "tag.block.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", + "tag.block.shulker_boxes": "Shulker Boxes", + "tag.block.villager_job_sites": "Villager Job Sites", + "tag.block_entity_type.relocation_not_supported": "Relocation Not Supported", + "tag.enchantment.entity_defense_enhancement": "Entity Defense Enhancements", + "tag.enchantment.entity_movement_enhancement": "Entity Movement Enhancements", + "tag.enchantment.fortune": "Increases Block Drops", + "tag.enchantment.looting": "Increases Entity Drops", + "tag.enchantment.weapon_damage_enhancement": "Weapon Damage Enhancements", + "tag.entity_type.boats": "Boats", + "tag.entity_type.bosses": "Bosses", + "tag.entity_type.minecarts": "Minecarts", + "tag.fluid.honey": "Honey", + "tag.fluid.lava": "Lava", + "tag.fluid.milk": "Milk", + "tag.fluid.water": "Water", + "tag.item.barrels": "Barrels", + "tag.item.barrels.wooden": "Wooden Barrels", + "tag.item.bookshelves": "Bookshelves", + "tag.item.buckets.empty": "Empty Buckets", + "tag.item.buckets.entity_water": "Entity Water Buckets", + "tag.item.buckets.lava": "Lava Buckets", + "tag.item.buckets.milk": "Milk Buckets", + "tag.item.buckets.water": "Water Buckets", + "tag.item.budding_blocks": "Budding Blocks", + "tag.item.buds": "Buds", + "tag.item.chests": "Chests", + "tag.item.clusters": "Clusters", + "tag.item.coal": "Coal", + "tag.item.dusts": "Dusts", + "tag.item.dusts.glowstone": "Glowstone Dusts", + "tag.item.dusts.redstone": "Redstone Dusts", + "tag.item.dyed_items": "Dyed Items", + "tag.item.dyed_items.black": "Black Dyed Items", + "tag.item.dyed_items.blue": "Blue Dyed Items", + "tag.item.dyed_items.brown": "Brown Dyed Items", + "tag.item.dyed_items.cyan": "Cyan Dyed Items", + "tag.item.dyed_items.gray": "Gray Dyed Items", + "tag.item.dyed_items.green": "Green Dyed Items", + "tag.item.dyed_items.light_blue": "Light Blue Dyed Items", + "tag.item.dyed_items.light_gray": "Light Gray Dyed Items", + "tag.item.dyed_items.lime": "Lime Dyed Items", + "tag.item.dyed_items.magenta": "Magenta Dyed Items", + "tag.item.dyed_items.orange": "Orange Dyed Items", + "tag.item.dyed_items.pink": "Pink Dyed Items", + "tag.item.dyed_items.purple": "Purple Dyed Items", + "tag.item.dyed_items.red": "Red Dyed Items", + "tag.item.dyed_items.white": "White Dyed Items", + "tag.item.dyed_items.yellow": "Yellow Dyed Items", + "tag.item.dyes": "Dyes", + "tag.item.dyes.black": "Black Dyes", + "tag.item.dyes.blue": "Blue Dyes", + "tag.item.dyes.brown": "Brown Dyes", + "tag.item.dyes.cyan": "Cyan Dyes", + "tag.item.dyes.gray": "Gray Dyes", + "tag.item.dyes.green": "Green Dyes", + "tag.item.dyes.light_blue": "Light Blue Dyes", + "tag.item.dyes.light_gray": "Light Gray Dyes", + "tag.item.dyes.lime": "Lime Dyes", + "tag.item.dyes.magenta": "Magenta Dyes", + "tag.item.dyes.orange": "Orange Dyes", + "tag.item.dyes.pink": "Pink Dyes", + "tag.item.dyes.purple": "Purple Dyes", + "tag.item.dyes.red": "Red Dyes", + "tag.item.dyes.white": "White Dyes", + "tag.item.dyes.yellow": "Yellow Dyes", + "tag.item.foods": "Foods", + "tag.item.gems": "Gems", + "tag.item.gems.amethyst": "Amethyst Gems", + "tag.item.gems.diamond": "Diamond Gems", + "tag.item.gems.emerald": "Emerald Gems", + "tag.item.gems.lapis": "Lapis Gems", + "tag.item.gems.prismarine": "Prismarine Gems", + "tag.item.gems.quartz": "Quartz Gems", + "tag.item.glass_blocks": "Glass Blocks", + "tag.item.glass_panes": "Glass Panes", + "tag.item.ingots": "Ingots", + "tag.item.ingots.copper": "Ingots Copper", + "tag.item.ingots.gold": "Ingots Gold", + "tag.item.ingots.iron": "Ingots Iron", + "tag.item.ingots.netherite": "Ingots Netherite", + "tag.item.nuggets": "Nuggets", + "tag.item.ores": "Ores", + "tag.item.ores.netherite_scrap": "Netherite Scrap Ores", + "tag.item.ores.quartz": "Quartz Ores", + "tag.item.potions": "Potions", + "tag.item.raw_blocks": "Raw Blocks", + "tag.item.raw_blocks.copper": "Raw Blocks Copper", + "tag.item.raw_blocks.gold": "Raw Blocks Gold", + "tag.item.raw_blocks.iron": "Raw Blocks Iron", + "tag.item.raw_materials": "Raw Materials", + "tag.item.raw_materials.copper": "Raw Materials Copper", + "tag.item.raw_materials.gold": "Raw Materials Gold", + "tag.item.raw_materials.iron": "Raw Materials Iron", + "tag.item.sandstone.blocks": "Sandstone Blocks", + "tag.item.sandstone.red_blocks": "Red Sandstone Blocks", + "tag.item.sandstone.red_slabs": "Red Sandstone Slabs", + "tag.item.sandstone.red_stairs": "Red Sandstone Stairs", + "tag.item.sandstone.slabs": "Sandstone Slabs", + "tag.item.sandstone.stairs": "Sandstone Stairs", + "tag.item.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", + "tag.item.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", + "tag.item.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", + "tag.item.shulker_boxes": "Shulker Boxes", + "tag.item.tools": "Tools", + "tag.item.tools.bows": "Bows", + "tag.item.tools.crossbows": "Crossbows", + "tag.item.tools.fishing_rods": "Fishing Rods", + "tag.item.tools.shears": "Shears", + "tag.item.tools.shields": "Shields", + "tag.item.tools.spears": "Spears", + "tag.item.villager_job_sites": "Villager Job Sites", + "tag.worldgen.biome.is_aquatic": "Aquatic", + "tag.worldgen.biome.is_aquatic_icy": "Icy Aquatic", + "tag.worldgen.biome.is_badlands": "Badlands", + "tag.worldgen.biome.is_beach": "Beach", + "tag.worldgen.biome.is_birch_forest": "Birch Forest", + "tag.worldgen.biome.is_cave": "Cave", + "tag.worldgen.biome.is_cold": "Cold", + "tag.worldgen.biome.is_cold.overworld": "Cold Overworld", + "tag.worldgen.biome.is_dead": "Dead", + "tag.worldgen.biome.is_deep_ocean": "Deep Ocean", + "tag.worldgen.biome.is_dense_vegetation": "Dense Vegetation", + "tag.worldgen.biome.is_dense_vegetation.overworld": "Dense Overworld Vegetation", + "tag.worldgen.biome.is_desert": "Desert", + "tag.worldgen.biome.is_dry": "Dry", + "tag.worldgen.biome.is_dry.overworld": "Dry Overworld", + "tag.worldgen.biome.is_end_island": "End Island", + "tag.worldgen.biome.is_extreme_hills": "Extreme Hills", + "tag.worldgen.biome.is_floral": "Floral", + "tag.worldgen.biome.is_flower_forest": "Flower Forest", + "tag.worldgen.biome.is_forest": "Forest", + "tag.worldgen.biome.is_hot": "Hot", + "tag.worldgen.biome.is_hot.overworld": "Hot Overworld", + "tag.worldgen.biome.is_icy": "Icy", + "tag.worldgen.biome.is_jungle": "Jungle", + "tag.worldgen.biome.is_mountain": "Mountain", + "tag.worldgen.biome.is_mountain.peak": "Mountain Peak", + "tag.worldgen.biome.is_mountain.slope": "Mountain Slope", + "tag.worldgen.biome.is_mushroom": "Mushroom", + "tag.worldgen.biome.is_nether": "Nether", + "tag.worldgen.biome.is_nether_forest": "Nether Forest", + "tag.worldgen.biome.is_ocean": "Ocean", + "tag.worldgen.biome.is_overworld": "Overworld", + "tag.worldgen.biome.is_plains": "Plains", + "tag.worldgen.biome.is_river": "River", + "tag.worldgen.biome.is_savanna": "Savanna", + "tag.worldgen.biome.is_shallow_ocean": "Shallow Ocean", + "tag.worldgen.biome.is_snowy": "Snowy", + "tag.worldgen.biome.is_snowy_plains": "Snowy Plains", + "tag.worldgen.biome.is_sparse_vegetation": "Sparse Vegetation", + "tag.worldgen.biome.is_sparse_vegetation.overworld": "Sparse Overworld Vegetation", + "tag.worldgen.biome.is_stony_shores": "Stony Shores", + "tag.worldgen.biome.is_swamp": "Swamp", + "tag.worldgen.biome.is_taiga": "Taiga", + "tag.worldgen.biome.is_temperate": "Temperate", + "tag.worldgen.biome.is_temperate.overworld": "Temperate Overworld", + "tag.worldgen.biome.is_the_end": "The End", + "tag.worldgen.biome.is_tree.coniferous": "Coniferous Tree", + "tag.worldgen.biome.is_tree.deciduous": "Deciduous Tree", + "tag.worldgen.biome.is_tree.jungle": "Jungle Tree", + "tag.worldgen.biome.is_tree.savanna": "Savanna Tree", + "tag.worldgen.biome.is_underground": "Underground", + "tag.worldgen.biome.is_void": "Void", + "tag.worldgen.biome.is_wasteland": "Wasteland", + "tag.worldgen.biome.is_wet": "Wet", + "tag.worldgen.biome.is_wet.overworld": "Wet Overworld", + "tag.worldgen.biome.is_windswept": "Windswept" } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores.json index 2b1417225c..e41d456f25 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores.json @@ -37,6 +37,10 @@ "id": "#common:ores/quartz", "required": false }, + { + "id": "#common:ores/netherite_scrap", + "required": false + }, { "id": "#c:ores", "required": false diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores/netherite_scrap.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores/netherite_scrap.json new file mode 100644 index 0000000000..6495885079 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores/netherite_scrap.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:ancient_debris" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ores.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ores.json index e8da2b9639..52cd44b8f2 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ores.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ores.json @@ -37,6 +37,10 @@ "id": "#common:ores/quartz", "required": false }, + { + "id": "#common:ores/netherite_scrap", + "required": false + }, { "id": "#c:ores", "required": false diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java index 870c7a9f50..40a2d0100f 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java +++ b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java @@ -32,8 +32,10 @@ private ConventionalBlockTags() { // Ores and ingots - broad categories public static final TagKey ORES = register("ores"); + // Ores and ingots - vanilla instances public static final TagKey ORES_QUARTZ = register("ores/quartz"); + public static final TagKey ORES_NETHERITE_SCRAP = register("ores/netherite_scrap"); public static final TagKey BARRELS = register("barrels"); public static final TagKey BARRELS_WOODEN = register("barrels/wooden"); @@ -54,12 +56,12 @@ private ConventionalBlockTags() { public static final TagKey SANDSTONE_BLOCKS = register("sandstone/blocks"); public static final TagKey SANDSTONE_SLABS = register("sandstone/slabs"); public static final TagKey SANDSTONE_STAIRS = register("sandstone/stairs"); - public static final TagKey RED_SANDSTONE_BLOCKS = register("sandstone/red_blocks"); - public static final TagKey RED_SANDSTONE_SLABS = register("sandstone/red_slabs"); - public static final TagKey RED_SANDSTONE_STAIRS = register("sandstone/red_stairs"); - public static final TagKey UNCOLORED_SANDSTONE_BLOCKS = register("sandstone/uncolored_blocks"); - public static final TagKey UNCOLORED_SANDSTONE_SLABS = register("sandstone/uncolored_slabs"); - public static final TagKey UNCOLORED_SANDSTONE_STAIRS = register("sandstone/uncolored_stairs"); + public static final TagKey SANDSTONE_RED_BLOCKS = register("sandstone/red_blocks"); + public static final TagKey SANDSTONE_RED_SLABS = register("sandstone/red_slabs"); + public static final TagKey SANDSTONE_RED_STAIRS = register("sandstone/red_stairs"); + public static final TagKey SANDSTONE_UNCOLORED_BLOCKS = register("sandstone/uncolored_blocks"); + public static final TagKey SANDSTONE_UNCOLORED_SLABS = register("sandstone/uncolored_slabs"); + public static final TagKey SANDSTONE_UNCOLORED_STAIRS = register("sandstone/uncolored_stairs"); // Blocks created with dyes public static final TagKey DYED_BLOCKS = register("dyed_blocks"); diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java index d3d333ca69..ad840a14c9 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java +++ b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java @@ -113,12 +113,12 @@ private ConventionalItemTags() { public static final TagKey SANDSTONE_BLOCKS = register("sandstone/blocks"); public static final TagKey SANDSTONE_SLABS = register("sandstone/slabs"); public static final TagKey SANDSTONE_STAIRS = register("sandstone/stairs"); - public static final TagKey RED_SANDSTONE_BLOCKS = register("sandstone/red_blocks"); - public static final TagKey RED_SANDSTONE_SLABS = register("sandstone/red_slabs"); - public static final TagKey RED_SANDSTONE_STAIRS = register("sandstone/red_stairs"); - public static final TagKey UNCOLORED_SANDSTONE_BLOCKS = register("sandstone/uncolored_blocks"); - public static final TagKey UNCOLORED_SANDSTONE_SLABS = register("sandstone/uncolored_slabs"); - public static final TagKey UNCOLORED_SANDSTONE_STAIRS = register("sandstone/uncolored_stairs"); + public static final TagKey SANDSTONE_RED_BLOCKS = register("sandstone/red_blocks"); + public static final TagKey SANDSTONE_RED_SLABS = register("sandstone/red_slabs"); + public static final TagKey SANDSTONE_RED_STAIRS = register("sandstone/red_stairs"); + public static final TagKey SANDSTONE_UNCOLORED_BLOCKS = register("sandstone/uncolored_blocks"); + public static final TagKey SANDSTONE_UNCOLORED_SLABS = register("sandstone/uncolored_slabs"); + public static final TagKey SANDSTONE_UNCOLORED_STAIRS = register("sandstone/uncolored_stairs"); // Dyes public static final TagKey DYES = register("dyes"); diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java index b9b67c7a41..3d874243bb 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java @@ -232,9 +232,9 @@ default void add(Identifier identifier, String value) { default void add(TagKey tagKey, String value) { String tagTranslationkey = "tag." + - tagKey.registry().getValue().getPath().replace("\\", ".") + + tagKey.registry().getValue().getPath().replace("/", ".") + "." + - tagKey.id().getPath().replace("\\", "."); + tagKey.id().getPath().replace("/", "."); add(tagTranslationkey, value); } From 44189bd447a31649c0320686289ecf79ab95a119 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 9 Sep 2023 13:42:34 -0400 Subject: [PATCH 003/123] fixed lang file keys --- .../lang/en_us.json | 412 +++++++++--------- .../v1/provider/FabricLanguageProvider.java | 2 +- 2 files changed, 207 insertions(+), 207 deletions(-) diff --git a/fabric-convention-tags-v1/src/generated/resources/assets/fabric-convention-tags-v1-datagen/lang/en_us.json b/fabric-convention-tags-v1/src/generated/resources/assets/fabric-convention-tags-v1-datagen/lang/en_us.json index 210623ea8f..d2f2217935 100644 --- a/fabric-convention-tags-v1/src/generated/resources/assets/fabric-convention-tags-v1-datagen/lang/en_us.json +++ b/fabric-convention-tags-v1/src/generated/resources/assets/fabric-convention-tags-v1-datagen/lang/en_us.json @@ -1,208 +1,208 @@ { - "tag.block.barrels": "Barrels", - "tag.block.barrels.wooden": "Barrels Wooden", - "tag.block.bookshelves": "Bookshelves", - "tag.block.budding_blocks": "Budding Blocks", - "tag.block.buds": "Buds", - "tag.block.chests": "Chests", - "tag.block.clusters": "Clusters", - "tag.block.dyed_blocks": "Dyed Blocks", - "tag.block.dyed_blocks.black": "Black Dyed Blocks", - "tag.block.dyed_blocks.blue": "Blue Dyed Blocks", - "tag.block.dyed_blocks.brown": "Brown Dyed Blocks", - "tag.block.dyed_blocks.cyan": "Cyan Dyed Blocks", - "tag.block.dyed_blocks.gray": "Gray Dyed Blocks", - "tag.block.dyed_blocks.green": "Green Dyed Blocks", - "tag.block.dyed_blocks.light_blue": "Light Blue Dyed Blocks", - "tag.block.dyed_blocks.light_gray": "Light Gray Dyed Blocks", - "tag.block.dyed_blocks.lime": "Lime Dyed Blocks", - "tag.block.dyed_blocks.magenta": "Magenta Dyed Blocks", - "tag.block.dyed_blocks.orange": "Orange Dyed Blocks", - "tag.block.dyed_blocks.pink": "Pink Dyed Blocks", - "tag.block.dyed_blocks.purple": "Purple Dyed Blocks", - "tag.block.dyed_blocks.red": "Red Dyed Blocks", - "tag.block.dyed_blocks.white": "White Dyed Blocks", - "tag.block.dyed_blocks.yellow": "Yellow Dyed Blocks", - "tag.block.glass_blocks": "Glass Blocks", - "tag.block.glass_panes": "Glass Panes", - "tag.block.ores": "Ores", - "tag.block.ores.netherite_scrap": "Netherite Scrapes Ores", - "tag.block.ores.quartz": "Quartz Ores", - "tag.block.relocation_not_supported": "Relocation Not Supported", - "tag.block.sandstone.blocks": "Sandstone Blocks", - "tag.block.sandstone.red_blocks": "Red Sandstone Blocks", - "tag.block.sandstone.red_slabs": "Red Sandstone Slabs", - "tag.block.sandstone.red_stairs": "Red Sandstone Stairs", - "tag.block.sandstone.slabs": "Sandstone Slabs", - "tag.block.sandstone.stairs": "Sandstone Stairs", - "tag.block.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", - "tag.block.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", - "tag.block.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", - "tag.block.shulker_boxes": "Shulker Boxes", - "tag.block.villager_job_sites": "Villager Job Sites", - "tag.block_entity_type.relocation_not_supported": "Relocation Not Supported", - "tag.enchantment.entity_defense_enhancement": "Entity Defense Enhancements", - "tag.enchantment.entity_movement_enhancement": "Entity Movement Enhancements", - "tag.enchantment.fortune": "Increases Block Drops", - "tag.enchantment.looting": "Increases Entity Drops", - "tag.enchantment.weapon_damage_enhancement": "Weapon Damage Enhancements", - "tag.entity_type.boats": "Boats", - "tag.entity_type.bosses": "Bosses", - "tag.entity_type.minecarts": "Minecarts", - "tag.fluid.honey": "Honey", - "tag.fluid.lava": "Lava", - "tag.fluid.milk": "Milk", - "tag.fluid.water": "Water", - "tag.item.barrels": "Barrels", - "tag.item.barrels.wooden": "Wooden Barrels", - "tag.item.bookshelves": "Bookshelves", - "tag.item.buckets.empty": "Empty Buckets", - "tag.item.buckets.entity_water": "Entity Water Buckets", - "tag.item.buckets.lava": "Lava Buckets", - "tag.item.buckets.milk": "Milk Buckets", - "tag.item.buckets.water": "Water Buckets", - "tag.item.budding_blocks": "Budding Blocks", - "tag.item.buds": "Buds", - "tag.item.chests": "Chests", - "tag.item.clusters": "Clusters", - "tag.item.coal": "Coal", - "tag.item.dusts": "Dusts", - "tag.item.dusts.glowstone": "Glowstone Dusts", - "tag.item.dusts.redstone": "Redstone Dusts", - "tag.item.dyed_items": "Dyed Items", - "tag.item.dyed_items.black": "Black Dyed Items", - "tag.item.dyed_items.blue": "Blue Dyed Items", - "tag.item.dyed_items.brown": "Brown Dyed Items", - "tag.item.dyed_items.cyan": "Cyan Dyed Items", - "tag.item.dyed_items.gray": "Gray Dyed Items", - "tag.item.dyed_items.green": "Green Dyed Items", - "tag.item.dyed_items.light_blue": "Light Blue Dyed Items", - "tag.item.dyed_items.light_gray": "Light Gray Dyed Items", - "tag.item.dyed_items.lime": "Lime Dyed Items", - "tag.item.dyed_items.magenta": "Magenta Dyed Items", - "tag.item.dyed_items.orange": "Orange Dyed Items", - "tag.item.dyed_items.pink": "Pink Dyed Items", - "tag.item.dyed_items.purple": "Purple Dyed Items", - "tag.item.dyed_items.red": "Red Dyed Items", - "tag.item.dyed_items.white": "White Dyed Items", - "tag.item.dyed_items.yellow": "Yellow Dyed Items", - "tag.item.dyes": "Dyes", - "tag.item.dyes.black": "Black Dyes", - "tag.item.dyes.blue": "Blue Dyes", - "tag.item.dyes.brown": "Brown Dyes", - "tag.item.dyes.cyan": "Cyan Dyes", - "tag.item.dyes.gray": "Gray Dyes", - "tag.item.dyes.green": "Green Dyes", - "tag.item.dyes.light_blue": "Light Blue Dyes", - "tag.item.dyes.light_gray": "Light Gray Dyes", - "tag.item.dyes.lime": "Lime Dyes", - "tag.item.dyes.magenta": "Magenta Dyes", - "tag.item.dyes.orange": "Orange Dyes", - "tag.item.dyes.pink": "Pink Dyes", - "tag.item.dyes.purple": "Purple Dyes", - "tag.item.dyes.red": "Red Dyes", - "tag.item.dyes.white": "White Dyes", - "tag.item.dyes.yellow": "Yellow Dyes", - "tag.item.foods": "Foods", - "tag.item.gems": "Gems", - "tag.item.gems.amethyst": "Amethyst Gems", - "tag.item.gems.diamond": "Diamond Gems", - "tag.item.gems.emerald": "Emerald Gems", - "tag.item.gems.lapis": "Lapis Gems", - "tag.item.gems.prismarine": "Prismarine Gems", - "tag.item.gems.quartz": "Quartz Gems", - "tag.item.glass_blocks": "Glass Blocks", - "tag.item.glass_panes": "Glass Panes", - "tag.item.ingots": "Ingots", - "tag.item.ingots.copper": "Ingots Copper", - "tag.item.ingots.gold": "Ingots Gold", - "tag.item.ingots.iron": "Ingots Iron", - "tag.item.ingots.netherite": "Ingots Netherite", - "tag.item.nuggets": "Nuggets", - "tag.item.ores": "Ores", - "tag.item.ores.netherite_scrap": "Netherite Scrap Ores", - "tag.item.ores.quartz": "Quartz Ores", - "tag.item.potions": "Potions", - "tag.item.raw_blocks": "Raw Blocks", - "tag.item.raw_blocks.copper": "Raw Blocks Copper", - "tag.item.raw_blocks.gold": "Raw Blocks Gold", - "tag.item.raw_blocks.iron": "Raw Blocks Iron", - "tag.item.raw_materials": "Raw Materials", - "tag.item.raw_materials.copper": "Raw Materials Copper", - "tag.item.raw_materials.gold": "Raw Materials Gold", - "tag.item.raw_materials.iron": "Raw Materials Iron", - "tag.item.sandstone.blocks": "Sandstone Blocks", - "tag.item.sandstone.red_blocks": "Red Sandstone Blocks", - "tag.item.sandstone.red_slabs": "Red Sandstone Slabs", - "tag.item.sandstone.red_stairs": "Red Sandstone Stairs", - "tag.item.sandstone.slabs": "Sandstone Slabs", - "tag.item.sandstone.stairs": "Sandstone Stairs", - "tag.item.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", - "tag.item.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", - "tag.item.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", - "tag.item.shulker_boxes": "Shulker Boxes", - "tag.item.tools": "Tools", - "tag.item.tools.bows": "Bows", - "tag.item.tools.crossbows": "Crossbows", - "tag.item.tools.fishing_rods": "Fishing Rods", - "tag.item.tools.shears": "Shears", - "tag.item.tools.shields": "Shields", - "tag.item.tools.spears": "Spears", - "tag.item.villager_job_sites": "Villager Job Sites", - "tag.worldgen.biome.is_aquatic": "Aquatic", - "tag.worldgen.biome.is_aquatic_icy": "Icy Aquatic", - "tag.worldgen.biome.is_badlands": "Badlands", - "tag.worldgen.biome.is_beach": "Beach", - "tag.worldgen.biome.is_birch_forest": "Birch Forest", - "tag.worldgen.biome.is_cave": "Cave", - "tag.worldgen.biome.is_cold": "Cold", - "tag.worldgen.biome.is_cold.overworld": "Cold Overworld", - "tag.worldgen.biome.is_dead": "Dead", - "tag.worldgen.biome.is_deep_ocean": "Deep Ocean", - "tag.worldgen.biome.is_dense_vegetation": "Dense Vegetation", - "tag.worldgen.biome.is_dense_vegetation.overworld": "Dense Overworld Vegetation", - "tag.worldgen.biome.is_desert": "Desert", - "tag.worldgen.biome.is_dry": "Dry", - "tag.worldgen.biome.is_dry.overworld": "Dry Overworld", - "tag.worldgen.biome.is_end_island": "End Island", - "tag.worldgen.biome.is_extreme_hills": "Extreme Hills", - "tag.worldgen.biome.is_floral": "Floral", - "tag.worldgen.biome.is_flower_forest": "Flower Forest", - "tag.worldgen.biome.is_forest": "Forest", - "tag.worldgen.biome.is_hot": "Hot", - "tag.worldgen.biome.is_hot.overworld": "Hot Overworld", - "tag.worldgen.biome.is_icy": "Icy", - "tag.worldgen.biome.is_jungle": "Jungle", - "tag.worldgen.biome.is_mountain": "Mountain", - "tag.worldgen.biome.is_mountain.peak": "Mountain Peak", - "tag.worldgen.biome.is_mountain.slope": "Mountain Slope", - "tag.worldgen.biome.is_mushroom": "Mushroom", - "tag.worldgen.biome.is_nether": "Nether", - "tag.worldgen.biome.is_nether_forest": "Nether Forest", - "tag.worldgen.biome.is_ocean": "Ocean", - "tag.worldgen.biome.is_overworld": "Overworld", - "tag.worldgen.biome.is_plains": "Plains", - "tag.worldgen.biome.is_river": "River", - "tag.worldgen.biome.is_savanna": "Savanna", - "tag.worldgen.biome.is_shallow_ocean": "Shallow Ocean", - "tag.worldgen.biome.is_snowy": "Snowy", - "tag.worldgen.biome.is_snowy_plains": "Snowy Plains", - "tag.worldgen.biome.is_sparse_vegetation": "Sparse Vegetation", - "tag.worldgen.biome.is_sparse_vegetation.overworld": "Sparse Overworld Vegetation", - "tag.worldgen.biome.is_stony_shores": "Stony Shores", - "tag.worldgen.biome.is_swamp": "Swamp", - "tag.worldgen.biome.is_taiga": "Taiga", - "tag.worldgen.biome.is_temperate": "Temperate", - "tag.worldgen.biome.is_temperate.overworld": "Temperate Overworld", - "tag.worldgen.biome.is_the_end": "The End", - "tag.worldgen.biome.is_tree.coniferous": "Coniferous Tree", - "tag.worldgen.biome.is_tree.deciduous": "Deciduous Tree", - "tag.worldgen.biome.is_tree.jungle": "Jungle Tree", - "tag.worldgen.biome.is_tree.savanna": "Savanna Tree", - "tag.worldgen.biome.is_underground": "Underground", - "tag.worldgen.biome.is_void": "Void", - "tag.worldgen.biome.is_wasteland": "Wasteland", - "tag.worldgen.biome.is_wet": "Wet", - "tag.worldgen.biome.is_wet.overworld": "Wet Overworld", - "tag.worldgen.biome.is_windswept": "Windswept" + "tag.block.common.barrels": "Barrels", + "tag.block.common.barrels.wooden": "Barrels Wooden", + "tag.block.common.bookshelves": "Bookshelves", + "tag.block.common.budding_blocks": "Budding Blocks", + "tag.block.common.buds": "Buds", + "tag.block.common.chests": "Chests", + "tag.block.common.clusters": "Clusters", + "tag.block.common.dyed_blocks": "Dyed Blocks", + "tag.block.common.dyed_blocks.black": "Black Dyed Blocks", + "tag.block.common.dyed_blocks.blue": "Blue Dyed Blocks", + "tag.block.common.dyed_blocks.brown": "Brown Dyed Blocks", + "tag.block.common.dyed_blocks.cyan": "Cyan Dyed Blocks", + "tag.block.common.dyed_blocks.gray": "Gray Dyed Blocks", + "tag.block.common.dyed_blocks.green": "Green Dyed Blocks", + "tag.block.common.dyed_blocks.light_blue": "Light Blue Dyed Blocks", + "tag.block.common.dyed_blocks.light_gray": "Light Gray Dyed Blocks", + "tag.block.common.dyed_blocks.lime": "Lime Dyed Blocks", + "tag.block.common.dyed_blocks.magenta": "Magenta Dyed Blocks", + "tag.block.common.dyed_blocks.orange": "Orange Dyed Blocks", + "tag.block.common.dyed_blocks.pink": "Pink Dyed Blocks", + "tag.block.common.dyed_blocks.purple": "Purple Dyed Blocks", + "tag.block.common.dyed_blocks.red": "Red Dyed Blocks", + "tag.block.common.dyed_blocks.white": "White Dyed Blocks", + "tag.block.common.dyed_blocks.yellow": "Yellow Dyed Blocks", + "tag.block.common.glass_blocks": "Glass Blocks", + "tag.block.common.glass_panes": "Glass Panes", + "tag.block.common.ores": "Ores", + "tag.block.common.ores.netherite_scrap": "Netherite Scrapes Ores", + "tag.block.common.ores.quartz": "Quartz Ores", + "tag.block.common.relocation_not_supported": "Relocation Not Supported", + "tag.block.common.sandstone.blocks": "Sandstone Blocks", + "tag.block.common.sandstone.red_blocks": "Red Sandstone Blocks", + "tag.block.common.sandstone.red_slabs": "Red Sandstone Slabs", + "tag.block.common.sandstone.red_stairs": "Red Sandstone Stairs", + "tag.block.common.sandstone.slabs": "Sandstone Slabs", + "tag.block.common.sandstone.stairs": "Sandstone Stairs", + "tag.block.common.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", + "tag.block.common.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", + "tag.block.common.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", + "tag.block.common.shulker_boxes": "Shulker Boxes", + "tag.block.common.villager_job_sites": "Villager Job Sites", + "tag.block_entity_type.common.relocation_not_supported": "Relocation Not Supported", + "tag.enchantment.common.entity_defense_enhancement": "Entity Defense Enhancements", + "tag.enchantment.common.entity_movement_enhancement": "Entity Movement Enhancements", + "tag.enchantment.common.fortune": "Increases Block Drops", + "tag.enchantment.common.looting": "Increases Entity Drops", + "tag.enchantment.common.weapon_damage_enhancement": "Weapon Damage Enhancements", + "tag.entity_type.common.boats": "Boats", + "tag.entity_type.common.bosses": "Bosses", + "tag.entity_type.common.minecarts": "Minecarts", + "tag.fluid.common.honey": "Honey", + "tag.fluid.common.lava": "Lava", + "tag.fluid.common.milk": "Milk", + "tag.fluid.common.water": "Water", + "tag.item.common.barrels": "Barrels", + "tag.item.common.barrels.wooden": "Wooden Barrels", + "tag.item.common.bookshelves": "Bookshelves", + "tag.item.common.buckets.empty": "Empty Buckets", + "tag.item.common.buckets.entity_water": "Entity Water Buckets", + "tag.item.common.buckets.lava": "Lava Buckets", + "tag.item.common.buckets.milk": "Milk Buckets", + "tag.item.common.buckets.water": "Water Buckets", + "tag.item.common.budding_blocks": "Budding Blocks", + "tag.item.common.buds": "Buds", + "tag.item.common.chests": "Chests", + "tag.item.common.clusters": "Clusters", + "tag.item.common.coal": "Coal", + "tag.item.common.dusts": "Dusts", + "tag.item.common.dusts.glowstone": "Glowstone Dusts", + "tag.item.common.dusts.redstone": "Redstone Dusts", + "tag.item.common.dyed_items": "Dyed Items", + "tag.item.common.dyed_items.black": "Black Dyed Items", + "tag.item.common.dyed_items.blue": "Blue Dyed Items", + "tag.item.common.dyed_items.brown": "Brown Dyed Items", + "tag.item.common.dyed_items.cyan": "Cyan Dyed Items", + "tag.item.common.dyed_items.gray": "Gray Dyed Items", + "tag.item.common.dyed_items.green": "Green Dyed Items", + "tag.item.common.dyed_items.light_blue": "Light Blue Dyed Items", + "tag.item.common.dyed_items.light_gray": "Light Gray Dyed Items", + "tag.item.common.dyed_items.lime": "Lime Dyed Items", + "tag.item.common.dyed_items.magenta": "Magenta Dyed Items", + "tag.item.common.dyed_items.orange": "Orange Dyed Items", + "tag.item.common.dyed_items.pink": "Pink Dyed Items", + "tag.item.common.dyed_items.purple": "Purple Dyed Items", + "tag.item.common.dyed_items.red": "Red Dyed Items", + "tag.item.common.dyed_items.white": "White Dyed Items", + "tag.item.common.dyed_items.yellow": "Yellow Dyed Items", + "tag.item.common.dyes": "Dyes", + "tag.item.common.dyes.black": "Black Dyes", + "tag.item.common.dyes.blue": "Blue Dyes", + "tag.item.common.dyes.brown": "Brown Dyes", + "tag.item.common.dyes.cyan": "Cyan Dyes", + "tag.item.common.dyes.gray": "Gray Dyes", + "tag.item.common.dyes.green": "Green Dyes", + "tag.item.common.dyes.light_blue": "Light Blue Dyes", + "tag.item.common.dyes.light_gray": "Light Gray Dyes", + "tag.item.common.dyes.lime": "Lime Dyes", + "tag.item.common.dyes.magenta": "Magenta Dyes", + "tag.item.common.dyes.orange": "Orange Dyes", + "tag.item.common.dyes.pink": "Pink Dyes", + "tag.item.common.dyes.purple": "Purple Dyes", + "tag.item.common.dyes.red": "Red Dyes", + "tag.item.common.dyes.white": "White Dyes", + "tag.item.common.dyes.yellow": "Yellow Dyes", + "tag.item.common.foods": "Foods", + "tag.item.common.gems": "Gems", + "tag.item.common.gems.amethyst": "Amethyst Gems", + "tag.item.common.gems.diamond": "Diamond Gems", + "tag.item.common.gems.emerald": "Emerald Gems", + "tag.item.common.gems.lapis": "Lapis Gems", + "tag.item.common.gems.prismarine": "Prismarine Gems", + "tag.item.common.gems.quartz": "Quartz Gems", + "tag.item.common.glass_blocks": "Glass Blocks", + "tag.item.common.glass_panes": "Glass Panes", + "tag.item.common.ingots": "Ingots", + "tag.item.common.ingots.copper": "Ingots Copper", + "tag.item.common.ingots.gold": "Ingots Gold", + "tag.item.common.ingots.iron": "Ingots Iron", + "tag.item.common.ingots.netherite": "Ingots Netherite", + "tag.item.common.nuggets": "Nuggets", + "tag.item.common.ores": "Ores", + "tag.item.common.ores.netherite_scrap": "Netherite Scrap Ores", + "tag.item.common.ores.quartz": "Quartz Ores", + "tag.item.common.potions": "Potions", + "tag.item.common.raw_blocks": "Raw Blocks", + "tag.item.common.raw_blocks.copper": "Raw Blocks Copper", + "tag.item.common.raw_blocks.gold": "Raw Blocks Gold", + "tag.item.common.raw_blocks.iron": "Raw Blocks Iron", + "tag.item.common.raw_materials": "Raw Materials", + "tag.item.common.raw_materials.copper": "Raw Materials Copper", + "tag.item.common.raw_materials.gold": "Raw Materials Gold", + "tag.item.common.raw_materials.iron": "Raw Materials Iron", + "tag.item.common.sandstone.blocks": "Sandstone Blocks", + "tag.item.common.sandstone.red_blocks": "Red Sandstone Blocks", + "tag.item.common.sandstone.red_slabs": "Red Sandstone Slabs", + "tag.item.common.sandstone.red_stairs": "Red Sandstone Stairs", + "tag.item.common.sandstone.slabs": "Sandstone Slabs", + "tag.item.common.sandstone.stairs": "Sandstone Stairs", + "tag.item.common.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", + "tag.item.common.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", + "tag.item.common.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", + "tag.item.common.shulker_boxes": "Shulker Boxes", + "tag.item.common.tools": "Tools", + "tag.item.common.tools.bows": "Bows", + "tag.item.common.tools.crossbows": "Crossbows", + "tag.item.common.tools.fishing_rods": "Fishing Rods", + "tag.item.common.tools.shears": "Shears", + "tag.item.common.tools.shields": "Shields", + "tag.item.common.tools.spears": "Spears", + "tag.item.common.villager_job_sites": "Villager Job Sites", + "tag.worldgen.biome.common.is_aquatic": "Aquatic", + "tag.worldgen.biome.common.is_aquatic_icy": "Icy Aquatic", + "tag.worldgen.biome.common.is_badlands": "Badlands", + "tag.worldgen.biome.common.is_beach": "Beach", + "tag.worldgen.biome.common.is_birch_forest": "Birch Forest", + "tag.worldgen.biome.common.is_cave": "Cave", + "tag.worldgen.biome.common.is_cold": "Cold", + "tag.worldgen.biome.common.is_cold.overworld": "Cold Overworld", + "tag.worldgen.biome.common.is_dead": "Dead", + "tag.worldgen.biome.common.is_deep_ocean": "Deep Ocean", + "tag.worldgen.biome.common.is_dense_vegetation": "Dense Vegetation", + "tag.worldgen.biome.common.is_dense_vegetation.overworld": "Dense Overworld Vegetation", + "tag.worldgen.biome.common.is_desert": "Desert", + "tag.worldgen.biome.common.is_dry": "Dry", + "tag.worldgen.biome.common.is_dry.overworld": "Dry Overworld", + "tag.worldgen.biome.common.is_end_island": "End Island", + "tag.worldgen.biome.common.is_extreme_hills": "Extreme Hills", + "tag.worldgen.biome.common.is_floral": "Floral", + "tag.worldgen.biome.common.is_flower_forest": "Flower Forest", + "tag.worldgen.biome.common.is_forest": "Forest", + "tag.worldgen.biome.common.is_hot": "Hot", + "tag.worldgen.biome.common.is_hot.overworld": "Hot Overworld", + "tag.worldgen.biome.common.is_icy": "Icy", + "tag.worldgen.biome.common.is_jungle": "Jungle", + "tag.worldgen.biome.common.is_mountain": "Mountain", + "tag.worldgen.biome.common.is_mountain.peak": "Mountain Peak", + "tag.worldgen.biome.common.is_mountain.slope": "Mountain Slope", + "tag.worldgen.biome.common.is_mushroom": "Mushroom", + "tag.worldgen.biome.common.is_nether": "Nether", + "tag.worldgen.biome.common.is_nether_forest": "Nether Forest", + "tag.worldgen.biome.common.is_ocean": "Ocean", + "tag.worldgen.biome.common.is_overworld": "Overworld", + "tag.worldgen.biome.common.is_plains": "Plains", + "tag.worldgen.biome.common.is_river": "River", + "tag.worldgen.biome.common.is_savanna": "Savanna", + "tag.worldgen.biome.common.is_shallow_ocean": "Shallow Ocean", + "tag.worldgen.biome.common.is_snowy": "Snowy", + "tag.worldgen.biome.common.is_snowy_plains": "Snowy Plains", + "tag.worldgen.biome.common.is_sparse_vegetation": "Sparse Vegetation", + "tag.worldgen.biome.common.is_sparse_vegetation.overworld": "Sparse Overworld Vegetation", + "tag.worldgen.biome.common.is_stony_shores": "Stony Shores", + "tag.worldgen.biome.common.is_swamp": "Swamp", + "tag.worldgen.biome.common.is_taiga": "Taiga", + "tag.worldgen.biome.common.is_temperate": "Temperate", + "tag.worldgen.biome.common.is_temperate.overworld": "Temperate Overworld", + "tag.worldgen.biome.common.is_the_end": "The End", + "tag.worldgen.biome.common.is_tree.coniferous": "Coniferous Tree", + "tag.worldgen.biome.common.is_tree.deciduous": "Deciduous Tree", + "tag.worldgen.biome.common.is_tree.jungle": "Jungle Tree", + "tag.worldgen.biome.common.is_tree.savanna": "Savanna Tree", + "tag.worldgen.biome.common.is_underground": "Underground", + "tag.worldgen.biome.common.is_void": "Void", + "tag.worldgen.biome.common.is_wasteland": "Wasteland", + "tag.worldgen.biome.common.is_wet": "Wet", + "tag.worldgen.biome.common.is_wet.overworld": "Wet Overworld", + "tag.worldgen.biome.common.is_windswept": "Windswept" } \ No newline at end of file diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java index 3d874243bb..13d045b32e 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java @@ -234,7 +234,7 @@ default void add(TagKey tagKey, String value) { "tag." + tagKey.registry().getValue().getPath().replace("/", ".") + "." + - tagKey.id().getPath().replace("/", "."); + tagKey.id().toString().replace("/", ".").replace(":", "."); add(tagTranslationkey, value); } From a3508607c3b4fa491df7b7778a964652f494f04f Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 9 Sep 2023 20:36:04 -0400 Subject: [PATCH 004/123] checkstyle fixes and module dep fixes --- fabric-convention-tags-v1/build.gradle | 5 +- .../client/ConventionLogWarnings.java | 217 +++++++++ .../datagen/generators/BiomeTagGenerator.java | 12 +- .../BlockEntityTypeTagGenerator.java | 7 +- .../datagen/generators/BlockTagGenerator.java | 23 +- .../generators/EnchantmentTagGenerator.java | 12 +- .../generators/EnglishTagLangGenerator.java | 440 +++++++++--------- .../generators/EntityTypeTagGenerator.java | 12 +- .../datagen/generators/FluidTagGenerator.java | 12 +- .../datagen/generators/ItemTagGenerator.java | 15 +- .../v1/ConventionalBlockEntityTypeTags.java | 4 +- .../fabric/api/tag/convention/v1/TagUtil.java | 11 + .../src/main/resources/fabric.mod.json | 8 +- fabric-data-generation-api-v1/build.gradle | 1 + .../v1/provider/FabricLanguageProvider.java | 11 +- .../v1/provider/FabricTagProvider.java | 2 +- 16 files changed, 513 insertions(+), 279 deletions(-) create mode 100644 fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java diff --git a/fabric-convention-tags-v1/build.gradle b/fabric-convention-tags-v1/build.gradle index ab2cb0ef62..194a4b9181 100644 --- a/fabric-convention-tags-v1/build.gradle +++ b/fabric-convention-tags-v1/build.gradle @@ -1,6 +1,9 @@ version = getSubprojectVersion(project) -moduleDependencies(project, ['fabric-api-base']) +moduleDependencies(project, [ + 'fabric-api-base', + 'fabric-lifecycle-events-v1' +]) testDependencies(project, [ ':fabric-lifecycle-events-v1', diff --git a/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java b/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java new file mode 100644 index 0000000000..324e4381be --- /dev/null +++ b/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java @@ -0,0 +1,217 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.impl.tag.convention.client; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.List; +import java.util.Properties; + +import it.unimi.dsi.fastutil.objects.ObjectArrayList; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import net.minecraft.SharedConstants; +import net.minecraft.client.resource.language.I18n; +import net.minecraft.item.Item; +import net.minecraft.registry.DynamicRegistryManager; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.tag.TagKey; + +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; +import net.fabricmc.fabric.api.tag.convention.v1.TagUtil; +import net.fabricmc.loader.api.FabricLoader; + +public class ConventionLogWarnings implements ClientModInitializer { + public static final Logger LOGGER = LoggerFactory.getLogger(ConventionLogWarnings.class); + /** + * A config option mainly for developers. + * Logs out modded item tags that do not have translations when running on integrated server. + * Defaults to DEV_SHORT. + */ + private static final LOG_WARNING_MODES LOG_UNTRANSLATED_WARNING_MODE; + /** + * A config option mainly for developers. + * Logs out modded tags that are using the 'c' namespace when running on integrated server. + * Defaults to DEV_SHORT. + */ + private static final LOG_WARNING_MODES LOG_LEGACY_WARNING_MODE; + + private enum LOG_WARNING_MODES { + SILENCED, + DEV_SHORT, + DEV_VERBOSE, + PROD_SHORT, + PROD_VERBOSE + } + + static { + File configDir = FabricLoader.getInstance().getConfigDir().resolve("fabric").toFile(); + + if (!configDir.exists()) { + if (!configDir.mkdir()) { + LOGGER.warn("[Fabric Tag Conventions v1] Could not create configuration directory: " + configDir.getAbsolutePath()); + } + } + + File configFile = new File(configDir, "fabric-tag-conventions-v1.properties"); + Properties properties = new Properties(); + + if (configFile.exists()) { + try (FileInputStream stream = new FileInputStream(configFile)) { + properties.load(stream); + } catch (IOException e) { + LOGGER.warn("[Fabric Tag Conventions v1] Could not read property file '" + configFile.getAbsolutePath() + "'", e); + } + } + + LOG_UNTRANSLATED_WARNING_MODE = asEnum((String) properties.computeIfAbsent("log-untranslated-item-tag-warnings", (a) -> "dev_short"), LOG_WARNING_MODES.DEV_SHORT); + LOG_LEGACY_WARNING_MODE = asEnum((String) properties.computeIfAbsent("log-legacy-tag-warnings", (a) -> "dev_short"), LOG_WARNING_MODES.DEV_SHORT); + + try (FileOutputStream stream = new FileOutputStream(configFile)) { + properties.store(stream, "Fabric Tag Conventions v1 properties file"); + } catch (IOException e) { + LOGGER.warn("[Fabric Tag Conventions v1] Could not store property file '" + configFile.getAbsolutePath() + "'", e); + } + } + + @Override + public void onInitializeClient() { + if (LOG_UNTRANSLATED_WARNING_MODE != LOG_WARNING_MODES.SILENCED) setupUntranslatedItemTagWarning(); + if (LOG_LEGACY_WARNING_MODE != LOG_WARNING_MODES.SILENCED) setupLegacyTagWarning(); + } + + private static void setupUntranslatedItemTagWarning() { + // Log missing item tag translations only in development environment and not running dedicated server. + ServerLifecycleEvents.SERVER_STARTED.register(server -> { + boolean isConfigSetToDev = + LOG_UNTRANSLATED_WARNING_MODE == LOG_WARNING_MODES.DEV_SHORT + || LOG_UNTRANSLATED_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE; + + if (SharedConstants.isDevelopment == isConfigSetToDev) { + Registry itemRegistry = server.getRegistryManager().get(RegistryKeys.ITEM); + List> untranslatedItemTags = new ObjectArrayList<>(); + itemRegistry.streamTags().forEach(itemTagKey -> { + // We do not translate vanilla's tags at this moment. + if (itemTagKey.id().getNamespace().equals("minecraft")) { + return; + } + + String translationKey = TagUtil.getTagTranslationKey(itemTagKey); + + if (!I18n.hasTranslation(translationKey)) { + untranslatedItemTags.add(itemTagKey); + } + }); + + if (!untranslatedItemTags.isEmpty()) { + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append(""" + \n Dev warning - Untranslated Item Tags detected. Please translate your item tags so other mods such as recipe viewers can properly display your tag's name. + You can disable this dev message in Fabric API's properties config file by setting log-untranslated-item-tag-warning to "SILENCED" or see individual tags with "DEV_VERBOSE". + """); + + // Print out all untranslated tags when desired. + boolean isConfigSetToVerbose = + LOG_UNTRANSLATED_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE + || LOG_UNTRANSLATED_WARNING_MODE == LOG_WARNING_MODES.PROD_VERBOSE; + + if (isConfigSetToVerbose) { + stringBuilder.append("\nUntranslated item tags:"); + + for (TagKey tagKey : untranslatedItemTags) { + stringBuilder.append("\n ").append(tagKey.id()); + } + } + + LOGGER.warn(stringBuilder.toString()); + } + } + }); + } + + // Remove in 1.22 + private static void setupLegacyTagWarning() { + // Log tags that are still using legacy 'c' namespace + ServerLifecycleEvents.SERVER_STARTED.register(server -> { + boolean isConfigSetToDev = + LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_SHORT + || LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE; + + if (SharedConstants.isDevelopment == isConfigSetToDev) { + List> legacyTags = new ObjectArrayList<>(); + DynamicRegistryManager.Immutable dynamicRegistries = server.getRegistryManager(); + + // We only care about vanilla registries + dynamicRegistries.streamAllRegistries().forEach(registryEntry -> { + if (registryEntry.key().getValue().getNamespace().equals("minecraft")) { + registryEntry.value().streamTags().forEach(tagKey -> { + // Grab tags under 'forge' namespace + if (tagKey.id().getNamespace().equals("c")) { + legacyTags.add(tagKey); + } + }); + } + }); + + if (!legacyTags.isEmpty()) { + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append(""" + \n Dev warning - Legacy Tags detected. Please migrate your 'c' namespace tags to 'common' namespace! See net.minecraftforge.common.Tags.java for all tags. + NOTE: Many tags have been moved around or renamed. Some new ones were added so please review the new tags. And make sure you follow tag conventions for new tags! + You can disable this message in Fabric API's properties config file by setting log-legacy-tag-warnings to "SILENCED" or see individual tags with "DEV_VERBOSE". + """); + + // Print out all legacy tags when desired. + boolean isConfigSetToVerbose = + LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE + || LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.PROD_VERBOSE; + + if (isConfigSetToVerbose) { + stringBuilder.append("\nLegacy tags:"); + + for (TagKey tagKey : legacyTags) { + stringBuilder.append("\n ").append(tagKey.id()); + } + } + + LOGGER.warn(stringBuilder.toString()); + } + } + }); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + private static T asEnum(String property, T defValue) { + if (property == null || property.isEmpty()) { + return defValue; + } else { + for (Enum obj : defValue.getClass().getEnumConstants()) { + if (property.equalsIgnoreCase(obj.name())) { + //noinspection unchecked + return (T) obj; + } + } + + return defValue; + } + } +} diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java index 7453639987..b856510a8c 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java @@ -16,9 +16,8 @@ package net.fabricmc.fabric.impl.tag.convention.datagen.generators; -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBiomeTags; +import java.util.concurrent.CompletableFuture; + import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.BiomeTags; @@ -27,7 +26,9 @@ import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeKeys; -import java.util.concurrent.CompletableFuture; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBiomeTags; public class BiomeTagGenerator extends FabricTagProvider { public BiomeTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { @@ -335,8 +336,7 @@ private void generateBackwardsCompatTags() { getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLOWER_FOREST).addOptionalTag(new Identifier("c", "flower_forests")); } - private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey tag) - { + private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey tag) { return getOrCreateTagBuilder(tag).addOptionalTag(new Identifier("c", tag.id().getPath())); } } diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java index c975e3c60b..6de1bce37a 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java @@ -16,12 +16,13 @@ package net.fabricmc.fabric.impl.tag.convention.datagen.generators; +import java.util.concurrent.CompletableFuture; + +import net.minecraft.registry.RegistryWrapper; + import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockEntityTypeTags; -import net.minecraft.registry.RegistryWrapper; - -import java.util.concurrent.CompletableFuture; public class BlockEntityTypeTagGenerator extends FabricTagProvider.BlockEntityTypeTagProvider { public BlockEntityTypeTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java index aa89dba3d2..9744f04659 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java @@ -16,9 +16,9 @@ package net.fabricmc.fabric.impl.tag.convention.datagen.generators; -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags; +import java.util.List; +import java.util.concurrent.CompletableFuture; + import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.registry.RegistryWrapper; @@ -26,8 +26,9 @@ import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; -import java.util.List; -import java.util.concurrent.CompletableFuture; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags; public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { static List VILLAGER_JOB_SITE_BLOCKS = List.of( @@ -205,31 +206,32 @@ private void generateGlassTags() { .add(Blocks.WHITE_STAINED_GLASS_PANE) .add(Blocks.YELLOW_STAINED_GLASS_PANE); } + private void generateDyedTags() { getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS_BLACK) .add(Blocks.BLACK_BANNER).add(Blocks.BLACK_BED).add(Blocks.BLACK_CANDLE).add(Blocks.BLACK_CARPET) .add(Blocks.BLACK_CONCRETE).add(Blocks.BLACK_CONCRETE_POWDER).add(Blocks.BLACK_GLAZED_TERRACOTTA) .add(Blocks.BLACK_SHULKER_BOX).add(Blocks.BLACK_STAINED_GLASS).add(Blocks.BLACK_STAINED_GLASS_PANE) .add(Blocks.BLACK_TERRACOTTA).add(Blocks.BLACK_WOOL); - + getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS_BLUE) .add(Blocks.BLUE_BANNER).add(Blocks.BLUE_BED).add(Blocks.BLUE_CANDLE).add(Blocks.BLUE_CARPET) .add(Blocks.BLUE_CONCRETE).add(Blocks.BLUE_CONCRETE_POWDER).add(Blocks.BLUE_GLAZED_TERRACOTTA) .add(Blocks.BLUE_SHULKER_BOX).add(Blocks.BLUE_STAINED_GLASS).add(Blocks.BLUE_STAINED_GLASS_PANE) .add(Blocks.BLUE_TERRACOTTA).add(Blocks.BLUE_WOOL); - + getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS_BROWN) .add(Blocks.BROWN_BANNER).add(Blocks.BROWN_BED).add(Blocks.BROWN_CANDLE).add(Blocks.BROWN_CARPET) .add(Blocks.BROWN_CONCRETE).add(Blocks.BROWN_CONCRETE_POWDER).add(Blocks.BROWN_GLAZED_TERRACOTTA) .add(Blocks.BROWN_SHULKER_BOX).add(Blocks.BROWN_STAINED_GLASS).add(Blocks.BROWN_STAINED_GLASS_PANE) .add(Blocks.BROWN_TERRACOTTA).add(Blocks.BROWN_WOOL); - + getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS_CYAN) .add(Blocks.CYAN_BANNER).add(Blocks.CYAN_BED).add(Blocks.CYAN_CANDLE).add(Blocks.CYAN_CARPET) .add(Blocks.CYAN_CONCRETE).add(Blocks.CYAN_CONCRETE_POWDER).add(Blocks.CYAN_GLAZED_TERRACOTTA) .add(Blocks.CYAN_SHULKER_BOX).add(Blocks.CYAN_STAINED_GLASS).add(Blocks.CYAN_STAINED_GLASS_PANE) .add(Blocks.CYAN_TERRACOTTA).add(Blocks.CYAN_WOOL); - + getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS_GRAY) .add(Blocks.GRAY_BANNER).add(Blocks.GRAY_BED).add(Blocks.GRAY_CANDLE).add(Blocks.GRAY_CARPET) .add(Blocks.GRAY_CONCRETE).add(Blocks.GRAY_CONCRETE_POWDER).add(Blocks.GRAY_GLAZED_TERRACOTTA) @@ -350,8 +352,7 @@ private void generateBackwardsCompatTags() { getOrCreateTagBuilder(ConventionalBlockTags.SANDSTONE_UNCOLORED_STAIRS).addOptionalTag(new Identifier("c", "uncolored_sandstone_stairs")); } - private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey tag) - { + private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey tag) { return getOrCreateTagBuilder(tag).addOptionalTag(new Identifier("c", tag.id().getPath())); } } diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java index 6ce7e930d1..25e1da15f7 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java @@ -16,16 +16,17 @@ package net.fabricmc.fabric.impl.tag.convention.datagen.generators; -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalEnchantmentTags; +import java.util.concurrent.CompletableFuture; + import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.Enchantments; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; -import java.util.concurrent.CompletableFuture; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalEnchantmentTags; public class EnchantmentTagGenerator extends FabricTagProvider.EnchantmentTagProvider { public EnchantmentTagGenerator(FabricDataOutput output, CompletableFuture registriesFuture) { @@ -65,8 +66,7 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { getOrCreateTagBuilderWithOptionalLegacy(ConventionalEnchantmentTags.ENTITY_DEFENSE_ENHANCEMENT); } - private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey tag) - { + private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey tag) { return getOrCreateTagBuilder(tag).addOptionalTag(new Identifier("c", tag.id().getPath())); } } diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index c859cd04c1..492d7e77fa 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -11,230 +11,230 @@ import net.fabricmc.fabric.api.tag.convention.v1.ConventionalItemTags; public class EnglishTagLangGenerator extends FabricLanguageProvider { - public EnglishTagLangGenerator(FabricDataOutput output) { - super(output); - } + public EnglishTagLangGenerator(FabricDataOutput output) { + super(output); + } - @Override - public void generateTranslations(FabricLanguageProvider.TranslationBuilder translationBuilder) { - // Blocks - translationBuilder.add(ConventionalBlockTags.ORES, "Ores"); - translationBuilder.add(ConventionalBlockTags.ORES_QUARTZ, "Quartz Ores"); - translationBuilder.add(ConventionalBlockTags.ORES_NETHERITE_SCRAP, "Netherite Scrapes Ores"); - translationBuilder.add(ConventionalBlockTags.BARRELS, "Barrels"); - translationBuilder.add(ConventionalBlockTags.BARRELS_WOODEN, "Barrels Wooden"); - translationBuilder.add(ConventionalBlockTags.BOOKSHELVES, "Bookshelves"); - translationBuilder.add(ConventionalBlockTags.CHESTS, "Chests"); - translationBuilder.add(ConventionalBlockTags.GLASS_BLOCKS, "Glass Blocks"); - translationBuilder.add(ConventionalBlockTags.GLASS_PANES, "Glass Panes"); - translationBuilder.add(ConventionalBlockTags.SHULKER_BOXES, "Shulker Boxes"); - translationBuilder.add(ConventionalBlockTags.BUDDING_BLOCKS, "Budding Blocks"); - translationBuilder.add(ConventionalBlockTags.BUDS, "Buds"); - translationBuilder.add(ConventionalBlockTags.CLUSTERS, "Clusters"); - translationBuilder.add(ConventionalBlockTags.VILLAGER_JOB_SITES, "Villager Job Sites"); - translationBuilder.add(ConventionalBlockTags.SANDSTONE_BLOCKS, "Sandstone Blocks"); - translationBuilder.add(ConventionalBlockTags.SANDSTONE_SLABS, "Sandstone Slabs"); - translationBuilder.add(ConventionalBlockTags.SANDSTONE_STAIRS, "Sandstone Stairs"); - translationBuilder.add(ConventionalBlockTags.SANDSTONE_RED_BLOCKS, "Red Sandstone Blocks"); - translationBuilder.add(ConventionalBlockTags.SANDSTONE_RED_SLABS, "Red Sandstone Slabs"); - translationBuilder.add(ConventionalBlockTags.SANDSTONE_RED_STAIRS, "Red Sandstone Stairs"); - translationBuilder.add(ConventionalBlockTags.SANDSTONE_UNCOLORED_BLOCKS, "Uncolored Sandstone Blocks"); - translationBuilder.add(ConventionalBlockTags.SANDSTONE_UNCOLORED_SLABS, "Uncolored Sandstone Slabs"); - translationBuilder.add(ConventionalBlockTags.SANDSTONE_UNCOLORED_STAIRS, "Uncolored Sandstone Stairs"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS, "Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_BLACK, "Black Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_BLUE, "Blue Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_BROWN, "Brown Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_CYAN, "Cyan Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_GRAY, "Gray Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_GREEN, "Green Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_LIGHT_BLUE, "Light Blue Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_LIGHT_GRAY, "Light Gray Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_LIME, "Lime Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_MAGENTA, "Magenta Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_ORANGE, "Orange Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_PINK, "Pink Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_PURPLE, "Purple Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_RED, "Red Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_WHITE, "White Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_YELLOW, "Yellow Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.RELOCATION_NOT_SUPPORTED, "Relocation Not Supported"); + @Override + public void generateTranslations(FabricLanguageProvider.TranslationBuilder translationBuilder) { + // Blocks + translationBuilder.add(ConventionalBlockTags.ORES, "Ores"); + translationBuilder.add(ConventionalBlockTags.ORES_QUARTZ, "Quartz Ores"); + translationBuilder.add(ConventionalBlockTags.ORES_NETHERITE_SCRAP, "Netherite Scrapes Ores"); + translationBuilder.add(ConventionalBlockTags.BARRELS, "Barrels"); + translationBuilder.add(ConventionalBlockTags.BARRELS_WOODEN, "Barrels Wooden"); + translationBuilder.add(ConventionalBlockTags.BOOKSHELVES, "Bookshelves"); + translationBuilder.add(ConventionalBlockTags.CHESTS, "Chests"); + translationBuilder.add(ConventionalBlockTags.GLASS_BLOCKS, "Glass Blocks"); + translationBuilder.add(ConventionalBlockTags.GLASS_PANES, "Glass Panes"); + translationBuilder.add(ConventionalBlockTags.SHULKER_BOXES, "Shulker Boxes"); + translationBuilder.add(ConventionalBlockTags.BUDDING_BLOCKS, "Budding Blocks"); + translationBuilder.add(ConventionalBlockTags.BUDS, "Buds"); + translationBuilder.add(ConventionalBlockTags.CLUSTERS, "Clusters"); + translationBuilder.add(ConventionalBlockTags.VILLAGER_JOB_SITES, "Villager Job Sites"); + translationBuilder.add(ConventionalBlockTags.SANDSTONE_BLOCKS, "Sandstone Blocks"); + translationBuilder.add(ConventionalBlockTags.SANDSTONE_SLABS, "Sandstone Slabs"); + translationBuilder.add(ConventionalBlockTags.SANDSTONE_STAIRS, "Sandstone Stairs"); + translationBuilder.add(ConventionalBlockTags.SANDSTONE_RED_BLOCKS, "Red Sandstone Blocks"); + translationBuilder.add(ConventionalBlockTags.SANDSTONE_RED_SLABS, "Red Sandstone Slabs"); + translationBuilder.add(ConventionalBlockTags.SANDSTONE_RED_STAIRS, "Red Sandstone Stairs"); + translationBuilder.add(ConventionalBlockTags.SANDSTONE_UNCOLORED_BLOCKS, "Uncolored Sandstone Blocks"); + translationBuilder.add(ConventionalBlockTags.SANDSTONE_UNCOLORED_SLABS, "Uncolored Sandstone Slabs"); + translationBuilder.add(ConventionalBlockTags.SANDSTONE_UNCOLORED_STAIRS, "Uncolored Sandstone Stairs"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS, "Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_BLACK, "Black Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_BLUE, "Blue Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_BROWN, "Brown Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_CYAN, "Cyan Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_GRAY, "Gray Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_GREEN, "Green Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_LIGHT_BLUE, "Light Blue Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_LIGHT_GRAY, "Light Gray Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_LIME, "Lime Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_MAGENTA, "Magenta Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_ORANGE, "Orange Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_PINK, "Pink Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_PURPLE, "Purple Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_RED, "Red Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_WHITE, "White Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_YELLOW, "Yellow Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.RELOCATION_NOT_SUPPORTED, "Relocation Not Supported"); - // Block Entity Types - translationBuilder.add(ConventionalBlockEntityTypeTags.RELOCATION_NOT_SUPPORTED, "Relocation Not Supported"); - - // Items - translationBuilder.add(ConventionalItemTags.TOOLS, "Tools"); - translationBuilder.add(ConventionalItemTags.TOOLS_SHEARS, "Shears"); - translationBuilder.add(ConventionalItemTags.TOOLS_SPEARS, "Spears"); - translationBuilder.add(ConventionalItemTags.TOOLS_BOWS, "Bows"); - translationBuilder.add(ConventionalItemTags.TOOLS_CROSSBOWS, "Crossbows"); - translationBuilder.add(ConventionalItemTags.TOOLS_SHIELDS, "Shields"); - translationBuilder.add(ConventionalItemTags.TOOLS_FISHING_RODS, "Fishing Rods"); - translationBuilder.add(ConventionalItemTags.DUSTS, "Dusts"); - translationBuilder.add(ConventionalItemTags.GEMS, "Gems"); - translationBuilder.add(ConventionalItemTags.INGOTS, "Ingots"); - translationBuilder.add(ConventionalItemTags.NUGGETS, "Nuggets"); - translationBuilder.add(ConventionalItemTags.ORES, "Ores"); - translationBuilder.add(ConventionalItemTags.RAW_MATERIALS, "Raw Materials"); - translationBuilder.add(ConventionalItemTags.RAW_BLOCKS, "Raw Blocks"); - translationBuilder.add(ConventionalItemTags.RAW_MATERIALS_IRON, "Raw Materials Iron"); - translationBuilder.add(ConventionalItemTags.RAW_MATERIALS_GOLD, "Raw Materials Gold"); - translationBuilder.add(ConventionalItemTags.RAW_MATERIALS_COPPER, "Raw Materials Copper"); - translationBuilder.add(ConventionalItemTags.RAW_BLOCKS_IRON, "Raw Blocks Iron"); - translationBuilder.add(ConventionalItemTags.RAW_BLOCKS_GOLD, "Raw Blocks Gold"); - translationBuilder.add(ConventionalItemTags.RAW_BLOCKS_COPPER, "Raw Blocks Copper"); - translationBuilder.add(ConventionalItemTags.INGOTS_IRON, "Ingots Iron"); - translationBuilder.add(ConventionalItemTags.INGOTS_GOLD, "Ingots Gold"); - translationBuilder.add(ConventionalItemTags.INGOTS_COPPER, "Ingots Copper"); - translationBuilder.add(ConventionalItemTags.INGOTS_NETHERITE, "Ingots Netherite"); - translationBuilder.add(ConventionalItemTags.ORES_NETHERITE_SCRAP, "Netherite Scrap Ores"); - translationBuilder.add(ConventionalItemTags.ORES_QUARTZ, "Quartz Ores"); - translationBuilder.add(ConventionalItemTags.GEMS_QUARTZ, "Quartz Gems"); - translationBuilder.add(ConventionalItemTags.GEMS_LAPIS, "Lapis Gems"); - translationBuilder.add(ConventionalItemTags.GEMS_DIAMOND, "Diamond Gems"); - translationBuilder.add(ConventionalItemTags.GEMS_AMETHYST, "Amethyst Gems"); - translationBuilder.add(ConventionalItemTags.GEMS_EMERALD, "Emerald Gems"); - translationBuilder.add(ConventionalItemTags.GEMS_PRISMARINE, "Prismarine Gems"); - translationBuilder.add(ConventionalItemTags.DUSTS_REDSTONE, "Redstone Dusts"); - translationBuilder.add(ConventionalItemTags.DUSTS_GLOWSTONE, "Glowstone Dusts"); - translationBuilder.add(ConventionalItemTags.COAL, "Coal"); - translationBuilder.add(ConventionalItemTags.FOODS, "Foods"); - translationBuilder.add(ConventionalItemTags.POTIONS, "Potions"); - translationBuilder.add(ConventionalItemTags.BUCKETS_WATER, "Water Buckets"); - translationBuilder.add(ConventionalItemTags.BUCKETS_ENTITY_WATER, "Entity Water Buckets"); - translationBuilder.add(ConventionalItemTags.BUCKETS_LAVA, "Lava Buckets"); - translationBuilder.add(ConventionalItemTags.BUCKETS_MILK, "Milk Buckets"); - translationBuilder.add(ConventionalItemTags.BUCKETS_EMPTY, "Empty Buckets"); - translationBuilder.add(ConventionalItemTags.BARRELS, "Barrels"); - translationBuilder.add(ConventionalItemTags.BARRELS_WOODEN, "Wooden Barrels"); - translationBuilder.add(ConventionalItemTags.BOOKSHELVES, "Bookshelves"); - translationBuilder.add(ConventionalItemTags.CHESTS, "Chests"); - translationBuilder.add(ConventionalItemTags.GLASS_BLOCKS, "Glass Blocks"); - translationBuilder.add(ConventionalItemTags.GLASS_PANES, "Glass Panes"); - translationBuilder.add(ConventionalItemTags.SHULKER_BOXES, "Shulker Boxes"); - translationBuilder.add(ConventionalItemTags.BUDDING_BLOCKS, "Budding Blocks"); - translationBuilder.add(ConventionalItemTags.BUDS, "Buds"); - translationBuilder.add(ConventionalItemTags.CLUSTERS, "Clusters"); - translationBuilder.add(ConventionalItemTags.VILLAGER_JOB_SITES, "Villager Job Sites"); - translationBuilder.add(ConventionalItemTags.SANDSTONE_BLOCKS, "Sandstone Blocks"); - translationBuilder.add(ConventionalItemTags.SANDSTONE_SLABS, "Sandstone Slabs"); - translationBuilder.add(ConventionalItemTags.SANDSTONE_STAIRS, "Sandstone Stairs"); - translationBuilder.add(ConventionalItemTags.SANDSTONE_RED_BLOCKS, "Red Sandstone Blocks"); - translationBuilder.add(ConventionalItemTags.SANDSTONE_RED_SLABS, "Red Sandstone Slabs"); - translationBuilder.add(ConventionalItemTags.SANDSTONE_RED_STAIRS, "Red Sandstone Stairs"); - translationBuilder.add(ConventionalItemTags.SANDSTONE_UNCOLORED_BLOCKS, "Uncolored Sandstone Blocks"); - translationBuilder.add(ConventionalItemTags.SANDSTONE_UNCOLORED_SLABS, "Uncolored Sandstone Slabs"); - translationBuilder.add(ConventionalItemTags.SANDSTONE_UNCOLORED_STAIRS, "Uncolored Sandstone Stairs"); - translationBuilder.add(ConventionalItemTags.DYES, "Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_BLACK, "Black Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_BLUE, "Blue Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_BROWN, "Brown Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_CYAN, "Cyan Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_GRAY, "Gray Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_GREEN, "Green Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_LIGHT_BLUE, "Light Blue Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_LIGHT_GRAY, "Light Gray Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_LIME, "Lime Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_MAGENTA, "Magenta Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_ORANGE, "Orange Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_PINK, "Pink Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_PURPLE, "Purple Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_RED, "Red Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_WHITE, "White Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_YELLOW, "Yellow Dyes"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS, "Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_BLACK, "Black Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_BLUE, "Blue Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_BROWN, "Brown Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_CYAN, "Cyan Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_GRAY, "Gray Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_GREEN, "Green Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_LIGHT_BLUE, "Light Blue Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_LIGHT_GRAY, "Light Gray Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_LIME, "Lime Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_MAGENTA, "Magenta Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_ORANGE, "Orange Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_PINK, "Pink Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_PURPLE, "Purple Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_RED, "Red Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_WHITE, "White Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_YELLOW, "Yellow Dyed Items"); + // Block Entity Types + translationBuilder.add(ConventionalBlockEntityTypeTags.RELOCATION_NOT_SUPPORTED, "Relocation Not Supported"); - // Enchantments - translationBuilder.add(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS, "Increases Block Drops"); - translationBuilder.add(ConventionalEnchantmentTags.INCREASES_ENTITY_DROPS, "Increases Entity Drops"); - translationBuilder.add(ConventionalEnchantmentTags.WEAPON_DAMAGE_ENHANCEMENT, "Weapon Damage Enhancements"); - translationBuilder.add(ConventionalEnchantmentTags.ENTITY_MOVEMENT_ENHANCEMENT, "Entity Movement Enhancements"); - translationBuilder.add(ConventionalEnchantmentTags.ENTITY_DEFENSE_ENHANCEMENT, "Entity Defense Enhancements"); + // Items + translationBuilder.add(ConventionalItemTags.TOOLS, "Tools"); + translationBuilder.add(ConventionalItemTags.TOOLS_SHEARS, "Shears"); + translationBuilder.add(ConventionalItemTags.TOOLS_SPEARS, "Spears"); + translationBuilder.add(ConventionalItemTags.TOOLS_BOWS, "Bows"); + translationBuilder.add(ConventionalItemTags.TOOLS_CROSSBOWS, "Crossbows"); + translationBuilder.add(ConventionalItemTags.TOOLS_SHIELDS, "Shields"); + translationBuilder.add(ConventionalItemTags.TOOLS_FISHING_RODS, "Fishing Rods"); + translationBuilder.add(ConventionalItemTags.DUSTS, "Dusts"); + translationBuilder.add(ConventionalItemTags.GEMS, "Gems"); + translationBuilder.add(ConventionalItemTags.INGOTS, "Ingots"); + translationBuilder.add(ConventionalItemTags.NUGGETS, "Nuggets"); + translationBuilder.add(ConventionalItemTags.ORES, "Ores"); + translationBuilder.add(ConventionalItemTags.RAW_MATERIALS, "Raw Materials"); + translationBuilder.add(ConventionalItemTags.RAW_BLOCKS, "Raw Blocks"); + translationBuilder.add(ConventionalItemTags.RAW_MATERIALS_IRON, "Raw Materials Iron"); + translationBuilder.add(ConventionalItemTags.RAW_MATERIALS_GOLD, "Raw Materials Gold"); + translationBuilder.add(ConventionalItemTags.RAW_MATERIALS_COPPER, "Raw Materials Copper"); + translationBuilder.add(ConventionalItemTags.RAW_BLOCKS_IRON, "Raw Blocks Iron"); + translationBuilder.add(ConventionalItemTags.RAW_BLOCKS_GOLD, "Raw Blocks Gold"); + translationBuilder.add(ConventionalItemTags.RAW_BLOCKS_COPPER, "Raw Blocks Copper"); + translationBuilder.add(ConventionalItemTags.INGOTS_IRON, "Ingots Iron"); + translationBuilder.add(ConventionalItemTags.INGOTS_GOLD, "Ingots Gold"); + translationBuilder.add(ConventionalItemTags.INGOTS_COPPER, "Ingots Copper"); + translationBuilder.add(ConventionalItemTags.INGOTS_NETHERITE, "Ingots Netherite"); + translationBuilder.add(ConventionalItemTags.ORES_NETHERITE_SCRAP, "Netherite Scrap Ores"); + translationBuilder.add(ConventionalItemTags.ORES_QUARTZ, "Quartz Ores"); + translationBuilder.add(ConventionalItemTags.GEMS_QUARTZ, "Quartz Gems"); + translationBuilder.add(ConventionalItemTags.GEMS_LAPIS, "Lapis Gems"); + translationBuilder.add(ConventionalItemTags.GEMS_DIAMOND, "Diamond Gems"); + translationBuilder.add(ConventionalItemTags.GEMS_AMETHYST, "Amethyst Gems"); + translationBuilder.add(ConventionalItemTags.GEMS_EMERALD, "Emerald Gems"); + translationBuilder.add(ConventionalItemTags.GEMS_PRISMARINE, "Prismarine Gems"); + translationBuilder.add(ConventionalItemTags.DUSTS_REDSTONE, "Redstone Dusts"); + translationBuilder.add(ConventionalItemTags.DUSTS_GLOWSTONE, "Glowstone Dusts"); + translationBuilder.add(ConventionalItemTags.COAL, "Coal"); + translationBuilder.add(ConventionalItemTags.FOODS, "Foods"); + translationBuilder.add(ConventionalItemTags.POTIONS, "Potions"); + translationBuilder.add(ConventionalItemTags.BUCKETS_WATER, "Water Buckets"); + translationBuilder.add(ConventionalItemTags.BUCKETS_ENTITY_WATER, "Entity Water Buckets"); + translationBuilder.add(ConventionalItemTags.BUCKETS_LAVA, "Lava Buckets"); + translationBuilder.add(ConventionalItemTags.BUCKETS_MILK, "Milk Buckets"); + translationBuilder.add(ConventionalItemTags.BUCKETS_EMPTY, "Empty Buckets"); + translationBuilder.add(ConventionalItemTags.BARRELS, "Barrels"); + translationBuilder.add(ConventionalItemTags.BARRELS_WOODEN, "Wooden Barrels"); + translationBuilder.add(ConventionalItemTags.BOOKSHELVES, "Bookshelves"); + translationBuilder.add(ConventionalItemTags.CHESTS, "Chests"); + translationBuilder.add(ConventionalItemTags.GLASS_BLOCKS, "Glass Blocks"); + translationBuilder.add(ConventionalItemTags.GLASS_PANES, "Glass Panes"); + translationBuilder.add(ConventionalItemTags.SHULKER_BOXES, "Shulker Boxes"); + translationBuilder.add(ConventionalItemTags.BUDDING_BLOCKS, "Budding Blocks"); + translationBuilder.add(ConventionalItemTags.BUDS, "Buds"); + translationBuilder.add(ConventionalItemTags.CLUSTERS, "Clusters"); + translationBuilder.add(ConventionalItemTags.VILLAGER_JOB_SITES, "Villager Job Sites"); + translationBuilder.add(ConventionalItemTags.SANDSTONE_BLOCKS, "Sandstone Blocks"); + translationBuilder.add(ConventionalItemTags.SANDSTONE_SLABS, "Sandstone Slabs"); + translationBuilder.add(ConventionalItemTags.SANDSTONE_STAIRS, "Sandstone Stairs"); + translationBuilder.add(ConventionalItemTags.SANDSTONE_RED_BLOCKS, "Red Sandstone Blocks"); + translationBuilder.add(ConventionalItemTags.SANDSTONE_RED_SLABS, "Red Sandstone Slabs"); + translationBuilder.add(ConventionalItemTags.SANDSTONE_RED_STAIRS, "Red Sandstone Stairs"); + translationBuilder.add(ConventionalItemTags.SANDSTONE_UNCOLORED_BLOCKS, "Uncolored Sandstone Blocks"); + translationBuilder.add(ConventionalItemTags.SANDSTONE_UNCOLORED_SLABS, "Uncolored Sandstone Slabs"); + translationBuilder.add(ConventionalItemTags.SANDSTONE_UNCOLORED_STAIRS, "Uncolored Sandstone Stairs"); + translationBuilder.add(ConventionalItemTags.DYES, "Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_BLACK, "Black Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_BLUE, "Blue Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_BROWN, "Brown Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_CYAN, "Cyan Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_GRAY, "Gray Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_GREEN, "Green Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_LIGHT_BLUE, "Light Blue Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_LIGHT_GRAY, "Light Gray Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_LIME, "Lime Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_MAGENTA, "Magenta Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_ORANGE, "Orange Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_PINK, "Pink Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_PURPLE, "Purple Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_RED, "Red Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_WHITE, "White Dyes"); + translationBuilder.add(ConventionalItemTags.DYES_YELLOW, "Yellow Dyes"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS, "Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_BLACK, "Black Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_BLUE, "Blue Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_BROWN, "Brown Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_CYAN, "Cyan Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_GRAY, "Gray Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_GREEN, "Green Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_LIGHT_BLUE, "Light Blue Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_LIGHT_GRAY, "Light Gray Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_LIME, "Lime Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_MAGENTA, "Magenta Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_ORANGE, "Orange Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_PINK, "Pink Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_PURPLE, "Purple Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_RED, "Red Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_WHITE, "White Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED_ITEMS_YELLOW, "Yellow Dyed Items"); - // Entity Types - translationBuilder.add(ConventionalEntityTypeTags.BOSSES, "Bosses"); - translationBuilder.add(ConventionalEntityTypeTags.MINECARTS, "Minecarts"); - translationBuilder.add(ConventionalEntityTypeTags.BOATS, "Boats"); + // Enchantments + translationBuilder.add(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS, "Increases Block Drops"); + translationBuilder.add(ConventionalEnchantmentTags.INCREASES_ENTITY_DROPS, "Increases Entity Drops"); + translationBuilder.add(ConventionalEnchantmentTags.WEAPON_DAMAGE_ENHANCEMENT, "Weapon Damage Enhancements"); + translationBuilder.add(ConventionalEnchantmentTags.ENTITY_MOVEMENT_ENHANCEMENT, "Entity Movement Enhancements"); + translationBuilder.add(ConventionalEnchantmentTags.ENTITY_DEFENSE_ENHANCEMENT, "Entity Defense Enhancements"); - // Fluids - translationBuilder.add(ConventionalFluidTags.LAVA, "Lava"); - translationBuilder.add(ConventionalFluidTags.WATER, "Water"); - translationBuilder.add(ConventionalFluidTags.MILK, "Milk"); - translationBuilder.add(ConventionalFluidTags.HONEY, "Honey"); + // Entity Types + translationBuilder.add(ConventionalEntityTypeTags.BOSSES, "Bosses"); + translationBuilder.add(ConventionalEntityTypeTags.MINECARTS, "Minecarts"); + translationBuilder.add(ConventionalEntityTypeTags.BOATS, "Boats"); - // Biomes - translationBuilder.add(ConventionalBiomeTags.IS_OVERWORLD, "Overworld"); - translationBuilder.add(ConventionalBiomeTags.IS_THE_END, "The End"); - translationBuilder.add(ConventionalBiomeTags.IS_NETHER, "Nether"); - translationBuilder.add(ConventionalBiomeTags.IS_TAIGA, "Taiga"); - translationBuilder.add(ConventionalBiomeTags.IS_EXTREME_HILLS, "Extreme Hills"); - translationBuilder.add(ConventionalBiomeTags.IS_WINDSWEPT, "Windswept"); - translationBuilder.add(ConventionalBiomeTags.IS_JUNGLE, "Jungle"); - translationBuilder.add(ConventionalBiomeTags.IS_PLAINS, "Plains"); - translationBuilder.add(ConventionalBiomeTags.IS_SAVANNA, "Savanna"); - translationBuilder.add(ConventionalBiomeTags.IS_ICY, "Icy"); - translationBuilder.add(ConventionalBiomeTags.IS_AQUATIC_ICY, "Icy Aquatic"); - translationBuilder.add(ConventionalBiomeTags.IS_BEACH, "Beach"); - translationBuilder.add(ConventionalBiomeTags.IS_FOREST, "Forest"); - translationBuilder.add(ConventionalBiomeTags.IS_BIRCH_FOREST, "Birch Forest"); - translationBuilder.add(ConventionalBiomeTags.IS_OCEAN, "Ocean"); - translationBuilder.add(ConventionalBiomeTags.IS_DESERT, "Desert"); - translationBuilder.add(ConventionalBiomeTags.IS_RIVER, "River"); - translationBuilder.add(ConventionalBiomeTags.IS_SWAMP, "Swamp"); - translationBuilder.add(ConventionalBiomeTags.IS_MUSHROOM, "Mushroom"); - translationBuilder.add(ConventionalBiomeTags.IS_UNDERGROUND, "Underground"); - translationBuilder.add(ConventionalBiomeTags.IS_MOUNTAIN, "Mountain"); - translationBuilder.add(ConventionalBiomeTags.IS_HOT_OVERWORLD, "Hot Overworld"); - translationBuilder.add(ConventionalBiomeTags.IS_HOT, "Hot"); - translationBuilder.add(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD, "Temperate Overworld"); - translationBuilder.add(ConventionalBiomeTags.IS_TEMPERATE, "Temperate"); - translationBuilder.add(ConventionalBiomeTags.IS_COLD_OVERWORLD, "Cold Overworld"); - translationBuilder.add(ConventionalBiomeTags.IS_COLD, "Cold"); - translationBuilder.add(ConventionalBiomeTags.IS_WET_OVERWORLD, "Wet Overworld"); - translationBuilder.add(ConventionalBiomeTags.IS_WET, "Wet"); - translationBuilder.add(ConventionalBiomeTags.IS_DRY_OVERWORLD, "Dry Overworld"); - translationBuilder.add(ConventionalBiomeTags.IS_DRY, "Dry"); - translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_SPARSE, "Sparse Vegetation"); - translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD, "Sparse Overworld Vegetation"); - translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_DENSE, "Dense Vegetation"); - translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD, "Dense Overworld Vegetation"); - translationBuilder.add(ConventionalBiomeTags.IS_TREE_CONIFEROUS, "Coniferous Tree"); - translationBuilder.add(ConventionalBiomeTags.IS_TREE_SAVANNA, "Savanna Tree"); - translationBuilder.add(ConventionalBiomeTags.IS_TREE_JUNGLE, "Jungle Tree"); - translationBuilder.add(ConventionalBiomeTags.IS_TREE_DECIDUOUS, "Deciduous Tree"); - translationBuilder.add(ConventionalBiomeTags.IS_VOID, "Void"); - translationBuilder.add(ConventionalBiomeTags.IS_MOUNTAIN_PEAK, "Mountain Peak"); - translationBuilder.add(ConventionalBiomeTags.IS_MOUNTAIN_SLOPE, "Mountain Slope"); - translationBuilder.add(ConventionalBiomeTags.IS_AQUATIC, "Aquatic"); - translationBuilder.add(ConventionalBiomeTags.IS_WASTELAND, "Wasteland"); - translationBuilder.add(ConventionalBiomeTags.IS_DEAD, "Dead"); - translationBuilder.add(ConventionalBiomeTags.IS_FLORAL, "Floral"); - translationBuilder.add(ConventionalBiomeTags.IS_SNOWY, "Snowy"); - translationBuilder.add(ConventionalBiomeTags.IS_BADLANDS, "Badlands"); - translationBuilder.add(ConventionalBiomeTags.IS_CAVE, "Cave"); - translationBuilder.add(ConventionalBiomeTags.IS_END_ISLAND, "End Island"); - translationBuilder.add(ConventionalBiomeTags.IS_NETHER_FOREST, "Nether Forest"); - translationBuilder.add(ConventionalBiomeTags.IS_SNOWY_PLAINS, "Snowy Plains"); - translationBuilder.add(ConventionalBiomeTags.IS_STONY_SHORES, "Stony Shores"); - translationBuilder.add(ConventionalBiomeTags.IS_FLOWER_FOREST, "Flower Forest"); - translationBuilder.add(ConventionalBiomeTags.IS_DEEP_OCEAN, "Deep Ocean"); - translationBuilder.add(ConventionalBiomeTags.IS_SHALLOW_OCEAN, "Shallow Ocean"); - } + // Fluids + translationBuilder.add(ConventionalFluidTags.LAVA, "Lava"); + translationBuilder.add(ConventionalFluidTags.WATER, "Water"); + translationBuilder.add(ConventionalFluidTags.MILK, "Milk"); + translationBuilder.add(ConventionalFluidTags.HONEY, "Honey"); + + // Biomes + translationBuilder.add(ConventionalBiomeTags.IS_OVERWORLD, "Overworld"); + translationBuilder.add(ConventionalBiomeTags.IS_THE_END, "The End"); + translationBuilder.add(ConventionalBiomeTags.IS_NETHER, "Nether"); + translationBuilder.add(ConventionalBiomeTags.IS_TAIGA, "Taiga"); + translationBuilder.add(ConventionalBiomeTags.IS_EXTREME_HILLS, "Extreme Hills"); + translationBuilder.add(ConventionalBiomeTags.IS_WINDSWEPT, "Windswept"); + translationBuilder.add(ConventionalBiomeTags.IS_JUNGLE, "Jungle"); + translationBuilder.add(ConventionalBiomeTags.IS_PLAINS, "Plains"); + translationBuilder.add(ConventionalBiomeTags.IS_SAVANNA, "Savanna"); + translationBuilder.add(ConventionalBiomeTags.IS_ICY, "Icy"); + translationBuilder.add(ConventionalBiomeTags.IS_AQUATIC_ICY, "Icy Aquatic"); + translationBuilder.add(ConventionalBiomeTags.IS_BEACH, "Beach"); + translationBuilder.add(ConventionalBiomeTags.IS_FOREST, "Forest"); + translationBuilder.add(ConventionalBiomeTags.IS_BIRCH_FOREST, "Birch Forest"); + translationBuilder.add(ConventionalBiomeTags.IS_OCEAN, "Ocean"); + translationBuilder.add(ConventionalBiomeTags.IS_DESERT, "Desert"); + translationBuilder.add(ConventionalBiomeTags.IS_RIVER, "River"); + translationBuilder.add(ConventionalBiomeTags.IS_SWAMP, "Swamp"); + translationBuilder.add(ConventionalBiomeTags.IS_MUSHROOM, "Mushroom"); + translationBuilder.add(ConventionalBiomeTags.IS_UNDERGROUND, "Underground"); + translationBuilder.add(ConventionalBiomeTags.IS_MOUNTAIN, "Mountain"); + translationBuilder.add(ConventionalBiomeTags.IS_HOT_OVERWORLD, "Hot Overworld"); + translationBuilder.add(ConventionalBiomeTags.IS_HOT, "Hot"); + translationBuilder.add(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD, "Temperate Overworld"); + translationBuilder.add(ConventionalBiomeTags.IS_TEMPERATE, "Temperate"); + translationBuilder.add(ConventionalBiomeTags.IS_COLD_OVERWORLD, "Cold Overworld"); + translationBuilder.add(ConventionalBiomeTags.IS_COLD, "Cold"); + translationBuilder.add(ConventionalBiomeTags.IS_WET_OVERWORLD, "Wet Overworld"); + translationBuilder.add(ConventionalBiomeTags.IS_WET, "Wet"); + translationBuilder.add(ConventionalBiomeTags.IS_DRY_OVERWORLD, "Dry Overworld"); + translationBuilder.add(ConventionalBiomeTags.IS_DRY, "Dry"); + translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_SPARSE, "Sparse Vegetation"); + translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD, "Sparse Overworld Vegetation"); + translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_DENSE, "Dense Vegetation"); + translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD, "Dense Overworld Vegetation"); + translationBuilder.add(ConventionalBiomeTags.IS_TREE_CONIFEROUS, "Coniferous Tree"); + translationBuilder.add(ConventionalBiomeTags.IS_TREE_SAVANNA, "Savanna Tree"); + translationBuilder.add(ConventionalBiomeTags.IS_TREE_JUNGLE, "Jungle Tree"); + translationBuilder.add(ConventionalBiomeTags.IS_TREE_DECIDUOUS, "Deciduous Tree"); + translationBuilder.add(ConventionalBiomeTags.IS_VOID, "Void"); + translationBuilder.add(ConventionalBiomeTags.IS_MOUNTAIN_PEAK, "Mountain Peak"); + translationBuilder.add(ConventionalBiomeTags.IS_MOUNTAIN_SLOPE, "Mountain Slope"); + translationBuilder.add(ConventionalBiomeTags.IS_AQUATIC, "Aquatic"); + translationBuilder.add(ConventionalBiomeTags.IS_WASTELAND, "Wasteland"); + translationBuilder.add(ConventionalBiomeTags.IS_DEAD, "Dead"); + translationBuilder.add(ConventionalBiomeTags.IS_FLORAL, "Floral"); + translationBuilder.add(ConventionalBiomeTags.IS_SNOWY, "Snowy"); + translationBuilder.add(ConventionalBiomeTags.IS_BADLANDS, "Badlands"); + translationBuilder.add(ConventionalBiomeTags.IS_CAVE, "Cave"); + translationBuilder.add(ConventionalBiomeTags.IS_END_ISLAND, "End Island"); + translationBuilder.add(ConventionalBiomeTags.IS_NETHER_FOREST, "Nether Forest"); + translationBuilder.add(ConventionalBiomeTags.IS_SNOWY_PLAINS, "Snowy Plains"); + translationBuilder.add(ConventionalBiomeTags.IS_STONY_SHORES, "Stony Shores"); + translationBuilder.add(ConventionalBiomeTags.IS_FLOWER_FOREST, "Flower Forest"); + translationBuilder.add(ConventionalBiomeTags.IS_DEEP_OCEAN, "Deep Ocean"); + translationBuilder.add(ConventionalBiomeTags.IS_SHALLOW_OCEAN, "Shallow Ocean"); + } } diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java index e5542698b6..c8b053b6be 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java @@ -16,15 +16,16 @@ package net.fabricmc.fabric.impl.tag.convention.datagen.generators; -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalEntityTypeTags; +import java.util.concurrent.CompletableFuture; + import net.minecraft.entity.EntityType; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; -import java.util.concurrent.CompletableFuture; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalEntityTypeTags; public class EntityTypeTagGenerator extends FabricTagProvider.EntityTypeTagProvider { public EntityTypeTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { @@ -55,8 +56,7 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { getOrCreateTagBuilderWithOptionalLegacy(ConventionalEntityTypeTags.BOATS); } - private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey> tag) - { + private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey> tag) { return getOrCreateTagBuilder(tag).addOptionalTag(new Identifier("c", tag.id().getPath())); } } diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java index a03ce41773..44db85dfcd 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java @@ -16,16 +16,17 @@ package net.fabricmc.fabric.impl.tag.convention.datagen.generators; -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalFluidTags; +import java.util.concurrent.CompletableFuture; + import net.minecraft.fluid.Fluid; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.FluidTags; import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; -import java.util.concurrent.CompletableFuture; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalFluidTags; public class FluidTagGenerator extends FabricTagProvider.FluidTagProvider { public FluidTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { @@ -49,8 +50,7 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { getOrCreateTagBuilderWithOptionalLegacy(ConventionalFluidTags.HONEY); } - private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey tag) - { + private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey tag) { return getOrCreateTagBuilder(tag).addOptionalTag(new Identifier("c", tag.id().getPath())); } } diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index 672ce222d6..2ca76d6a4b 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -16,10 +16,8 @@ package net.fabricmc.fabric.impl.tag.convention.datagen.generators; -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalItemTags; +import java.util.concurrent.CompletableFuture; + import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; import net.minecraft.item.Items; @@ -29,10 +27,12 @@ import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; -import java.util.concurrent.CompletableFuture; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalItemTags; public class ItemTagGenerator extends FabricTagProvider.ItemTagProvider { - public ItemTagGenerator(FabricDataOutput output, CompletableFuture completableFuture, FabricTagProvider.BlockTagProvider blockTags) { super(output, completableFuture, blockTags); } @@ -357,8 +357,7 @@ private void generateBackwardsCompatTags() { getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.VILLAGER_JOB_SITES); } - private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey tag) - { + private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey tag) { return getOrCreateTagBuilder(tag).addOptionalTag(new Identifier("c", tag.id().getPath())); } } diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockEntityTypeTags.java b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockEntityTypeTags.java index aebf6a5df6..c58ea53ebc 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockEntityTypeTags.java +++ b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockEntityTypeTags.java @@ -16,11 +16,11 @@ package net.fabricmc.fabric.api.tag.convention.v1; -import net.fabricmc.fabric.impl.tag.convention.TagRegistration; import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.entity.EntityType; import net.minecraft.registry.tag.TagKey; +import net.fabricmc.fabric.impl.tag.convention.TagRegistration; + public final class ConventionalBlockEntityTypeTags { private ConventionalBlockEntityTypeTags() { } diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java index 5ea38bf2e8..75e70c3df1 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java +++ b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java @@ -81,4 +81,15 @@ public static boolean isIn(@Nullable DynamicRegistryManager registryManager, return false; } + + /** + * Use this to get a TagKey's translation key safely on any side. + * @return the translation key for a TagKey. + */ + public static String getTagTranslationKey(TagKey tagKey) { + return "tag." + + tagKey.registry().getValue().getPath().replace("/", ".") + + "." + + tagKey.id().toString().replace("/", ".").replace(":", "."); + } } diff --git a/fabric-convention-tags-v1/src/main/resources/fabric.mod.json b/fabric-convention-tags-v1/src/main/resources/fabric.mod.json index 9fd425d38c..a69031c1e5 100644 --- a/fabric-convention-tags-v1/src/main/resources/fabric.mod.json +++ b/fabric-convention-tags-v1/src/main/resources/fabric.mod.json @@ -15,9 +15,15 @@ "authors": [ "FabricMC" ], + "entrypoints": { + "client": [ + "net.fabricmc.fabric.impl.tag.convention.client.ConventionLogWarnings" + ] + }, "depends": { "fabricloader": ">=0.4.0", - "minecraft": ">=1.18.2" + "minecraft": ">=1.18.2", + "fabric-lifecycle-events-v1": "*" }, "description": "Contains common tags used by mods for vanilla things.", "custom": { diff --git a/fabric-data-generation-api-v1/build.gradle b/fabric-data-generation-api-v1/build.gradle index bbe27e46d7..4d38e3bf8c 100644 --- a/fabric-data-generation-api-v1/build.gradle +++ b/fabric-data-generation-api-v1/build.gradle @@ -7,6 +7,7 @@ moduleDependencies(project, [ 'fabric-resource-conditions-api-v1', 'fabric-item-group-api-v1', 'fabric-recipe-api-v1', + 'fabric-convention-tags-v1' ]) dependencies { diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java index 13d045b32e..42cc87e3d8 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java @@ -27,7 +27,6 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import net.minecraft.registry.tag.TagKey; import org.jetbrains.annotations.ApiStatus; import net.minecraft.block.Block; @@ -42,6 +41,7 @@ import net.minecraft.item.ItemGroup; import net.minecraft.registry.Registries; import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.tag.TagKey; import net.minecraft.stat.StatType; import net.minecraft.text.TextContent; import net.minecraft.text.TranslatableTextContent; @@ -49,6 +49,7 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.tag.convention.v1.TagUtil; /** * Extend this class and implement {@link FabricLanguageProvider#generateTranslations(TranslationBuilder)}. @@ -230,15 +231,9 @@ default void add(Identifier identifier, String value) { * @param value The value of the entry. */ default void add(TagKey tagKey, String value) { - String tagTranslationkey = - "tag." + - tagKey.registry().getValue().getPath().replace("/", ".") + - "." + - tagKey.id().toString().replace("/", ".").replace(":", "."); - add(tagTranslationkey, value); + add(TagUtil.getTagTranslationKey(tagKey), value); } - /** * Merges an existing language file into the generated language file. * diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagProvider.java index f066a5c4d4..4e4884141b 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagProvider.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagProvider.java @@ -22,10 +22,10 @@ import java.util.function.Function; import java.util.stream.Stream; -import net.minecraft.block.entity.BlockEntityType; import org.jetbrains.annotations.Nullable; import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.data.server.tag.TagProvider; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.EntityType; From 3b4e17b8e06ee7dcec16a021d8ac7cd5d72b667a Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 10 Sep 2023 07:14:41 -0400 Subject: [PATCH 005/123] Fixed dev environment check and wordings --- .../tag/convention/client/ConventionLogWarnings.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java b/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java index 324e4381be..4cb1aba1da 100644 --- a/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java +++ b/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java @@ -83,8 +83,8 @@ private enum LOG_WARNING_MODES { } } - LOG_UNTRANSLATED_WARNING_MODE = asEnum((String) properties.computeIfAbsent("log-untranslated-item-tag-warnings", (a) -> "dev_short"), LOG_WARNING_MODES.DEV_SHORT); - LOG_LEGACY_WARNING_MODE = asEnum((String) properties.computeIfAbsent("log-legacy-tag-warnings", (a) -> "dev_short"), LOG_WARNING_MODES.DEV_SHORT); + LOG_UNTRANSLATED_WARNING_MODE = asEnum((String) properties.computeIfAbsent("log-untranslated-item-tag-warnings", (a) -> "DEV_SHORT"), LOG_WARNING_MODES.DEV_SHORT); + LOG_LEGACY_WARNING_MODE = asEnum((String) properties.computeIfAbsent("log-legacy-tag-warnings", (a) -> "DEV_SHORT"), LOG_WARNING_MODES.DEV_SHORT); try (FileOutputStream stream = new FileOutputStream(configFile)) { properties.store(stream, "Fabric Tag Conventions v1 properties file"); @@ -106,7 +106,7 @@ private static void setupUntranslatedItemTagWarning() { LOG_UNTRANSLATED_WARNING_MODE == LOG_WARNING_MODES.DEV_SHORT || LOG_UNTRANSLATED_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE; - if (SharedConstants.isDevelopment == isConfigSetToDev) { + if (FabricLoader.getInstance().isDevelopmentEnvironment() == isConfigSetToDev) { Registry itemRegistry = server.getRegistryManager().get(RegistryKeys.ITEM); List> untranslatedItemTags = new ObjectArrayList<>(); itemRegistry.streamTags().forEach(itemTagKey -> { @@ -156,7 +156,7 @@ private static void setupLegacyTagWarning() { LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_SHORT || LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE; - if (SharedConstants.isDevelopment == isConfigSetToDev) { + if (FabricLoader.getInstance().isDevelopmentEnvironment() == isConfigSetToDev) { List> legacyTags = new ObjectArrayList<>(); DynamicRegistryManager.Immutable dynamicRegistries = server.getRegistryManager(); @@ -175,7 +175,7 @@ private static void setupLegacyTagWarning() { if (!legacyTags.isEmpty()) { StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append(""" - \n Dev warning - Legacy Tags detected. Please migrate your 'c' namespace tags to 'common' namespace! See net.minecraftforge.common.Tags.java for all tags. + \n Dev warning - Legacy Tags detected. Please migrate your 'c' namespace tags to 'common' namespace! See classes under net.fabricmc.fabric.api.tag.convention.v1 package for all tags. NOTE: Many tags have been moved around or renamed. Some new ones were added so please review the new tags. And make sure you follow tag conventions for new tags! You can disable this message in Fabric API's properties config file by setting log-legacy-tag-warnings to "SILENCED" or see individual tags with "DEV_VERBOSE". """); From 7c62078b9b1709ca614200012eb270fc1c3db634 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 10 Sep 2023 08:49:52 -0400 Subject: [PATCH 006/123] print registry the key is from --- .../impl/tag/convention/client/ConventionLogWarnings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java b/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java index 4cb1aba1da..396428e664 100644 --- a/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java +++ b/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java @@ -189,7 +189,7 @@ private static void setupLegacyTagWarning() { stringBuilder.append("\nLegacy tags:"); for (TagKey tagKey : legacyTags) { - stringBuilder.append("\n ").append(tagKey.id()); + stringBuilder.append("\n ").append(tagKey); } } From f77c070b65ed7bec756bd5b344916507566367cd Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 10 Sep 2023 10:29:07 -0400 Subject: [PATCH 007/123] removed unused import --- .../fabric/impl/tag/convention/client/ConventionLogWarnings.java | 1 - 1 file changed, 1 deletion(-) diff --git a/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java b/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java index 396428e664..5aa2be4490 100644 --- a/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java +++ b/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java @@ -27,7 +27,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.minecraft.SharedConstants; import net.minecraft.client.resource.language.I18n; import net.minecraft.item.Item; import net.minecraft.registry.DynamicRegistryManager; From bbce2200166557fb9ea9685f4c594ea03dc09a3c Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 10 Sep 2023 11:12:24 -0400 Subject: [PATCH 008/123] Add missing license header --- .../generators/EnglishTagLangGenerator.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 492d7e77fa..6c7840f135 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package net.fabricmc.fabric.impl.tag.convention.datagen.generators; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; From a0c56a271b38e176d1a98846c94f20c212245b16 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 10 Sep 2023 12:38:19 -0400 Subject: [PATCH 009/123] Added capturing_not_supported entity type tag --- .../datagen/generators/EnglishTagLangGenerator.java | 1 + .../convention/datagen/generators/EntityTypeTagGenerator.java | 1 + .../assets/fabric-convention-tags-v1-datagen/lang/en_us.json | 1 + .../common/tags/entity_types/capturing_not_supported.json | 4 ++++ .../api/tag/convention/v1/ConventionalEntityTypeTags.java | 1 + 5 files changed, 8 insertions(+) create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/capturing_not_supported.json diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 6c7840f135..6db58df49e 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -188,6 +188,7 @@ public void generateTranslations(FabricLanguageProvider.TranslationBuilder trans translationBuilder.add(ConventionalEntityTypeTags.BOSSES, "Bosses"); translationBuilder.add(ConventionalEntityTypeTags.MINECARTS, "Minecarts"); translationBuilder.add(ConventionalEntityTypeTags.BOATS, "Boats"); + translationBuilder.add(ConventionalEntityTypeTags.CAPTURING_NOT_SUPPORTED, "Capturing Not Supported"); // Fluids translationBuilder.add(ConventionalFluidTags.LAVA, "Lava"); diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java index c8b053b6be..104f34021f 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java @@ -48,6 +48,7 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { getOrCreateTagBuilder(ConventionalEntityTypeTags.BOATS) .add(EntityType.BOAT) .add(EntityType.CHEST_BOAT); + getOrCreateTagBuilder(ConventionalEntityTypeTags.CAPTURING_NOT_SUPPORTED); // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. // TODO: Remove backwards compat tag entries in 1.22 diff --git a/fabric-convention-tags-v1/src/generated/resources/assets/fabric-convention-tags-v1-datagen/lang/en_us.json b/fabric-convention-tags-v1/src/generated/resources/assets/fabric-convention-tags-v1-datagen/lang/en_us.json index d2f2217935..40e0468b6b 100644 --- a/fabric-convention-tags-v1/src/generated/resources/assets/fabric-convention-tags-v1-datagen/lang/en_us.json +++ b/fabric-convention-tags-v1/src/generated/resources/assets/fabric-convention-tags-v1-datagen/lang/en_us.json @@ -48,6 +48,7 @@ "tag.enchantment.common.weapon_damage_enhancement": "Weapon Damage Enhancements", "tag.entity_type.common.boats": "Boats", "tag.entity_type.common.bosses": "Bosses", + "tag.entity_type.common.capturing_not_supported": "Capturing Not Supported", "tag.entity_type.common.minecarts": "Minecarts", "tag.fluid.common.honey": "Honey", "tag.fluid.common.lava": "Lava", diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/capturing_not_supported.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/capturing_not_supported.json new file mode 100644 index 0000000000..5e8aecc986 --- /dev/null +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/capturing_not_supported.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": [] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java index 1db8af2ff3..fc91f7c6c4 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java +++ b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java @@ -35,6 +35,7 @@ private ConventionalEntityTypeTags() { public static final TagKey> BOSSES = register("bosses"); public static final TagKey> MINECARTS = register("minecarts"); public static final TagKey> BOATS = register("boats"); + public static final TagKey> CAPTURING_NOT_SUPPORTED = register("capturing_not_supported"); private static TagKey> register(String tagID) { return TagRegistration.ENTITY_TYPE_TAG_REGISTRATION.registerCommon(tagID); From c0e76ad3a26ee4913ef7ac81049dee3fa1ba0b89 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 10 Sep 2023 12:58:45 -0400 Subject: [PATCH 010/123] Fixed comment --- .../impl/tag/convention/client/ConventionLogWarnings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java b/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java index 5aa2be4490..bf3af2d94d 100644 --- a/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java +++ b/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java @@ -163,7 +163,7 @@ private static void setupLegacyTagWarning() { dynamicRegistries.streamAllRegistries().forEach(registryEntry -> { if (registryEntry.key().getValue().getNamespace().equals("minecraft")) { registryEntry.value().streamTags().forEach(tagKey -> { - // Grab tags under 'forge' namespace + // Grab tags under 'c' namespace if (tagKey.id().getNamespace().equals("c")) { legacyTags.add(tagKey); } From d54b39fbbacfce120e98c79d6bb0bfa956cae1af Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 10 Sep 2023 13:11:04 -0400 Subject: [PATCH 011/123] removed extra space for checkstyle --- .../api/tag/convention/v1/ConventionalEntityTypeTags.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java index fc91f7c6c4..ccc807c5d9 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java +++ b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java @@ -35,7 +35,7 @@ private ConventionalEntityTypeTags() { public static final TagKey> BOSSES = register("bosses"); public static final TagKey> MINECARTS = register("minecarts"); public static final TagKey> BOATS = register("boats"); - public static final TagKey> CAPTURING_NOT_SUPPORTED = register("capturing_not_supported"); + public static final TagKey> CAPTURING_NOT_SUPPORTED = register("capturing_not_supported"); private static TagKey> register(String tagID) { return TagRegistration.ENTITY_TYPE_TAG_REGISTRATION.registerCommon(tagID); From 22113e9c0a6175edeecbadfbc957be8a8f8f10ea Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 10 Sep 2023 14:43:15 -0400 Subject: [PATCH 012/123] Added missing wall banners to dyed tags --- .../datagen/generators/BlockTagGenerator.java | 32 ++--- .../datagen/generators/ItemTagGenerator.java | 113 +++++++++++++++--- .../common/tags/blocks/dyed_blocks/black.json | 1 + .../common/tags/blocks/dyed_blocks/blue.json | 1 + .../common/tags/blocks/dyed_blocks/brown.json | 1 + .../common/tags/blocks/dyed_blocks/cyan.json | 1 + .../common/tags/blocks/dyed_blocks/gray.json | 1 + .../common/tags/blocks/dyed_blocks/green.json | 1 + .../tags/blocks/dyed_blocks/light_blue.json | 1 + .../tags/blocks/dyed_blocks/light_gray.json | 1 + .../common/tags/blocks/dyed_blocks/lime.json | 1 + .../tags/blocks/dyed_blocks/magenta.json | 1 + .../tags/blocks/dyed_blocks/orange.json | 1 + .../common/tags/blocks/dyed_blocks/pink.json | 1 + .../tags/blocks/dyed_blocks/purple.json | 1 + .../common/tags/blocks/dyed_blocks/red.json | 1 + .../common/tags/blocks/dyed_blocks/white.json | 1 + .../tags/blocks/dyed_blocks/yellow.json | 1 + 18 files changed, 129 insertions(+), 32 deletions(-) diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java index 9744f04659..e7a172f0e6 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java @@ -212,97 +212,97 @@ private void generateDyedTags() { .add(Blocks.BLACK_BANNER).add(Blocks.BLACK_BED).add(Blocks.BLACK_CANDLE).add(Blocks.BLACK_CARPET) .add(Blocks.BLACK_CONCRETE).add(Blocks.BLACK_CONCRETE_POWDER).add(Blocks.BLACK_GLAZED_TERRACOTTA) .add(Blocks.BLACK_SHULKER_BOX).add(Blocks.BLACK_STAINED_GLASS).add(Blocks.BLACK_STAINED_GLASS_PANE) - .add(Blocks.BLACK_TERRACOTTA).add(Blocks.BLACK_WOOL); + .add(Blocks.BLACK_TERRACOTTA).add(Blocks.BLACK_WALL_BANNER).add(Blocks.BLACK_WOOL); getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS_BLUE) .add(Blocks.BLUE_BANNER).add(Blocks.BLUE_BED).add(Blocks.BLUE_CANDLE).add(Blocks.BLUE_CARPET) .add(Blocks.BLUE_CONCRETE).add(Blocks.BLUE_CONCRETE_POWDER).add(Blocks.BLUE_GLAZED_TERRACOTTA) .add(Blocks.BLUE_SHULKER_BOX).add(Blocks.BLUE_STAINED_GLASS).add(Blocks.BLUE_STAINED_GLASS_PANE) - .add(Blocks.BLUE_TERRACOTTA).add(Blocks.BLUE_WOOL); + .add(Blocks.BLUE_TERRACOTTA).add(Blocks.BLUE_WALL_BANNER).add(Blocks.BLUE_WOOL); getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS_BROWN) .add(Blocks.BROWN_BANNER).add(Blocks.BROWN_BED).add(Blocks.BROWN_CANDLE).add(Blocks.BROWN_CARPET) .add(Blocks.BROWN_CONCRETE).add(Blocks.BROWN_CONCRETE_POWDER).add(Blocks.BROWN_GLAZED_TERRACOTTA) .add(Blocks.BROWN_SHULKER_BOX).add(Blocks.BROWN_STAINED_GLASS).add(Blocks.BROWN_STAINED_GLASS_PANE) - .add(Blocks.BROWN_TERRACOTTA).add(Blocks.BROWN_WOOL); + .add(Blocks.BROWN_TERRACOTTA).add(Blocks.BROWN_WALL_BANNER).add(Blocks.BROWN_WOOL); getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS_CYAN) .add(Blocks.CYAN_BANNER).add(Blocks.CYAN_BED).add(Blocks.CYAN_CANDLE).add(Blocks.CYAN_CARPET) .add(Blocks.CYAN_CONCRETE).add(Blocks.CYAN_CONCRETE_POWDER).add(Blocks.CYAN_GLAZED_TERRACOTTA) .add(Blocks.CYAN_SHULKER_BOX).add(Blocks.CYAN_STAINED_GLASS).add(Blocks.CYAN_STAINED_GLASS_PANE) - .add(Blocks.CYAN_TERRACOTTA).add(Blocks.CYAN_WOOL); + .add(Blocks.CYAN_TERRACOTTA).add(Blocks.CYAN_WALL_BANNER).add(Blocks.CYAN_WOOL); getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS_GRAY) .add(Blocks.GRAY_BANNER).add(Blocks.GRAY_BED).add(Blocks.GRAY_CANDLE).add(Blocks.GRAY_CARPET) .add(Blocks.GRAY_CONCRETE).add(Blocks.GRAY_CONCRETE_POWDER).add(Blocks.GRAY_GLAZED_TERRACOTTA) .add(Blocks.GRAY_SHULKER_BOX).add(Blocks.GRAY_STAINED_GLASS).add(Blocks.GRAY_STAINED_GLASS_PANE) - .add(Blocks.GRAY_TERRACOTTA).add(Blocks.GRAY_WOOL); + .add(Blocks.GRAY_TERRACOTTA).add(Blocks.GRAY_WALL_BANNER).add(Blocks.GRAY_WOOL); getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS_GREEN) .add(Blocks.GREEN_BANNER).add(Blocks.GREEN_BED).add(Blocks.GREEN_CANDLE).add(Blocks.GREEN_CARPET) .add(Blocks.GREEN_CONCRETE).add(Blocks.GREEN_CONCRETE_POWDER).add(Blocks.GREEN_GLAZED_TERRACOTTA) .add(Blocks.GREEN_SHULKER_BOX).add(Blocks.GREEN_STAINED_GLASS).add(Blocks.GREEN_STAINED_GLASS_PANE) - .add(Blocks.GREEN_TERRACOTTA).add(Blocks.GREEN_WOOL); + .add(Blocks.GREEN_TERRACOTTA).add(Blocks.GREEN_WALL_BANNER).add(Blocks.GREEN_WOOL); getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS_LIGHT_BLUE) .add(Blocks.LIGHT_BLUE_BANNER).add(Blocks.LIGHT_BLUE_BED).add(Blocks.LIGHT_BLUE_CANDLE).add(Blocks.LIGHT_BLUE_CARPET) .add(Blocks.LIGHT_BLUE_CONCRETE).add(Blocks.LIGHT_BLUE_CONCRETE_POWDER).add(Blocks.LIGHT_BLUE_GLAZED_TERRACOTTA) .add(Blocks.LIGHT_BLUE_SHULKER_BOX).add(Blocks.LIGHT_BLUE_STAINED_GLASS).add(Blocks.LIGHT_BLUE_STAINED_GLASS_PANE) - .add(Blocks.LIGHT_BLUE_TERRACOTTA).add(Blocks.LIGHT_BLUE_WOOL); + .add(Blocks.LIGHT_BLUE_TERRACOTTA).add(Blocks.LIGHT_BLUE_WALL_BANNER).add(Blocks.LIGHT_BLUE_WOOL); getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS_LIGHT_GRAY) .add(Blocks.LIGHT_GRAY_BANNER).add(Blocks.LIGHT_GRAY_BED).add(Blocks.LIGHT_GRAY_CANDLE).add(Blocks.LIGHT_GRAY_CARPET) .add(Blocks.LIGHT_GRAY_CONCRETE).add(Blocks.LIGHT_GRAY_CONCRETE_POWDER).add(Blocks.LIGHT_GRAY_GLAZED_TERRACOTTA) .add(Blocks.LIGHT_GRAY_SHULKER_BOX).add(Blocks.LIGHT_GRAY_STAINED_GLASS).add(Blocks.LIGHT_GRAY_STAINED_GLASS_PANE) - .add(Blocks.LIGHT_GRAY_TERRACOTTA).add(Blocks.LIGHT_GRAY_WOOL); + .add(Blocks.LIGHT_GRAY_TERRACOTTA).add(Blocks.LIGHT_GRAY_WALL_BANNER).add(Blocks.LIGHT_GRAY_WOOL); getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS_LIME) .add(Blocks.LIME_BANNER).add(Blocks.LIME_BED).add(Blocks.LIME_CANDLE).add(Blocks.LIME_CARPET) .add(Blocks.LIME_CONCRETE).add(Blocks.LIME_CONCRETE_POWDER).add(Blocks.LIME_GLAZED_TERRACOTTA) .add(Blocks.LIME_SHULKER_BOX).add(Blocks.LIME_STAINED_GLASS).add(Blocks.LIME_STAINED_GLASS_PANE) - .add(Blocks.LIME_TERRACOTTA).add(Blocks.LIME_WOOL); + .add(Blocks.LIME_TERRACOTTA).add(Blocks.LIME_WALL_BANNER).add(Blocks.LIME_WOOL); getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS_MAGENTA) .add(Blocks.MAGENTA_BANNER).add(Blocks.MAGENTA_BED).add(Blocks.MAGENTA_CANDLE).add(Blocks.MAGENTA_CARPET) .add(Blocks.MAGENTA_CONCRETE).add(Blocks.MAGENTA_CONCRETE_POWDER).add(Blocks.MAGENTA_GLAZED_TERRACOTTA) .add(Blocks.MAGENTA_SHULKER_BOX).add(Blocks.MAGENTA_STAINED_GLASS).add(Blocks.MAGENTA_STAINED_GLASS_PANE) - .add(Blocks.MAGENTA_TERRACOTTA).add(Blocks.MAGENTA_WOOL); + .add(Blocks.MAGENTA_TERRACOTTA).add(Blocks.MAGENTA_WALL_BANNER).add(Blocks.MAGENTA_WOOL); getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS_ORANGE) .add(Blocks.ORANGE_BANNER).add(Blocks.ORANGE_BED).add(Blocks.ORANGE_CANDLE).add(Blocks.ORANGE_CARPET) .add(Blocks.ORANGE_CONCRETE).add(Blocks.ORANGE_CONCRETE_POWDER).add(Blocks.ORANGE_GLAZED_TERRACOTTA) .add(Blocks.ORANGE_SHULKER_BOX).add(Blocks.ORANGE_STAINED_GLASS).add(Blocks.ORANGE_STAINED_GLASS_PANE) - .add(Blocks.ORANGE_TERRACOTTA).add(Blocks.ORANGE_WOOL); + .add(Blocks.ORANGE_TERRACOTTA).add(Blocks.ORANGE_WALL_BANNER).add(Blocks.ORANGE_WOOL); getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS_PINK) .add(Blocks.PINK_BANNER).add(Blocks.PINK_BED).add(Blocks.PINK_CANDLE).add(Blocks.PINK_CARPET) .add(Blocks.PINK_CONCRETE).add(Blocks.PINK_CONCRETE_POWDER).add(Blocks.PINK_GLAZED_TERRACOTTA) .add(Blocks.PINK_SHULKER_BOX).add(Blocks.PINK_STAINED_GLASS).add(Blocks.PINK_STAINED_GLASS_PANE) - .add(Blocks.PINK_TERRACOTTA).add(Blocks.PINK_WOOL); + .add(Blocks.PINK_TERRACOTTA).add(Blocks.PINK_WALL_BANNER).add(Blocks.PINK_WOOL); getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS_PURPLE) .add(Blocks.PURPLE_BANNER).add(Blocks.PURPLE_BED).add(Blocks.PURPLE_CANDLE).add(Blocks.PURPLE_CARPET) .add(Blocks.PURPLE_CONCRETE).add(Blocks.PURPLE_CONCRETE_POWDER).add(Blocks.PURPLE_GLAZED_TERRACOTTA) .add(Blocks.PURPLE_SHULKER_BOX).add(Blocks.PURPLE_STAINED_GLASS).add(Blocks.PURPLE_STAINED_GLASS_PANE) - .add(Blocks.PURPLE_TERRACOTTA).add(Blocks.PURPLE_WOOL); + .add(Blocks.PURPLE_TERRACOTTA).add(Blocks.PURPLE_WALL_BANNER).add(Blocks.PURPLE_WOOL); getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS_RED) .add(Blocks.RED_BANNER).add(Blocks.RED_BED).add(Blocks.RED_CANDLE).add(Blocks.RED_CARPET) .add(Blocks.RED_CONCRETE).add(Blocks.RED_CONCRETE_POWDER).add(Blocks.RED_GLAZED_TERRACOTTA) .add(Blocks.RED_SHULKER_BOX).add(Blocks.RED_STAINED_GLASS).add(Blocks.RED_STAINED_GLASS_PANE) - .add(Blocks.RED_TERRACOTTA).add(Blocks.RED_WOOL); + .add(Blocks.RED_TERRACOTTA).add(Blocks.RED_WALL_BANNER).add(Blocks.RED_WOOL); getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS_WHITE) .add(Blocks.WHITE_BANNER).add(Blocks.WHITE_BED).add(Blocks.WHITE_CANDLE).add(Blocks.WHITE_CARPET) .add(Blocks.WHITE_CONCRETE).add(Blocks.WHITE_CONCRETE_POWDER).add(Blocks.WHITE_GLAZED_TERRACOTTA) .add(Blocks.WHITE_SHULKER_BOX).add(Blocks.WHITE_STAINED_GLASS).add(Blocks.WHITE_STAINED_GLASS_PANE) - .add(Blocks.WHITE_TERRACOTTA).add(Blocks.WHITE_WOOL); + .add(Blocks.WHITE_TERRACOTTA).add(Blocks.WHITE_WALL_BANNER).add(Blocks.WHITE_WOOL); getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS_YELLOW) .add(Blocks.YELLOW_BANNER).add(Blocks.YELLOW_BED).add(Blocks.YELLOW_CANDLE).add(Blocks.YELLOW_CARPET) .add(Blocks.YELLOW_CONCRETE).add(Blocks.YELLOW_CONCRETE_POWDER).add(Blocks.YELLOW_GLAZED_TERRACOTTA) .add(Blocks.YELLOW_SHULKER_BOX).add(Blocks.YELLOW_STAINED_GLASS).add(Blocks.YELLOW_STAINED_GLASS_PANE) - .add(Blocks.YELLOW_TERRACOTTA).add(Blocks.YELLOW_WOOL); + .add(Blocks.YELLOW_TERRACOTTA).add(Blocks.YELLOW_WALL_BANNER).add(Blocks.YELLOW_WOOL); getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS) .addTag(ConventionalBlockTags.DYED_BLOCKS_BLACK) diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index 2ca76d6a4b..38a29bb142 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -18,6 +18,7 @@ import java.util.concurrent.CompletableFuture; +import net.minecraft.block.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; import net.minecraft.item.Items; @@ -261,22 +262,102 @@ private void generateVillagerJobSites() { } private void generateDyedTags() { - copy(ConventionalBlockTags.DYED_BLOCKS_BLACK, ConventionalItemTags.DYED_ITEMS_BLACK); - copy(ConventionalBlockTags.DYED_BLOCKS_BLUE, ConventionalItemTags.DYED_ITEMS_BLUE); - copy(ConventionalBlockTags.DYED_BLOCKS_BROWN, ConventionalItemTags.DYED_ITEMS_BROWN); - copy(ConventionalBlockTags.DYED_BLOCKS_CYAN, ConventionalItemTags.DYED_ITEMS_CYAN); - copy(ConventionalBlockTags.DYED_BLOCKS_GRAY, ConventionalItemTags.DYED_ITEMS_GRAY); - copy(ConventionalBlockTags.DYED_BLOCKS_GREEN, ConventionalItemTags.DYED_ITEMS_GREEN); - copy(ConventionalBlockTags.DYED_BLOCKS_LIGHT_GRAY, ConventionalItemTags.DYED_ITEMS_LIGHT_GRAY); - copy(ConventionalBlockTags.DYED_BLOCKS_LIGHT_BLUE, ConventionalItemTags.DYED_ITEMS_LIGHT_BLUE); - copy(ConventionalBlockTags.DYED_BLOCKS_LIME, ConventionalItemTags.DYED_ITEMS_LIME); - copy(ConventionalBlockTags.DYED_BLOCKS_MAGENTA, ConventionalItemTags.DYED_ITEMS_MAGENTA); - copy(ConventionalBlockTags.DYED_BLOCKS_ORANGE, ConventionalItemTags.DYED_ITEMS_ORANGE); - copy(ConventionalBlockTags.DYED_BLOCKS_PINK, ConventionalItemTags.DYED_ITEMS_PINK); - copy(ConventionalBlockTags.DYED_BLOCKS_PURPLE, ConventionalItemTags.DYED_ITEMS_PURPLE); - copy(ConventionalBlockTags.DYED_BLOCKS_RED, ConventionalItemTags.DYED_ITEMS_RED); - copy(ConventionalBlockTags.DYED_BLOCKS_WHITE, ConventionalItemTags.DYED_ITEMS_WHITE); - copy(ConventionalBlockTags.DYED_BLOCKS_YELLOW, ConventionalItemTags.DYED_ITEMS_YELLOW); + // Cannot pull entries from block tag because Wall Banners do not have an item form + getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_BLACK) + .add(Items.BLACK_BANNER).add(Items.BLACK_BED).add(Items.BLACK_CANDLE).add(Items.BLACK_CARPET) + .add(Items.BLACK_CONCRETE).add(Items.BLACK_CONCRETE_POWDER).add(Items.BLACK_GLAZED_TERRACOTTA) + .add(Items.BLACK_SHULKER_BOX).add(Items.BLACK_STAINED_GLASS).add(Items.BLACK_STAINED_GLASS_PANE) + .add(Items.BLACK_TERRACOTTA).add(Items.BLACK_WOOL); + + getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_BLUE) + .add(Items.BLUE_BANNER).add(Items.BLUE_BED).add(Items.BLUE_CANDLE).add(Items.BLUE_CARPET) + .add(Items.BLUE_CONCRETE).add(Items.BLUE_CONCRETE_POWDER).add(Items.BLUE_GLAZED_TERRACOTTA) + .add(Items.BLUE_SHULKER_BOX).add(Items.BLUE_STAINED_GLASS).add(Items.BLUE_STAINED_GLASS_PANE) + .add(Items.BLUE_TERRACOTTA).add(Items.BLUE_WOOL); + + getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_BROWN) + .add(Items.BROWN_BANNER).add(Items.BROWN_BED).add(Items.BROWN_CANDLE).add(Items.BROWN_CARPET) + .add(Items.BROWN_CONCRETE).add(Items.BROWN_CONCRETE_POWDER).add(Items.BROWN_GLAZED_TERRACOTTA) + .add(Items.BROWN_SHULKER_BOX).add(Items.BROWN_STAINED_GLASS).add(Items.BROWN_STAINED_GLASS_PANE) + .add(Items.BROWN_TERRACOTTA).add(Items.BROWN_WOOL); + + getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_CYAN) + .add(Items.CYAN_BANNER).add(Items.CYAN_BED).add(Items.CYAN_CANDLE).add(Items.CYAN_CARPET) + .add(Items.CYAN_CONCRETE).add(Items.CYAN_CONCRETE_POWDER).add(Items.CYAN_GLAZED_TERRACOTTA) + .add(Items.CYAN_SHULKER_BOX).add(Items.CYAN_STAINED_GLASS).add(Items.CYAN_STAINED_GLASS_PANE) + .add(Items.CYAN_TERRACOTTA).add(Items.CYAN_WOOL); + + getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_GRAY) + .add(Items.GRAY_BANNER).add(Items.GRAY_BED).add(Items.GRAY_CANDLE).add(Items.GRAY_CARPET) + .add(Items.GRAY_CONCRETE).add(Items.GRAY_CONCRETE_POWDER).add(Items.GRAY_GLAZED_TERRACOTTA) + .add(Items.GRAY_SHULKER_BOX).add(Items.GRAY_STAINED_GLASS).add(Items.GRAY_STAINED_GLASS_PANE) + .add(Items.GRAY_TERRACOTTA).add(Items.GRAY_WOOL); + + getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_GREEN) + .add(Items.GREEN_BANNER).add(Items.GREEN_BED).add(Items.GREEN_CANDLE).add(Items.GREEN_CARPET) + .add(Items.GREEN_CONCRETE).add(Items.GREEN_CONCRETE_POWDER).add(Items.GREEN_GLAZED_TERRACOTTA) + .add(Items.GREEN_SHULKER_BOX).add(Items.GREEN_STAINED_GLASS).add(Items.GREEN_STAINED_GLASS_PANE) + .add(Items.GREEN_TERRACOTTA).add(Items.GREEN_WOOL); + + getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_LIGHT_BLUE) + .add(Items.LIGHT_BLUE_BANNER).add(Items.LIGHT_BLUE_BED).add(Items.LIGHT_BLUE_CANDLE).add(Items.LIGHT_BLUE_CARPET) + .add(Items.LIGHT_BLUE_CONCRETE).add(Items.LIGHT_BLUE_CONCRETE_POWDER).add(Items.LIGHT_BLUE_GLAZED_TERRACOTTA) + .add(Items.LIGHT_BLUE_SHULKER_BOX).add(Items.LIGHT_BLUE_STAINED_GLASS).add(Items.LIGHT_BLUE_STAINED_GLASS_PANE) + .add(Items.LIGHT_BLUE_TERRACOTTA).add(Items.LIGHT_BLUE_WOOL); + + getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_LIGHT_GRAY) + .add(Items.LIGHT_GRAY_BANNER).add(Items.LIGHT_GRAY_BED).add(Items.LIGHT_GRAY_CANDLE).add(Items.LIGHT_GRAY_CARPET) + .add(Items.LIGHT_GRAY_CONCRETE).add(Items.LIGHT_GRAY_CONCRETE_POWDER).add(Items.LIGHT_GRAY_GLAZED_TERRACOTTA) + .add(Items.LIGHT_GRAY_SHULKER_BOX).add(Items.LIGHT_GRAY_STAINED_GLASS).add(Items.LIGHT_GRAY_STAINED_GLASS_PANE) + .add(Items.LIGHT_GRAY_TERRACOTTA).add(Items.LIGHT_GRAY_WOOL); + + getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_LIME) + .add(Items.LIME_BANNER).add(Items.LIME_BED).add(Items.LIME_CANDLE).add(Items.LIME_CARPET) + .add(Items.LIME_CONCRETE).add(Items.LIME_CONCRETE_POWDER).add(Items.LIME_GLAZED_TERRACOTTA) + .add(Items.LIME_SHULKER_BOX).add(Items.LIME_STAINED_GLASS).add(Items.LIME_STAINED_GLASS_PANE) + .add(Items.LIME_TERRACOTTA).add(Items.LIME_WOOL); + + getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_MAGENTA) + .add(Items.MAGENTA_BANNER).add(Items.MAGENTA_BED).add(Items.MAGENTA_CANDLE).add(Items.MAGENTA_CARPET) + .add(Items.MAGENTA_CONCRETE).add(Items.MAGENTA_CONCRETE_POWDER).add(Items.MAGENTA_GLAZED_TERRACOTTA) + .add(Items.MAGENTA_SHULKER_BOX).add(Items.MAGENTA_STAINED_GLASS).add(Items.MAGENTA_STAINED_GLASS_PANE) + .add(Items.MAGENTA_TERRACOTTA).add(Items.MAGENTA_WOOL); + + getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_ORANGE) + .add(Items.ORANGE_BANNER).add(Items.ORANGE_BED).add(Items.ORANGE_CANDLE).add(Items.ORANGE_CARPET) + .add(Items.ORANGE_CONCRETE).add(Items.ORANGE_CONCRETE_POWDER).add(Items.ORANGE_GLAZED_TERRACOTTA) + .add(Items.ORANGE_SHULKER_BOX).add(Items.ORANGE_STAINED_GLASS).add(Items.ORANGE_STAINED_GLASS_PANE) + .add(Items.ORANGE_TERRACOTTA).add(Items.ORANGE_WOOL); + + getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_PINK) + .add(Items.PINK_BANNER).add(Items.PINK_BED).add(Items.PINK_CANDLE).add(Items.PINK_CARPET) + .add(Items.PINK_CONCRETE).add(Items.PINK_CONCRETE_POWDER).add(Items.PINK_GLAZED_TERRACOTTA) + .add(Items.PINK_SHULKER_BOX).add(Items.PINK_STAINED_GLASS).add(Items.PINK_STAINED_GLASS_PANE) + .add(Items.PINK_TERRACOTTA).add(Items.PINK_WOOL); + + getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_PURPLE) + .add(Items.PURPLE_BANNER).add(Items.PURPLE_BED).add(Items.PURPLE_CANDLE).add(Items.PURPLE_CARPET) + .add(Items.PURPLE_CONCRETE).add(Items.PURPLE_CONCRETE_POWDER).add(Items.PURPLE_GLAZED_TERRACOTTA) + .add(Items.PURPLE_SHULKER_BOX).add(Items.PURPLE_STAINED_GLASS).add(Items.PURPLE_STAINED_GLASS_PANE) + .add(Items.PURPLE_TERRACOTTA).add(Items.PURPLE_WOOL); + + getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_RED) + .add(Items.RED_BANNER).add(Items.RED_BED).add(Items.RED_CANDLE).add(Items.RED_CARPET) + .add(Items.RED_CONCRETE).add(Items.RED_CONCRETE_POWDER).add(Items.RED_GLAZED_TERRACOTTA) + .add(Items.RED_SHULKER_BOX).add(Items.RED_STAINED_GLASS).add(Items.RED_STAINED_GLASS_PANE) + .add(Items.RED_TERRACOTTA).add(Items.RED_WOOL); + + getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_WHITE) + .add(Items.WHITE_BANNER).add(Items.WHITE_BED).add(Items.WHITE_CANDLE).add(Items.WHITE_CARPET) + .add(Items.WHITE_CONCRETE).add(Items.WHITE_CONCRETE_POWDER).add(Items.WHITE_GLAZED_TERRACOTTA) + .add(Items.WHITE_SHULKER_BOX).add(Items.WHITE_STAINED_GLASS).add(Items.WHITE_STAINED_GLASS_PANE) + .add(Items.WHITE_TERRACOTTA).add(Items.WHITE_WOOL); + + getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_YELLOW) + .add(Items.YELLOW_BANNER).add(Items.YELLOW_BED).add(Items.YELLOW_CANDLE).add(Items.YELLOW_CARPET) + .add(Items.YELLOW_CONCRETE).add(Items.YELLOW_CONCRETE_POWDER).add(Items.YELLOW_GLAZED_TERRACOTTA) + .add(Items.YELLOW_SHULKER_BOX).add(Items.YELLOW_STAINED_GLASS).add(Items.YELLOW_STAINED_GLASS_PANE) + .add(Items.YELLOW_TERRACOTTA).add(Items.YELLOW_WOOL); getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS) .addTag(ConventionalItemTags.DYED_ITEMS_BLACK) diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/black.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/black.json index ebe31c9524..6b1a6c0a4e 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/black.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/black.json @@ -12,6 +12,7 @@ "minecraft:black_stained_glass", "minecraft:black_stained_glass_pane", "minecraft:black_terracotta", + "minecraft:black_wall_banner", "minecraft:black_wool" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/blue.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/blue.json index e3c6e2ca95..71b30e6154 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/blue.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/blue.json @@ -12,6 +12,7 @@ "minecraft:blue_stained_glass", "minecraft:blue_stained_glass_pane", "minecraft:blue_terracotta", + "minecraft:blue_wall_banner", "minecraft:blue_wool" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/brown.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/brown.json index d359c02cd1..de7a8661dd 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/brown.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/brown.json @@ -12,6 +12,7 @@ "minecraft:brown_stained_glass", "minecraft:brown_stained_glass_pane", "minecraft:brown_terracotta", + "minecraft:brown_wall_banner", "minecraft:brown_wool" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/cyan.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/cyan.json index 0fb94adcce..b869ee5b7a 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/cyan.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/cyan.json @@ -12,6 +12,7 @@ "minecraft:cyan_stained_glass", "minecraft:cyan_stained_glass_pane", "minecraft:cyan_terracotta", + "minecraft:cyan_wall_banner", "minecraft:cyan_wool" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/gray.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/gray.json index f93eeb0c38..e79bb7c9e0 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/gray.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/gray.json @@ -12,6 +12,7 @@ "minecraft:gray_stained_glass", "minecraft:gray_stained_glass_pane", "minecraft:gray_terracotta", + "minecraft:gray_wall_banner", "minecraft:gray_wool" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/green.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/green.json index 8b4261b21f..c4d0539a97 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/green.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/green.json @@ -12,6 +12,7 @@ "minecraft:green_stained_glass", "minecraft:green_stained_glass_pane", "minecraft:green_terracotta", + "minecraft:green_wall_banner", "minecraft:green_wool" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_blue.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_blue.json index 8bded9034a..5e5c8d17c8 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_blue.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_blue.json @@ -12,6 +12,7 @@ "minecraft:light_blue_stained_glass", "minecraft:light_blue_stained_glass_pane", "minecraft:light_blue_terracotta", + "minecraft:light_blue_wall_banner", "minecraft:light_blue_wool" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_gray.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_gray.json index 155b5fe129..0a976f6d5f 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_gray.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_gray.json @@ -12,6 +12,7 @@ "minecraft:light_gray_stained_glass", "minecraft:light_gray_stained_glass_pane", "minecraft:light_gray_terracotta", + "minecraft:light_gray_wall_banner", "minecraft:light_gray_wool" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/lime.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/lime.json index 6191433953..d700410b58 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/lime.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/lime.json @@ -12,6 +12,7 @@ "minecraft:lime_stained_glass", "minecraft:lime_stained_glass_pane", "minecraft:lime_terracotta", + "minecraft:lime_wall_banner", "minecraft:lime_wool" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/magenta.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/magenta.json index 3c0960b9aa..7936677411 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/magenta.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/magenta.json @@ -12,6 +12,7 @@ "minecraft:magenta_stained_glass", "minecraft:magenta_stained_glass_pane", "minecraft:magenta_terracotta", + "minecraft:magenta_wall_banner", "minecraft:magenta_wool" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/orange.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/orange.json index 6d443cdcda..b33bb42fc8 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/orange.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/orange.json @@ -12,6 +12,7 @@ "minecraft:orange_stained_glass", "minecraft:orange_stained_glass_pane", "minecraft:orange_terracotta", + "minecraft:orange_wall_banner", "minecraft:orange_wool" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/pink.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/pink.json index 9d6aa1d83e..693d91c275 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/pink.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/pink.json @@ -12,6 +12,7 @@ "minecraft:pink_stained_glass", "minecraft:pink_stained_glass_pane", "minecraft:pink_terracotta", + "minecraft:pink_wall_banner", "minecraft:pink_wool" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/purple.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/purple.json index 330f6e2f55..5df9b17e0b 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/purple.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/purple.json @@ -12,6 +12,7 @@ "minecraft:purple_stained_glass", "minecraft:purple_stained_glass_pane", "minecraft:purple_terracotta", + "minecraft:purple_wall_banner", "minecraft:purple_wool" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/red.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/red.json index 488a4ef6a6..5ed3480778 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/red.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/red.json @@ -12,6 +12,7 @@ "minecraft:red_stained_glass", "minecraft:red_stained_glass_pane", "minecraft:red_terracotta", + "minecraft:red_wall_banner", "minecraft:red_wool" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/white.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/white.json index b66e91b410..9e9707c73e 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/white.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/white.json @@ -12,6 +12,7 @@ "minecraft:white_stained_glass", "minecraft:white_stained_glass_pane", "minecraft:white_terracotta", + "minecraft:white_wall_banner", "minecraft:white_wool" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/yellow.json b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/yellow.json index 4a38b9a835..ca355c5867 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/yellow.json +++ b/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/yellow.json @@ -12,6 +12,7 @@ "minecraft:yellow_stained_glass", "minecraft:yellow_stained_glass_pane", "minecraft:yellow_terracotta", + "minecraft:yellow_wall_banner", "minecraft:yellow_wool" ] } \ No newline at end of file From f154377d94ee47423ebf26de5a26089722b2fa58 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 10 Sep 2023 14:56:39 -0400 Subject: [PATCH 013/123] Fix modded registries inputs for getTagTranslationKey --- .../datagen/generators/ItemTagGenerator.java | 1 - .../fabric/api/tag/convention/v1/TagUtil.java | 23 +++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index 38a29bb142..d8c08d4322 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -18,7 +18,6 @@ import java.util.concurrent.CompletableFuture; -import net.minecraft.block.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; import net.minecraft.item.Items; diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java index 75e70c3df1..ddaefd3237 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java +++ b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java @@ -21,6 +21,7 @@ import org.jetbrains.annotations.Nullable; +import net.minecraft.util.Identifier; import net.minecraft.registry.Registries; import net.minecraft.registry.tag.TagKey; import net.minecraft.registry.DynamicRegistryManager; @@ -87,9 +88,23 @@ public static boolean isIn(@Nullable DynamicRegistryManager registryManager, * @return the translation key for a TagKey. */ public static String getTagTranslationKey(TagKey tagKey) { - return "tag." - + tagKey.registry().getValue().getPath().replace("/", ".") - + "." - + tagKey.id().toString().replace("/", ".").replace(":", "."); + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append("tag."); + + Identifier registryIdentifier = tagKey.registry().getValue(); + Identifier tagIdentifier = tagKey.id(); + + if (registryIdentifier.getNamespace().equals("minecraft")) { + stringBuilder.append(registryIdentifier.getNamespace()) + .append("."); + } + + stringBuilder.append(registryIdentifier.getPath().replace("/", ".")) + .append(".") + .append(tagIdentifier.getNamespace()) + .append(".") + .append(tagIdentifier.getPath().replace("/", ".").replace(":", ".")); + + return stringBuilder.toString(); } } From 2c3ac14438d764d3bdba50b0da6e5406f8d1fbeb Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 10 Sep 2023 15:23:24 -0400 Subject: [PATCH 014/123] Changed field names to match yarn convention --- .../datagen/generators/BiomeTagGenerator.java | 66 ++-- .../datagen/generators/BlockTagGenerator.java | 130 +++---- .../generators/EnglishTagLangGenerator.java | 228 ++++++------- .../datagen/generators/ItemTagGenerator.java | 322 +++++++++--------- .../convention/v1/ConventionalBiomeTags.java | 34 +- .../convention/v1/ConventionalBlockTags.java | 56 +-- .../convention/v1/ConventionalItemTags.java | 146 ++++---- 7 files changed, 495 insertions(+), 487 deletions(-) diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java index b856510a8c..cb04a197f7 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java @@ -171,7 +171,7 @@ private void generateOtherBiomeTypes() { } private void generateClimateAndVegetationTags() { - getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD_OVERWORLD) + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_COLD) .add(BiomeKeys.SNOWY_PLAINS) .add(BiomeKeys.SNOWY_SLOPES) .add(BiomeKeys.GROVE) @@ -180,9 +180,9 @@ private void generateClimateAndVegetationTags() { .add(BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA).add(BiomeKeys.OLD_GROWTH_PINE_TAIGA) .addOptionalTag(ConventionalBiomeTags.IS_ICY); getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD) - .addTag(ConventionalBiomeTags.IS_COLD_OVERWORLD); + .addTag(ConventionalBiomeTags.OVERWORLD_IS_COLD); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD) + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_TEMPERATE) .add(BiomeKeys.FOREST) .add(BiomeKeys.SUNFLOWER_PLAINS) .add(BiomeKeys.SWAMP) @@ -194,9 +194,9 @@ private void generateClimateAndVegetationTags() { .add(BiomeKeys.MEADOW) .add(BiomeKeys.PLAINS); getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE) - .addTag(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD); + .addTag(ConventionalBiomeTags.OVERWORLD_IS_TEMPERATE); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT_OVERWORLD) + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_HOT) .addOptionalTag(ConventionalBiomeTags.IS_JUNGLE) .addOptionalTag(ConventionalBiomeTags.IS_SAVANNA) .addOptionalTag(ConventionalBiomeTags.IS_DESERT) @@ -205,49 +205,49 @@ private void generateClimateAndVegetationTags() { .addOptionalTag(ConventionalBiomeTags.IS_MUSHROOM) .addOptionalTag(ConventionalBiomeTags.IS_NETHER); getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT) - .addTag(ConventionalBiomeTags.IS_HOT_OVERWORLD); + .addTag(ConventionalBiomeTags.OVERWORLD_IS_HOT); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET_OVERWORLD) + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_WET) .addOptionalTag(ConventionalBiomeTags.IS_AQUATIC) .addOptionalTag(ConventionalBiomeTags.IS_SWAMP) .add(BiomeKeys.LUSH_CAVES) .addOptionalTag(ConventionalBiomeTags.IS_JUNGLE); getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET) - .addTag(ConventionalBiomeTags.IS_WET_OVERWORLD); + .addTag(ConventionalBiomeTags.OVERWORLD_IS_WET); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_DRY_OVERWORLD) + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_DRY) .addOptionalTag(ConventionalBiomeTags.IS_NETHER) .addOptionalTag(ConventionalBiomeTags.IS_BADLANDS) .addOptionalTag(ConventionalBiomeTags.IS_DESERT) .addOptionalTag(ConventionalBiomeTags.IS_SAVANNA); getOrCreateTagBuilder(ConventionalBiomeTags.IS_DRY) - .addTag(ConventionalBiomeTags.IS_DRY_OVERWORLD); + .addTag(ConventionalBiomeTags.OVERWORLD_IS_DRY); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD) + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_VEGETATION_DENSE) .addOptionalTag(ConventionalBiomeTags.IS_JUNGLE) .add(BiomeKeys.DARK_FOREST); getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE) - .addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD) + .addOptionalTag(ConventionalBiomeTags.OVERWORLD_IS_VEGETATION_DENSE); + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_VEGETATION_SPARSE) .addOptionalTag(ConventionalBiomeTags.IS_SAVANNA) .addOptionalTag(ConventionalBiomeTags.IS_DESERT) .addOptionalTag(ConventionalBiomeTags.IS_DEAD) .addOptionalTag(ConventionalBiomeTags.IS_WASTELAND); getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE) - .addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_TREE_CONIFEROUS) + .addOptionalTag(ConventionalBiomeTags.OVERWORLD_IS_VEGETATION_SPARSE); + getOrCreateTagBuilder(ConventionalBiomeTags.CONIFEROUS_IS_TREE) .add(BiomeKeys.GROVE) .addOptionalTag(ConventionalBiomeTags.IS_TAIGA); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_TREE_DECIDUOUS) + getOrCreateTagBuilder(ConventionalBiomeTags.DECIDUOUS_IS_TREE) .add(BiomeKeys.FOREST) .add(BiomeKeys.WINDSWEPT_FOREST) .add(BiomeKeys.FLOWER_FOREST) .add(BiomeKeys.BIRCH_FOREST) .add(BiomeKeys.DARK_FOREST) .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_TREE_JUNGLE) + getOrCreateTagBuilder(ConventionalBiomeTags.JUNGLE_IS_TREE) .addOptionalTag(ConventionalBiomeTags.IS_JUNGLE); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_TREE_SAVANNA) + getOrCreateTagBuilder(ConventionalBiomeTags.SAVANNA_IS_TREE) .addOptionalTag(ConventionalBiomeTags.IS_SAVANNA); getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLORAL) .add(BiomeKeys.SUNFLOWER_PLAINS) @@ -257,11 +257,11 @@ private void generateClimateAndVegetationTags() { } private void generateTerrainDescriptorTags() { - getOrCreateTagBuilder(ConventionalBiomeTags.IS_MOUNTAIN_PEAK) + getOrCreateTagBuilder(ConventionalBiomeTags.PEAK_IS_MOUNTAIN) .add(BiomeKeys.FROZEN_PEAKS) .add(BiomeKeys.JAGGED_PEAKS) .add(BiomeKeys.STONY_PEAKS); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_MOUNTAIN_SLOPE) + getOrCreateTagBuilder(ConventionalBiomeTags.SLOPE_IS_MOUNTAIN) .add(BiomeKeys.SNOWY_SLOPES); getOrCreateTagBuilder(ConventionalBiomeTags.IS_AQUATIC) .addOptionalTag(ConventionalBiomeTags.IS_OCEAN) @@ -312,20 +312,20 @@ private void generateBackwardsCompatTags() { getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_VOID); getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_DEEP_OCEAN); getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_SHALLOW_OCEAN); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD_OVERWORLD).addOptionalTag(new Identifier("c", "climate_cold")); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD).addOptionalTag(new Identifier("c", "climate_temperate")); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT_OVERWORLD).addOptionalTag(new Identifier("c", "climate_hot")); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET_OVERWORLD).addOptionalTag(new Identifier("c", "climate_wet")); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_DRY_OVERWORLD).addOptionalTag(new Identifier("c", "climate_dry")); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD).addOptionalTag(new Identifier("c", "vegetation_dense")); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD).addOptionalTag(new Identifier("c", "vegetation_sparse")); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_TREE_CONIFEROUS).addOptionalTag(new Identifier("c", "tree_coniferous")); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_TREE_DECIDUOUS).addOptionalTag(new Identifier("c", "tree_deciduous")); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_TREE_JUNGLE).addOptionalTag(new Identifier("c", "tree_jungle")); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_TREE_SAVANNA).addOptionalTag(new Identifier("c", "tree_savanna")); + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_COLD).addOptionalTag(new Identifier("c", "climate_cold")); + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_TEMPERATE).addOptionalTag(new Identifier("c", "climate_temperate")); + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_HOT).addOptionalTag(new Identifier("c", "climate_hot")); + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_WET).addOptionalTag(new Identifier("c", "climate_wet")); + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_DRY).addOptionalTag(new Identifier("c", "climate_dry")); + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_VEGETATION_DENSE).addOptionalTag(new Identifier("c", "vegetation_dense")); + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_VEGETATION_SPARSE).addOptionalTag(new Identifier("c", "vegetation_sparse")); + getOrCreateTagBuilder(ConventionalBiomeTags.CONIFEROUS_IS_TREE).addOptionalTag(new Identifier("c", "tree_coniferous")); + getOrCreateTagBuilder(ConventionalBiomeTags.DECIDUOUS_IS_TREE).addOptionalTag(new Identifier("c", "tree_deciduous")); + getOrCreateTagBuilder(ConventionalBiomeTags.JUNGLE_IS_TREE).addOptionalTag(new Identifier("c", "tree_jungle")); + getOrCreateTagBuilder(ConventionalBiomeTags.SAVANNA_IS_TREE).addOptionalTag(new Identifier("c", "tree_savanna")); getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_FLORAL); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_MOUNTAIN_PEAK).addOptionalTag(new Identifier("c", "mountain_peak")); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_MOUNTAIN_SLOPE).addOptionalTag(new Identifier("c", "mountain_slope")); + getOrCreateTagBuilder(ConventionalBiomeTags.PEAK_IS_MOUNTAIN).addOptionalTag(new Identifier("c", "mountain_peak")); + getOrCreateTagBuilder(ConventionalBiomeTags.SLOPE_IS_MOUNTAIN).addOptionalTag(new Identifier("c", "mountain_slope")); getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_AQUATIC); getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_DEAD); getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_WASTELAND); diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java index e7a172f0e6..b25a987c6f 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java @@ -56,9 +56,9 @@ public BlockTagGenerator(FabricDataOutput output, CompletableFuture tag) { diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 6db58df49e..70deffb92c 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -35,10 +35,10 @@ public EnglishTagLangGenerator(FabricDataOutput output) { public void generateTranslations(FabricLanguageProvider.TranslationBuilder translationBuilder) { // Blocks translationBuilder.add(ConventionalBlockTags.ORES, "Ores"); - translationBuilder.add(ConventionalBlockTags.ORES_QUARTZ, "Quartz Ores"); - translationBuilder.add(ConventionalBlockTags.ORES_NETHERITE_SCRAP, "Netherite Scrapes Ores"); + translationBuilder.add(ConventionalBlockTags.QUARTZ_ORES, "Quartz Ores"); + translationBuilder.add(ConventionalBlockTags.NETHERITE_SCRAP_ORES, "Netherite Scrapes Ores"); translationBuilder.add(ConventionalBlockTags.BARRELS, "Barrels"); - translationBuilder.add(ConventionalBlockTags.BARRELS_WOODEN, "Barrels Wooden"); + translationBuilder.add(ConventionalBlockTags.WOODEN_BARRELS, "Barrels Wooden"); translationBuilder.add(ConventionalBlockTags.BOOKSHELVES, "Bookshelves"); translationBuilder.add(ConventionalBlockTags.CHESTS, "Chests"); translationBuilder.add(ConventionalBlockTags.GLASS_BLOCKS, "Glass Blocks"); @@ -48,32 +48,32 @@ public void generateTranslations(FabricLanguageProvider.TranslationBuilder trans translationBuilder.add(ConventionalBlockTags.BUDS, "Buds"); translationBuilder.add(ConventionalBlockTags.CLUSTERS, "Clusters"); translationBuilder.add(ConventionalBlockTags.VILLAGER_JOB_SITES, "Villager Job Sites"); - translationBuilder.add(ConventionalBlockTags.SANDSTONE_BLOCKS, "Sandstone Blocks"); - translationBuilder.add(ConventionalBlockTags.SANDSTONE_SLABS, "Sandstone Slabs"); - translationBuilder.add(ConventionalBlockTags.SANDSTONE_STAIRS, "Sandstone Stairs"); - translationBuilder.add(ConventionalBlockTags.SANDSTONE_RED_BLOCKS, "Red Sandstone Blocks"); - translationBuilder.add(ConventionalBlockTags.SANDSTONE_RED_SLABS, "Red Sandstone Slabs"); - translationBuilder.add(ConventionalBlockTags.SANDSTONE_RED_STAIRS, "Red Sandstone Stairs"); - translationBuilder.add(ConventionalBlockTags.SANDSTONE_UNCOLORED_BLOCKS, "Uncolored Sandstone Blocks"); - translationBuilder.add(ConventionalBlockTags.SANDSTONE_UNCOLORED_SLABS, "Uncolored Sandstone Slabs"); - translationBuilder.add(ConventionalBlockTags.SANDSTONE_UNCOLORED_STAIRS, "Uncolored Sandstone Stairs"); + translationBuilder.add(ConventionalBlockTags.BLOCKS_SANDSTONE, "Sandstone Blocks"); + translationBuilder.add(ConventionalBlockTags.SLABS_SANDSTONE, "Sandstone Slabs"); + translationBuilder.add(ConventionalBlockTags.STAIRS_SANDSTONE, "Sandstone Stairs"); + translationBuilder.add(ConventionalBlockTags.RED_BLOCKS_SANDSTONE, "Red Sandstone Blocks"); + translationBuilder.add(ConventionalBlockTags.RED_SLABS_SANDSTONE, "Red Sandstone Slabs"); + translationBuilder.add(ConventionalBlockTags.RED_STAIRS_SANDSTONE, "Red Sandstone Stairs"); + translationBuilder.add(ConventionalBlockTags.UNCOLORED_BLOCKS_SANDSTONE, "Uncolored Sandstone Blocks"); + translationBuilder.add(ConventionalBlockTags.UNCOLORED_SLABS_SANDSTONE, "Uncolored Sandstone Slabs"); + translationBuilder.add(ConventionalBlockTags.UNCOLORED_STAIRS_SANDSTONE, "Uncolored Sandstone Stairs"); translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS, "Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_BLACK, "Black Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_BLUE, "Blue Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_BROWN, "Brown Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_CYAN, "Cyan Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_GRAY, "Gray Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_GREEN, "Green Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_LIGHT_BLUE, "Light Blue Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_LIGHT_GRAY, "Light Gray Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_LIME, "Lime Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_MAGENTA, "Magenta Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_ORANGE, "Orange Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_PINK, "Pink Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_PURPLE, "Purple Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_RED, "Red Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_WHITE, "White Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS_YELLOW, "Yellow Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.BLACK_DYED_BLOCKS, "Black Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.BLUE_DYED_BLOCKS, "Blue Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.BROWN_DYED_BLOCKS, "Brown Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.CYAN_DYED_BLOCKS, "Cyan Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.GRAY_DYED_BLOCKS, "Gray Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.GREEN_DYED_BLOCKS, "Green Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.LIGHT_BLUE_DYED_BLOCKS, "Light Blue Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.LIGHT_GRAY_DYED_BLOCKS, "Light Gray Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.LIME_DYED_BLOCKS, "Lime Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.MAGENTA_DYED_BLOCKS, "Magenta Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.ORANGE_DYED_BLOCKS, "Orange Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.PINK_DYED_BLOCKS, "Pink Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.PURPLE_DYED_BLOCKS, "Purple Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.RED_DYED_BLOCKS, "Red Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.WHITE_DYED_BLOCKS, "White Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.YELLOW_DYED_BLOCKS, "Yellow Dyed Blocks"); translationBuilder.add(ConventionalBlockTags.RELOCATION_NOT_SUPPORTED, "Relocation Not Supported"); // Block Entity Types @@ -81,12 +81,12 @@ public void generateTranslations(FabricLanguageProvider.TranslationBuilder trans // Items translationBuilder.add(ConventionalItemTags.TOOLS, "Tools"); - translationBuilder.add(ConventionalItemTags.TOOLS_SHEARS, "Shears"); - translationBuilder.add(ConventionalItemTags.TOOLS_SPEARS, "Spears"); - translationBuilder.add(ConventionalItemTags.TOOLS_BOWS, "Bows"); - translationBuilder.add(ConventionalItemTags.TOOLS_CROSSBOWS, "Crossbows"); - translationBuilder.add(ConventionalItemTags.TOOLS_SHIELDS, "Shields"); - translationBuilder.add(ConventionalItemTags.TOOLS_FISHING_RODS, "Fishing Rods"); + translationBuilder.add(ConventionalItemTags.SHEARS_TOOLS, "Shears"); + translationBuilder.add(ConventionalItemTags.SPEARS_TOOLS, "Spears"); + translationBuilder.add(ConventionalItemTags.BOWS_TOOLS, "Bows"); + translationBuilder.add(ConventionalItemTags.CROSSBOWS_TOOLS, "Crossbows"); + translationBuilder.add(ConventionalItemTags.SHIELDS_TOOLS, "Shields"); + translationBuilder.add(ConventionalItemTags.FISHING_RODS_TOOLS, "Fishing Rods"); translationBuilder.add(ConventionalItemTags.DUSTS, "Dusts"); translationBuilder.add(ConventionalItemTags.GEMS, "Gems"); translationBuilder.add(ConventionalItemTags.INGOTS, "Ingots"); @@ -94,36 +94,36 @@ public void generateTranslations(FabricLanguageProvider.TranslationBuilder trans translationBuilder.add(ConventionalItemTags.ORES, "Ores"); translationBuilder.add(ConventionalItemTags.RAW_MATERIALS, "Raw Materials"); translationBuilder.add(ConventionalItemTags.RAW_BLOCKS, "Raw Blocks"); - translationBuilder.add(ConventionalItemTags.RAW_MATERIALS_IRON, "Raw Materials Iron"); - translationBuilder.add(ConventionalItemTags.RAW_MATERIALS_GOLD, "Raw Materials Gold"); - translationBuilder.add(ConventionalItemTags.RAW_MATERIALS_COPPER, "Raw Materials Copper"); - translationBuilder.add(ConventionalItemTags.RAW_BLOCKS_IRON, "Raw Blocks Iron"); - translationBuilder.add(ConventionalItemTags.RAW_BLOCKS_GOLD, "Raw Blocks Gold"); - translationBuilder.add(ConventionalItemTags.RAW_BLOCKS_COPPER, "Raw Blocks Copper"); - translationBuilder.add(ConventionalItemTags.INGOTS_IRON, "Ingots Iron"); - translationBuilder.add(ConventionalItemTags.INGOTS_GOLD, "Ingots Gold"); - translationBuilder.add(ConventionalItemTags.INGOTS_COPPER, "Ingots Copper"); - translationBuilder.add(ConventionalItemTags.INGOTS_NETHERITE, "Ingots Netherite"); - translationBuilder.add(ConventionalItemTags.ORES_NETHERITE_SCRAP, "Netherite Scrap Ores"); - translationBuilder.add(ConventionalItemTags.ORES_QUARTZ, "Quartz Ores"); - translationBuilder.add(ConventionalItemTags.GEMS_QUARTZ, "Quartz Gems"); - translationBuilder.add(ConventionalItemTags.GEMS_LAPIS, "Lapis Gems"); - translationBuilder.add(ConventionalItemTags.GEMS_DIAMOND, "Diamond Gems"); - translationBuilder.add(ConventionalItemTags.GEMS_AMETHYST, "Amethyst Gems"); - translationBuilder.add(ConventionalItemTags.GEMS_EMERALD, "Emerald Gems"); - translationBuilder.add(ConventionalItemTags.GEMS_PRISMARINE, "Prismarine Gems"); - translationBuilder.add(ConventionalItemTags.DUSTS_REDSTONE, "Redstone Dusts"); - translationBuilder.add(ConventionalItemTags.DUSTS_GLOWSTONE, "Glowstone Dusts"); + translationBuilder.add(ConventionalItemTags.IRON_RAW_MATERIALS, "Raw Materials Iron"); + translationBuilder.add(ConventionalItemTags.GOLD_RAW_MATERIALS, "Raw Materials Gold"); + translationBuilder.add(ConventionalItemTags.COPPER_RAW_MATERIALS, "Raw Materials Copper"); + translationBuilder.add(ConventionalItemTags.IRON_RAW_BLOCKS, "Raw Blocks Iron"); + translationBuilder.add(ConventionalItemTags.GOLD_RAW_BLOCKS, "Raw Blocks Gold"); + translationBuilder.add(ConventionalItemTags.COPPER_RAW_BLOCKS, "Raw Blocks Copper"); + translationBuilder.add(ConventionalItemTags.IRON_INGOTS, "Ingots Iron"); + translationBuilder.add(ConventionalItemTags.GOLD_INGOTS, "Ingots Gold"); + translationBuilder.add(ConventionalItemTags.COPPER_INGOTS, "Ingots Copper"); + translationBuilder.add(ConventionalItemTags.NETHERITE_INGOTS, "Ingots Netherite"); + translationBuilder.add(ConventionalItemTags.NETHERITE_SCRAP_ORES, "Netherite Scrap Ores"); + translationBuilder.add(ConventionalItemTags.QUARTZ_ORES, "Quartz Ores"); + translationBuilder.add(ConventionalItemTags.QUARTZ_GEMS, "Quartz Gems"); + translationBuilder.add(ConventionalItemTags.LAPIS_GEMS, "Lapis Gems"); + translationBuilder.add(ConventionalItemTags.DIAMOND_GEMS, "Diamond Gems"); + translationBuilder.add(ConventionalItemTags.AMETHYST_GEMS, "Amethyst Gems"); + translationBuilder.add(ConventionalItemTags.EMERALD_GEMS, "Emerald Gems"); + translationBuilder.add(ConventionalItemTags.PRISMARINE_GEMS, "Prismarine Gems"); + translationBuilder.add(ConventionalItemTags.REDSTONE_DUSTS, "Redstone Dusts"); + translationBuilder.add(ConventionalItemTags.GLOWSTONE_DUSTS, "Glowstone Dusts"); translationBuilder.add(ConventionalItemTags.COAL, "Coal"); translationBuilder.add(ConventionalItemTags.FOODS, "Foods"); translationBuilder.add(ConventionalItemTags.POTIONS, "Potions"); - translationBuilder.add(ConventionalItemTags.BUCKETS_WATER, "Water Buckets"); - translationBuilder.add(ConventionalItemTags.BUCKETS_ENTITY_WATER, "Entity Water Buckets"); - translationBuilder.add(ConventionalItemTags.BUCKETS_LAVA, "Lava Buckets"); - translationBuilder.add(ConventionalItemTags.BUCKETS_MILK, "Milk Buckets"); - translationBuilder.add(ConventionalItemTags.BUCKETS_EMPTY, "Empty Buckets"); + translationBuilder.add(ConventionalItemTags.WATER_BUCKETS, "Water Buckets"); + translationBuilder.add(ConventionalItemTags.ENTITY_WATER_BUCKETS, "Entity Water Buckets"); + translationBuilder.add(ConventionalItemTags.LAVA_BUCKETS, "Lava Buckets"); + translationBuilder.add(ConventionalItemTags.MILK_BUCKETS, "Milk Buckets"); + translationBuilder.add(ConventionalItemTags.EMPTY_BUCKETS, "Empty Buckets"); translationBuilder.add(ConventionalItemTags.BARRELS, "Barrels"); - translationBuilder.add(ConventionalItemTags.BARRELS_WOODEN, "Wooden Barrels"); + translationBuilder.add(ConventionalItemTags.WOODEN_BARRELS, "Wooden Barrels"); translationBuilder.add(ConventionalItemTags.BOOKSHELVES, "Bookshelves"); translationBuilder.add(ConventionalItemTags.CHESTS, "Chests"); translationBuilder.add(ConventionalItemTags.GLASS_BLOCKS, "Glass Blocks"); @@ -133,49 +133,49 @@ public void generateTranslations(FabricLanguageProvider.TranslationBuilder trans translationBuilder.add(ConventionalItemTags.BUDS, "Buds"); translationBuilder.add(ConventionalItemTags.CLUSTERS, "Clusters"); translationBuilder.add(ConventionalItemTags.VILLAGER_JOB_SITES, "Villager Job Sites"); - translationBuilder.add(ConventionalItemTags.SANDSTONE_BLOCKS, "Sandstone Blocks"); - translationBuilder.add(ConventionalItemTags.SANDSTONE_SLABS, "Sandstone Slabs"); - translationBuilder.add(ConventionalItemTags.SANDSTONE_STAIRS, "Sandstone Stairs"); - translationBuilder.add(ConventionalItemTags.SANDSTONE_RED_BLOCKS, "Red Sandstone Blocks"); - translationBuilder.add(ConventionalItemTags.SANDSTONE_RED_SLABS, "Red Sandstone Slabs"); - translationBuilder.add(ConventionalItemTags.SANDSTONE_RED_STAIRS, "Red Sandstone Stairs"); - translationBuilder.add(ConventionalItemTags.SANDSTONE_UNCOLORED_BLOCKS, "Uncolored Sandstone Blocks"); - translationBuilder.add(ConventionalItemTags.SANDSTONE_UNCOLORED_SLABS, "Uncolored Sandstone Slabs"); - translationBuilder.add(ConventionalItemTags.SANDSTONE_UNCOLORED_STAIRS, "Uncolored Sandstone Stairs"); + translationBuilder.add(ConventionalItemTags.BLOCKS_SANDSTONE, "Sandstone Blocks"); + translationBuilder.add(ConventionalItemTags.SLABS_SANDSTONE, "Sandstone Slabs"); + translationBuilder.add(ConventionalItemTags.STAIRS_SANDSTONE, "Sandstone Stairs"); + translationBuilder.add(ConventionalItemTags.RED_BLOCKS_SANDSTONE, "Red Sandstone Blocks"); + translationBuilder.add(ConventionalItemTags.RED_SLABS_SANDSTONE, "Red Sandstone Slabs"); + translationBuilder.add(ConventionalItemTags.RED_STAIRS_SANDSTONE, "Red Sandstone Stairs"); + translationBuilder.add(ConventionalItemTags.UNCOLORED_BLOCKS_SANDSTONE, "Uncolored Sandstone Blocks"); + translationBuilder.add(ConventionalItemTags.UNCOLORED_SLABS_SANDSTONE, "Uncolored Sandstone Slabs"); + translationBuilder.add(ConventionalItemTags.UNCOLORED_STAIRS_SANDSTONE, "Uncolored Sandstone Stairs"); translationBuilder.add(ConventionalItemTags.DYES, "Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_BLACK, "Black Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_BLUE, "Blue Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_BROWN, "Brown Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_CYAN, "Cyan Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_GRAY, "Gray Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_GREEN, "Green Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_LIGHT_BLUE, "Light Blue Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_LIGHT_GRAY, "Light Gray Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_LIME, "Lime Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_MAGENTA, "Magenta Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_ORANGE, "Orange Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_PINK, "Pink Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_PURPLE, "Purple Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_RED, "Red Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_WHITE, "White Dyes"); - translationBuilder.add(ConventionalItemTags.DYES_YELLOW, "Yellow Dyes"); + translationBuilder.add(ConventionalItemTags.BLACK_DYES, "Black Dyes"); + translationBuilder.add(ConventionalItemTags.BLUE_DYES, "Blue Dyes"); + translationBuilder.add(ConventionalItemTags.BROWN_DYES, "Brown Dyes"); + translationBuilder.add(ConventionalItemTags.CYAN_DYES, "Cyan Dyes"); + translationBuilder.add(ConventionalItemTags.GRAY_DYES, "Gray Dyes"); + translationBuilder.add(ConventionalItemTags.GREEN_DYES, "Green Dyes"); + translationBuilder.add(ConventionalItemTags.LIGHT_BLUE_DYES, "Light Blue Dyes"); + translationBuilder.add(ConventionalItemTags.LIGHT_GRAY_DYES, "Light Gray Dyes"); + translationBuilder.add(ConventionalItemTags.LIME_DYES, "Lime Dyes"); + translationBuilder.add(ConventionalItemTags.MAGENTA_DYES, "Magenta Dyes"); + translationBuilder.add(ConventionalItemTags.ORANGE_DYES, "Orange Dyes"); + translationBuilder.add(ConventionalItemTags.PINK_DYES, "Pink Dyes"); + translationBuilder.add(ConventionalItemTags.PURPLE_DYES, "Purple Dyes"); + translationBuilder.add(ConventionalItemTags.RED_DYES, "Red Dyes"); + translationBuilder.add(ConventionalItemTags.WHITE_DYES, "White Dyes"); + translationBuilder.add(ConventionalItemTags.YELLOW_DYES, "Yellow Dyes"); translationBuilder.add(ConventionalItemTags.DYED_ITEMS, "Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_BLACK, "Black Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_BLUE, "Blue Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_BROWN, "Brown Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_CYAN, "Cyan Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_GRAY, "Gray Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_GREEN, "Green Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_LIGHT_BLUE, "Light Blue Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_LIGHT_GRAY, "Light Gray Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_LIME, "Lime Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_MAGENTA, "Magenta Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_ORANGE, "Orange Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_PINK, "Pink Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_PURPLE, "Purple Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_RED, "Red Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_WHITE, "White Dyed Items"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS_YELLOW, "Yellow Dyed Items"); + translationBuilder.add(ConventionalItemTags.BLACK_DYED_ITEMS, "Black Dyed Items"); + translationBuilder.add(ConventionalItemTags.BLUE_DYED_ITEMS, "Blue Dyed Items"); + translationBuilder.add(ConventionalItemTags.BROWN_DYED_ITEMS, "Brown Dyed Items"); + translationBuilder.add(ConventionalItemTags.CYAN_DYED_ITEMS, "Cyan Dyed Items"); + translationBuilder.add(ConventionalItemTags.GRAY_DYED_ITEMS, "Gray Dyed Items"); + translationBuilder.add(ConventionalItemTags.GREEN_DYED_ITEMS, "Green Dyed Items"); + translationBuilder.add(ConventionalItemTags.LIGHT_BLUE_DYED_ITEMS, "Light Blue Dyed Items"); + translationBuilder.add(ConventionalItemTags.LIGHT_GRAY_DYED_ITEMS, "Light Gray Dyed Items"); + translationBuilder.add(ConventionalItemTags.LIME_DYED_ITEMS, "Lime Dyed Items"); + translationBuilder.add(ConventionalItemTags.MAGENTA_DYED_ITEMS, "Magenta Dyed Items"); + translationBuilder.add(ConventionalItemTags.ORANGE_DYED_ITEMS, "Orange Dyed Items"); + translationBuilder.add(ConventionalItemTags.PINK_DYED_ITEMS, "Pink Dyed Items"); + translationBuilder.add(ConventionalItemTags.PURPLE_DYED_ITEMS, "Purple Dyed Items"); + translationBuilder.add(ConventionalItemTags.RED_DYED_ITEMS, "Red Dyed Items"); + translationBuilder.add(ConventionalItemTags.WHITE_DYED_ITEMS, "White Dyed Items"); + translationBuilder.add(ConventionalItemTags.YELLOW_DYED_ITEMS, "Yellow Dyed Items"); // Enchantments translationBuilder.add(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS, "Increases Block Drops"); @@ -218,27 +218,27 @@ public void generateTranslations(FabricLanguageProvider.TranslationBuilder trans translationBuilder.add(ConventionalBiomeTags.IS_MUSHROOM, "Mushroom"); translationBuilder.add(ConventionalBiomeTags.IS_UNDERGROUND, "Underground"); translationBuilder.add(ConventionalBiomeTags.IS_MOUNTAIN, "Mountain"); - translationBuilder.add(ConventionalBiomeTags.IS_HOT_OVERWORLD, "Hot Overworld"); + translationBuilder.add(ConventionalBiomeTags.OVERWORLD_IS_HOT, "Hot Overworld"); translationBuilder.add(ConventionalBiomeTags.IS_HOT, "Hot"); - translationBuilder.add(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD, "Temperate Overworld"); + translationBuilder.add(ConventionalBiomeTags.OVERWORLD_IS_TEMPERATE, "Temperate Overworld"); translationBuilder.add(ConventionalBiomeTags.IS_TEMPERATE, "Temperate"); - translationBuilder.add(ConventionalBiomeTags.IS_COLD_OVERWORLD, "Cold Overworld"); + translationBuilder.add(ConventionalBiomeTags.OVERWORLD_IS_COLD, "Cold Overworld"); translationBuilder.add(ConventionalBiomeTags.IS_COLD, "Cold"); - translationBuilder.add(ConventionalBiomeTags.IS_WET_OVERWORLD, "Wet Overworld"); + translationBuilder.add(ConventionalBiomeTags.OVERWORLD_IS_WET, "Wet Overworld"); translationBuilder.add(ConventionalBiomeTags.IS_WET, "Wet"); - translationBuilder.add(ConventionalBiomeTags.IS_DRY_OVERWORLD, "Dry Overworld"); + translationBuilder.add(ConventionalBiomeTags.OVERWORLD_IS_DRY, "Dry Overworld"); translationBuilder.add(ConventionalBiomeTags.IS_DRY, "Dry"); translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_SPARSE, "Sparse Vegetation"); - translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD, "Sparse Overworld Vegetation"); + translationBuilder.add(ConventionalBiomeTags.OVERWORLD_IS_VEGETATION_SPARSE, "Sparse Overworld Vegetation"); translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_DENSE, "Dense Vegetation"); - translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD, "Dense Overworld Vegetation"); - translationBuilder.add(ConventionalBiomeTags.IS_TREE_CONIFEROUS, "Coniferous Tree"); - translationBuilder.add(ConventionalBiomeTags.IS_TREE_SAVANNA, "Savanna Tree"); - translationBuilder.add(ConventionalBiomeTags.IS_TREE_JUNGLE, "Jungle Tree"); - translationBuilder.add(ConventionalBiomeTags.IS_TREE_DECIDUOUS, "Deciduous Tree"); + translationBuilder.add(ConventionalBiomeTags.OVERWORLD_IS_VEGETATION_DENSE, "Dense Overworld Vegetation"); + translationBuilder.add(ConventionalBiomeTags.CONIFEROUS_IS_TREE, "Coniferous Tree"); + translationBuilder.add(ConventionalBiomeTags.SAVANNA_IS_TREE, "Savanna Tree"); + translationBuilder.add(ConventionalBiomeTags.JUNGLE_IS_TREE, "Jungle Tree"); + translationBuilder.add(ConventionalBiomeTags.DECIDUOUS_IS_TREE, "Deciduous Tree"); translationBuilder.add(ConventionalBiomeTags.IS_VOID, "Void"); - translationBuilder.add(ConventionalBiomeTags.IS_MOUNTAIN_PEAK, "Mountain Peak"); - translationBuilder.add(ConventionalBiomeTags.IS_MOUNTAIN_SLOPE, "Mountain Slope"); + translationBuilder.add(ConventionalBiomeTags.PEAK_IS_MOUNTAIN, "Mountain Peak"); + translationBuilder.add(ConventionalBiomeTags.SLOPE_IS_MOUNTAIN, "Mountain Slope"); translationBuilder.add(ConventionalBiomeTags.IS_AQUATIC, "Aquatic"); translationBuilder.add(ConventionalBiomeTags.IS_WASTELAND, "Wasteland"); translationBuilder.add(ConventionalBiomeTags.IS_DEAD, "Dead"); diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index d8c08d4322..7e441ddc6e 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -57,72 +57,72 @@ private void copyItemTags() { copy(ConventionalBlockTags.GLASS_BLOCKS, ConventionalItemTags.GLASS_BLOCKS); copy(ConventionalBlockTags.GLASS_PANES, ConventionalItemTags.GLASS_PANES); copy(ConventionalBlockTags.SHULKER_BOXES, ConventionalItemTags.SHULKER_BOXES); - copy(ConventionalBlockTags.BARRELS_WOODEN, ConventionalItemTags.BARRELS_WOODEN); + copy(ConventionalBlockTags.WOODEN_BARRELS, ConventionalItemTags.WOODEN_BARRELS); copy(ConventionalBlockTags.BUDDING_BLOCKS, ConventionalItemTags.BUDDING_BLOCKS); copy(ConventionalBlockTags.BUDS, ConventionalItemTags.BUDS); copy(ConventionalBlockTags.CLUSTERS, ConventionalItemTags.CLUSTERS); - copy(ConventionalBlockTags.SANDSTONE_BLOCKS, ConventionalItemTags.SANDSTONE_BLOCKS); - copy(ConventionalBlockTags.SANDSTONE_SLABS, ConventionalItemTags.SANDSTONE_SLABS); - copy(ConventionalBlockTags.SANDSTONE_STAIRS, ConventionalItemTags.SANDSTONE_STAIRS); - copy(ConventionalBlockTags.SANDSTONE_RED_BLOCKS, ConventionalItemTags.SANDSTONE_RED_BLOCKS); - copy(ConventionalBlockTags.SANDSTONE_RED_SLABS, ConventionalItemTags.SANDSTONE_RED_SLABS); - copy(ConventionalBlockTags.SANDSTONE_RED_STAIRS, ConventionalItemTags.SANDSTONE_RED_STAIRS); - copy(ConventionalBlockTags.SANDSTONE_UNCOLORED_BLOCKS, ConventionalItemTags.SANDSTONE_UNCOLORED_BLOCKS); - copy(ConventionalBlockTags.SANDSTONE_UNCOLORED_SLABS, ConventionalItemTags.SANDSTONE_UNCOLORED_SLABS); - copy(ConventionalBlockTags.SANDSTONE_UNCOLORED_STAIRS, ConventionalItemTags.SANDSTONE_UNCOLORED_STAIRS); + copy(ConventionalBlockTags.BLOCKS_SANDSTONE, ConventionalItemTags.BLOCKS_SANDSTONE); + copy(ConventionalBlockTags.SLABS_SANDSTONE, ConventionalItemTags.SLABS_SANDSTONE); + copy(ConventionalBlockTags.STAIRS_SANDSTONE, ConventionalItemTags.STAIRS_SANDSTONE); + copy(ConventionalBlockTags.RED_BLOCKS_SANDSTONE, ConventionalItemTags.RED_BLOCKS_SANDSTONE); + copy(ConventionalBlockTags.RED_SLABS_SANDSTONE, ConventionalItemTags.RED_SLABS_SANDSTONE); + copy(ConventionalBlockTags.RED_STAIRS_SANDSTONE, ConventionalItemTags.RED_STAIRS_SANDSTONE); + copy(ConventionalBlockTags.UNCOLORED_BLOCKS_SANDSTONE, ConventionalItemTags.UNCOLORED_BLOCKS_SANDSTONE); + copy(ConventionalBlockTags.UNCOLORED_SLABS_SANDSTONE, ConventionalItemTags.UNCOLORED_SLABS_SANDSTONE); + copy(ConventionalBlockTags.UNCOLORED_STAIRS_SANDSTONE, ConventionalItemTags.UNCOLORED_STAIRS_SANDSTONE); } private void generateDyeTags() { getOrCreateTagBuilder(ConventionalItemTags.DYES) - .addOptionalTag(ConventionalItemTags.DYES_BLACK) - .addOptionalTag(ConventionalItemTags.DYES_BLUE) - .addOptionalTag(ConventionalItemTags.DYES_BROWN) - .addOptionalTag(ConventionalItemTags.DYES_GREEN) - .addOptionalTag(ConventionalItemTags.DYES_RED) - .addOptionalTag(ConventionalItemTags.DYES_WHITE) - .addOptionalTag(ConventionalItemTags.DYES_YELLOW) - .addOptionalTag(ConventionalItemTags.DYES_LIGHT_GRAY) - .addOptionalTag(ConventionalItemTags.DYES_LIGHT_BLUE) - .addOptionalTag(ConventionalItemTags.DYES_LIME) - .addOptionalTag(ConventionalItemTags.DYES_MAGENTA) - .addOptionalTag(ConventionalItemTags.DYES_ORANGE) - .addOptionalTag(ConventionalItemTags.DYES_PINK) - .addOptionalTag(ConventionalItemTags.DYES_CYAN) - .addOptionalTag(ConventionalItemTags.DYES_GRAY) - .addOptionalTag(ConventionalItemTags.DYES_PURPLE); - getOrCreateTagBuilder(ConventionalItemTags.DYES_BLACK) + .addOptionalTag(ConventionalItemTags.BLACK_DYES) + .addOptionalTag(ConventionalItemTags.BLUE_DYES) + .addOptionalTag(ConventionalItemTags.BROWN_DYES) + .addOptionalTag(ConventionalItemTags.GREEN_DYES) + .addOptionalTag(ConventionalItemTags.RED_DYES) + .addOptionalTag(ConventionalItemTags.WHITE_DYES) + .addOptionalTag(ConventionalItemTags.YELLOW_DYES) + .addOptionalTag(ConventionalItemTags.LIGHT_GRAY_DYES) + .addOptionalTag(ConventionalItemTags.LIGHT_BLUE_DYES) + .addOptionalTag(ConventionalItemTags.LIME_DYES) + .addOptionalTag(ConventionalItemTags.MAGENTA_DYES) + .addOptionalTag(ConventionalItemTags.ORANGE_DYES) + .addOptionalTag(ConventionalItemTags.PINK_DYES) + .addOptionalTag(ConventionalItemTags.CYAN_DYES) + .addOptionalTag(ConventionalItemTags.GRAY_DYES) + .addOptionalTag(ConventionalItemTags.PURPLE_DYES); + getOrCreateTagBuilder(ConventionalItemTags.BLACK_DYES) .add(Items.BLACK_DYE); - getOrCreateTagBuilder(ConventionalItemTags.DYES_BLUE) + getOrCreateTagBuilder(ConventionalItemTags.BLUE_DYES) .add(Items.BLUE_DYE); - getOrCreateTagBuilder(ConventionalItemTags.DYES_BROWN) + getOrCreateTagBuilder(ConventionalItemTags.BROWN_DYES) .add(Items.BROWN_DYE); - getOrCreateTagBuilder(ConventionalItemTags.DYES_GREEN) + getOrCreateTagBuilder(ConventionalItemTags.GREEN_DYES) .add(Items.GREEN_DYE); - getOrCreateTagBuilder(ConventionalItemTags.DYES_RED) + getOrCreateTagBuilder(ConventionalItemTags.RED_DYES) .add(Items.RED_DYE); - getOrCreateTagBuilder(ConventionalItemTags.DYES_WHITE) + getOrCreateTagBuilder(ConventionalItemTags.WHITE_DYES) .add(Items.WHITE_DYE); - getOrCreateTagBuilder(ConventionalItemTags.DYES_YELLOW) + getOrCreateTagBuilder(ConventionalItemTags.YELLOW_DYES) .add(Items.YELLOW_DYE); - getOrCreateTagBuilder(ConventionalItemTags.DYES_LIGHT_BLUE) + getOrCreateTagBuilder(ConventionalItemTags.LIGHT_BLUE_DYES) .add(Items.LIGHT_BLUE_DYE); - getOrCreateTagBuilder(ConventionalItemTags.DYES_LIGHT_GRAY) + getOrCreateTagBuilder(ConventionalItemTags.LIGHT_GRAY_DYES) .add(Items.LIGHT_GRAY_DYE); - getOrCreateTagBuilder(ConventionalItemTags.DYES_LIME) + getOrCreateTagBuilder(ConventionalItemTags.LIME_DYES) .add(Items.LIME_DYE); - getOrCreateTagBuilder(ConventionalItemTags.DYES_MAGENTA) + getOrCreateTagBuilder(ConventionalItemTags.MAGENTA_DYES) .add(Items.MAGENTA_DYE); - getOrCreateTagBuilder(ConventionalItemTags.DYES_ORANGE) + getOrCreateTagBuilder(ConventionalItemTags.ORANGE_DYES) .add(Items.ORANGE_DYE); - getOrCreateTagBuilder(ConventionalItemTags.DYES_PINK) + getOrCreateTagBuilder(ConventionalItemTags.PINK_DYES) .add(Items.PINK_DYE); - getOrCreateTagBuilder(ConventionalItemTags.DYES_CYAN) + getOrCreateTagBuilder(ConventionalItemTags.CYAN_DYES) .add(Items.CYAN_DYE); - getOrCreateTagBuilder(ConventionalItemTags.DYES_GRAY) + getOrCreateTagBuilder(ConventionalItemTags.GRAY_DYES) .add(Items.GRAY_DYE); - getOrCreateTagBuilder(ConventionalItemTags.DYES_PURPLE) + getOrCreateTagBuilder(ConventionalItemTags.PURPLE_DYES) .add(Items.PURPLE_DYE); } @@ -139,20 +139,20 @@ private void generateConsumableTags() { } private void generateBucketTags() { - getOrCreateTagBuilder(ConventionalItemTags.BUCKETS_EMPTY) + getOrCreateTagBuilder(ConventionalItemTags.EMPTY_BUCKETS) .add(Items.BUCKET); - getOrCreateTagBuilder(ConventionalItemTags.BUCKETS_LAVA) + getOrCreateTagBuilder(ConventionalItemTags.LAVA_BUCKETS) .add(Items.LAVA_BUCKET); - getOrCreateTagBuilder(ConventionalItemTags.BUCKETS_ENTITY_WATER) + getOrCreateTagBuilder(ConventionalItemTags.ENTITY_WATER_BUCKETS) .add(Items.AXOLOTL_BUCKET) .add(Items.COD_BUCKET) .add(Items.PUFFERFISH_BUCKET) .add(Items.TROPICAL_FISH_BUCKET) .add(Items.SALMON_BUCKET) .add(Items.TADPOLE_BUCKET); - getOrCreateTagBuilder(ConventionalItemTags.BUCKETS_WATER) + getOrCreateTagBuilder(ConventionalItemTags.WATER_BUCKETS) .add(Items.WATER_BUCKET); - getOrCreateTagBuilder(ConventionalItemTags.BUCKETS_MILK) + getOrCreateTagBuilder(ConventionalItemTags.MILK_BUCKETS) .add(Items.MILK_BUCKET); } @@ -169,87 +169,87 @@ private void generateOreAndRelatedTags() { .add(Items.GOLD_NUGGET, Items.IRON_NUGGET); copy(ConventionalBlockTags.ORES, ConventionalItemTags.ORES); getOrCreateTagBuilder(ConventionalItemTags.ORES) - .addOptionalTag(ConventionalItemTags.ORES_QUARTZ) - .addOptionalTag(ConventionalItemTags.ORES_NETHERITE_SCRAP); + .addOptionalTag(ConventionalItemTags.QUARTZ_ORES) + .addOptionalTag(ConventionalItemTags.NETHERITE_SCRAP_ORES); getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS) - .addOptionalTag(ConventionalItemTags.RAW_MATERIALS_IRON) - .addOptionalTag(ConventionalItemTags.RAW_MATERIALS_COPPER) - .addOptionalTag(ConventionalItemTags.RAW_MATERIALS_GOLD); + .addOptionalTag(ConventionalItemTags.IRON_RAW_MATERIALS) + .addOptionalTag(ConventionalItemTags.COPPER_RAW_MATERIALS) + .addOptionalTag(ConventionalItemTags.GOLD_RAW_MATERIALS); getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS) .add(Items.RAW_IRON, Items.RAW_COPPER, Items.RAW_GOLD); getOrCreateTagBuilder(ConventionalItemTags.RAW_BLOCKS) .add(Items.RAW_IRON_BLOCK, Items.RAW_COPPER_BLOCK, Items.RAW_GOLD_BLOCK); // Vanilla instances - getOrCreateTagBuilder(ConventionalItemTags.INGOTS_IRON) + getOrCreateTagBuilder(ConventionalItemTags.IRON_INGOTS) .add(Items.IRON_INGOT); - getOrCreateTagBuilder(ConventionalItemTags.INGOTS_COPPER) + getOrCreateTagBuilder(ConventionalItemTags.COPPER_INGOTS) .add(Items.COPPER_INGOT); - getOrCreateTagBuilder(ConventionalItemTags.INGOTS_GOLD) + getOrCreateTagBuilder(ConventionalItemTags.GOLD_INGOTS) .add(Items.GOLD_INGOT); - getOrCreateTagBuilder(ConventionalItemTags.INGOTS_NETHERITE) + getOrCreateTagBuilder(ConventionalItemTags.NETHERITE_INGOTS) .add(Items.NETHERITE_INGOT); - getOrCreateTagBuilder(ConventionalItemTags.RAW_BLOCKS_IRON) + getOrCreateTagBuilder(ConventionalItemTags.IRON_RAW_BLOCKS) .add(Items.RAW_IRON_BLOCK); - getOrCreateTagBuilder(ConventionalItemTags.RAW_BLOCKS_COPPER) + getOrCreateTagBuilder(ConventionalItemTags.COPPER_RAW_BLOCKS) .add(Items.RAW_COPPER_BLOCK); - getOrCreateTagBuilder(ConventionalItemTags.RAW_BLOCKS_GOLD) + getOrCreateTagBuilder(ConventionalItemTags.GOLD_RAW_BLOCKS) .add(Items.RAW_GOLD_BLOCK); - getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS_IRON) + getOrCreateTagBuilder(ConventionalItemTags.IRON_RAW_MATERIALS) .add(Items.RAW_IRON); - getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS_COPPER) + getOrCreateTagBuilder(ConventionalItemTags.COPPER_RAW_MATERIALS) .add(Items.RAW_COPPER); - getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS_GOLD) + getOrCreateTagBuilder(ConventionalItemTags.GOLD_RAW_MATERIALS) .add(Items.RAW_GOLD); - getOrCreateTagBuilder(ConventionalItemTags.DUSTS_REDSTONE) + getOrCreateTagBuilder(ConventionalItemTags.REDSTONE_DUSTS) .add(Items.REDSTONE); - getOrCreateTagBuilder(ConventionalItemTags.DUSTS_GLOWSTONE) + getOrCreateTagBuilder(ConventionalItemTags.GLOWSTONE_DUSTS) .add(Items.GLOWSTONE_DUST); getOrCreateTagBuilder(ConventionalItemTags.COAL) .addOptionalTag(ItemTags.COALS); - getOrCreateTagBuilder(ConventionalItemTags.ORES_QUARTZ) + getOrCreateTagBuilder(ConventionalItemTags.QUARTZ_ORES) .add(Items.NETHER_QUARTZ_ORE); - getOrCreateTagBuilder(ConventionalItemTags.ORES_NETHERITE_SCRAP) + getOrCreateTagBuilder(ConventionalItemTags.NETHERITE_SCRAP_ORES) .add(Items.ANCIENT_DEBRIS); - getOrCreateTagBuilder(ConventionalItemTags.GEMS_QUARTZ) + getOrCreateTagBuilder(ConventionalItemTags.QUARTZ_GEMS) .add(Items.QUARTZ); - getOrCreateTagBuilder(ConventionalItemTags.GEMS_EMERALD) + getOrCreateTagBuilder(ConventionalItemTags.EMERALD_GEMS) .add(Items.EMERALD); - getOrCreateTagBuilder(ConventionalItemTags.GEMS_LAPIS) + getOrCreateTagBuilder(ConventionalItemTags.LAPIS_GEMS) .add(Items.LAPIS_LAZULI); - getOrCreateTagBuilder(ConventionalItemTags.GEMS_DIAMOND) + getOrCreateTagBuilder(ConventionalItemTags.DIAMOND_GEMS) .add(Items.DIAMOND); - getOrCreateTagBuilder(ConventionalItemTags.GEMS_AMETHYST) + getOrCreateTagBuilder(ConventionalItemTags.AMETHYST_GEMS) .add(Items.AMETHYST_SHARD); - getOrCreateTagBuilder(ConventionalItemTags.GEMS_PRISMARINE) + getOrCreateTagBuilder(ConventionalItemTags.PRISMARINE_GEMS) .add(Items.PRISMARINE_CRYSTALS); } private void generateToolTags() { getOrCreateTagBuilder(ConventionalItemTags.TOOLS) - .addOptionalTag(ConventionalItemTags.TOOLS_BOWS) - .addOptionalTag(ConventionalItemTags.TOOLS_CROSSBOWS) - .addOptionalTag(ConventionalItemTags.TOOLS_SHEARS) - .addOptionalTag(ConventionalItemTags.TOOLS_SHIELDS) - .addOptionalTag(ConventionalItemTags.TOOLS_SPEARS) - .addOptionalTag(ConventionalItemTags.TOOLS_FISHING_RODS); - - getOrCreateTagBuilder(ConventionalItemTags.TOOLS_BOWS) + .addOptionalTag(ConventionalItemTags.BOWS_TOOLS) + .addOptionalTag(ConventionalItemTags.CROSSBOWS_TOOLS) + .addOptionalTag(ConventionalItemTags.SHEARS_TOOLS) + .addOptionalTag(ConventionalItemTags.SHIELDS_TOOLS) + .addOptionalTag(ConventionalItemTags.SPEARS_TOOLS) + .addOptionalTag(ConventionalItemTags.FISHING_RODS_TOOLS); + + getOrCreateTagBuilder(ConventionalItemTags.BOWS_TOOLS) .add(Items.BOW); - getOrCreateTagBuilder(ConventionalItemTags.TOOLS_CROSSBOWS) + getOrCreateTagBuilder(ConventionalItemTags.CROSSBOWS_TOOLS) .add(Items.CROSSBOW); - getOrCreateTagBuilder(ConventionalItemTags.TOOLS_SHEARS) + getOrCreateTagBuilder(ConventionalItemTags.SHEARS_TOOLS) .add(Items.SHEARS); - getOrCreateTagBuilder(ConventionalItemTags.TOOLS_SHIELDS) + getOrCreateTagBuilder(ConventionalItemTags.SHIELDS_TOOLS) .add(Items.SHIELD); - getOrCreateTagBuilder(ConventionalItemTags.TOOLS_SPEARS) + getOrCreateTagBuilder(ConventionalItemTags.SPEARS_TOOLS) .add(Items.TRIDENT); - getOrCreateTagBuilder(ConventionalItemTags.TOOLS_FISHING_RODS) + getOrCreateTagBuilder(ConventionalItemTags.FISHING_RODS_TOOLS) .add(Items.FISHING_ROD); } @@ -262,178 +262,178 @@ private void generateVillagerJobSites() { private void generateDyedTags() { // Cannot pull entries from block tag because Wall Banners do not have an item form - getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_BLACK) + getOrCreateTagBuilder(ConventionalItemTags.BLACK_DYED_ITEMS) .add(Items.BLACK_BANNER).add(Items.BLACK_BED).add(Items.BLACK_CANDLE).add(Items.BLACK_CARPET) .add(Items.BLACK_CONCRETE).add(Items.BLACK_CONCRETE_POWDER).add(Items.BLACK_GLAZED_TERRACOTTA) .add(Items.BLACK_SHULKER_BOX).add(Items.BLACK_STAINED_GLASS).add(Items.BLACK_STAINED_GLASS_PANE) .add(Items.BLACK_TERRACOTTA).add(Items.BLACK_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_BLUE) + getOrCreateTagBuilder(ConventionalItemTags.BLUE_DYED_ITEMS) .add(Items.BLUE_BANNER).add(Items.BLUE_BED).add(Items.BLUE_CANDLE).add(Items.BLUE_CARPET) .add(Items.BLUE_CONCRETE).add(Items.BLUE_CONCRETE_POWDER).add(Items.BLUE_GLAZED_TERRACOTTA) .add(Items.BLUE_SHULKER_BOX).add(Items.BLUE_STAINED_GLASS).add(Items.BLUE_STAINED_GLASS_PANE) .add(Items.BLUE_TERRACOTTA).add(Items.BLUE_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_BROWN) + getOrCreateTagBuilder(ConventionalItemTags.BROWN_DYED_ITEMS) .add(Items.BROWN_BANNER).add(Items.BROWN_BED).add(Items.BROWN_CANDLE).add(Items.BROWN_CARPET) .add(Items.BROWN_CONCRETE).add(Items.BROWN_CONCRETE_POWDER).add(Items.BROWN_GLAZED_TERRACOTTA) .add(Items.BROWN_SHULKER_BOX).add(Items.BROWN_STAINED_GLASS).add(Items.BROWN_STAINED_GLASS_PANE) .add(Items.BROWN_TERRACOTTA).add(Items.BROWN_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_CYAN) + getOrCreateTagBuilder(ConventionalItemTags.CYAN_DYED_ITEMS) .add(Items.CYAN_BANNER).add(Items.CYAN_BED).add(Items.CYAN_CANDLE).add(Items.CYAN_CARPET) .add(Items.CYAN_CONCRETE).add(Items.CYAN_CONCRETE_POWDER).add(Items.CYAN_GLAZED_TERRACOTTA) .add(Items.CYAN_SHULKER_BOX).add(Items.CYAN_STAINED_GLASS).add(Items.CYAN_STAINED_GLASS_PANE) .add(Items.CYAN_TERRACOTTA).add(Items.CYAN_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_GRAY) + getOrCreateTagBuilder(ConventionalItemTags.GRAY_DYED_ITEMS) .add(Items.GRAY_BANNER).add(Items.GRAY_BED).add(Items.GRAY_CANDLE).add(Items.GRAY_CARPET) .add(Items.GRAY_CONCRETE).add(Items.GRAY_CONCRETE_POWDER).add(Items.GRAY_GLAZED_TERRACOTTA) .add(Items.GRAY_SHULKER_BOX).add(Items.GRAY_STAINED_GLASS).add(Items.GRAY_STAINED_GLASS_PANE) .add(Items.GRAY_TERRACOTTA).add(Items.GRAY_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_GREEN) + getOrCreateTagBuilder(ConventionalItemTags.GREEN_DYED_ITEMS) .add(Items.GREEN_BANNER).add(Items.GREEN_BED).add(Items.GREEN_CANDLE).add(Items.GREEN_CARPET) .add(Items.GREEN_CONCRETE).add(Items.GREEN_CONCRETE_POWDER).add(Items.GREEN_GLAZED_TERRACOTTA) .add(Items.GREEN_SHULKER_BOX).add(Items.GREEN_STAINED_GLASS).add(Items.GREEN_STAINED_GLASS_PANE) .add(Items.GREEN_TERRACOTTA).add(Items.GREEN_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_LIGHT_BLUE) + getOrCreateTagBuilder(ConventionalItemTags.LIGHT_BLUE_DYED_ITEMS) .add(Items.LIGHT_BLUE_BANNER).add(Items.LIGHT_BLUE_BED).add(Items.LIGHT_BLUE_CANDLE).add(Items.LIGHT_BLUE_CARPET) .add(Items.LIGHT_BLUE_CONCRETE).add(Items.LIGHT_BLUE_CONCRETE_POWDER).add(Items.LIGHT_BLUE_GLAZED_TERRACOTTA) .add(Items.LIGHT_BLUE_SHULKER_BOX).add(Items.LIGHT_BLUE_STAINED_GLASS).add(Items.LIGHT_BLUE_STAINED_GLASS_PANE) .add(Items.LIGHT_BLUE_TERRACOTTA).add(Items.LIGHT_BLUE_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_LIGHT_GRAY) + getOrCreateTagBuilder(ConventionalItemTags.LIGHT_GRAY_DYED_ITEMS) .add(Items.LIGHT_GRAY_BANNER).add(Items.LIGHT_GRAY_BED).add(Items.LIGHT_GRAY_CANDLE).add(Items.LIGHT_GRAY_CARPET) .add(Items.LIGHT_GRAY_CONCRETE).add(Items.LIGHT_GRAY_CONCRETE_POWDER).add(Items.LIGHT_GRAY_GLAZED_TERRACOTTA) .add(Items.LIGHT_GRAY_SHULKER_BOX).add(Items.LIGHT_GRAY_STAINED_GLASS).add(Items.LIGHT_GRAY_STAINED_GLASS_PANE) .add(Items.LIGHT_GRAY_TERRACOTTA).add(Items.LIGHT_GRAY_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_LIME) + getOrCreateTagBuilder(ConventionalItemTags.LIME_DYED_ITEMS) .add(Items.LIME_BANNER).add(Items.LIME_BED).add(Items.LIME_CANDLE).add(Items.LIME_CARPET) .add(Items.LIME_CONCRETE).add(Items.LIME_CONCRETE_POWDER).add(Items.LIME_GLAZED_TERRACOTTA) .add(Items.LIME_SHULKER_BOX).add(Items.LIME_STAINED_GLASS).add(Items.LIME_STAINED_GLASS_PANE) .add(Items.LIME_TERRACOTTA).add(Items.LIME_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_MAGENTA) + getOrCreateTagBuilder(ConventionalItemTags.MAGENTA_DYED_ITEMS) .add(Items.MAGENTA_BANNER).add(Items.MAGENTA_BED).add(Items.MAGENTA_CANDLE).add(Items.MAGENTA_CARPET) .add(Items.MAGENTA_CONCRETE).add(Items.MAGENTA_CONCRETE_POWDER).add(Items.MAGENTA_GLAZED_TERRACOTTA) .add(Items.MAGENTA_SHULKER_BOX).add(Items.MAGENTA_STAINED_GLASS).add(Items.MAGENTA_STAINED_GLASS_PANE) .add(Items.MAGENTA_TERRACOTTA).add(Items.MAGENTA_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_ORANGE) + getOrCreateTagBuilder(ConventionalItemTags.ORANGE_DYED_ITEMS) .add(Items.ORANGE_BANNER).add(Items.ORANGE_BED).add(Items.ORANGE_CANDLE).add(Items.ORANGE_CARPET) .add(Items.ORANGE_CONCRETE).add(Items.ORANGE_CONCRETE_POWDER).add(Items.ORANGE_GLAZED_TERRACOTTA) .add(Items.ORANGE_SHULKER_BOX).add(Items.ORANGE_STAINED_GLASS).add(Items.ORANGE_STAINED_GLASS_PANE) .add(Items.ORANGE_TERRACOTTA).add(Items.ORANGE_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_PINK) + getOrCreateTagBuilder(ConventionalItemTags.PINK_DYED_ITEMS) .add(Items.PINK_BANNER).add(Items.PINK_BED).add(Items.PINK_CANDLE).add(Items.PINK_CARPET) .add(Items.PINK_CONCRETE).add(Items.PINK_CONCRETE_POWDER).add(Items.PINK_GLAZED_TERRACOTTA) .add(Items.PINK_SHULKER_BOX).add(Items.PINK_STAINED_GLASS).add(Items.PINK_STAINED_GLASS_PANE) .add(Items.PINK_TERRACOTTA).add(Items.PINK_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_PURPLE) + getOrCreateTagBuilder(ConventionalItemTags.PURPLE_DYED_ITEMS) .add(Items.PURPLE_BANNER).add(Items.PURPLE_BED).add(Items.PURPLE_CANDLE).add(Items.PURPLE_CARPET) .add(Items.PURPLE_CONCRETE).add(Items.PURPLE_CONCRETE_POWDER).add(Items.PURPLE_GLAZED_TERRACOTTA) .add(Items.PURPLE_SHULKER_BOX).add(Items.PURPLE_STAINED_GLASS).add(Items.PURPLE_STAINED_GLASS_PANE) .add(Items.PURPLE_TERRACOTTA).add(Items.PURPLE_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_RED) + getOrCreateTagBuilder(ConventionalItemTags.RED_DYED_ITEMS) .add(Items.RED_BANNER).add(Items.RED_BED).add(Items.RED_CANDLE).add(Items.RED_CARPET) .add(Items.RED_CONCRETE).add(Items.RED_CONCRETE_POWDER).add(Items.RED_GLAZED_TERRACOTTA) .add(Items.RED_SHULKER_BOX).add(Items.RED_STAINED_GLASS).add(Items.RED_STAINED_GLASS_PANE) .add(Items.RED_TERRACOTTA).add(Items.RED_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_WHITE) + getOrCreateTagBuilder(ConventionalItemTags.WHITE_DYED_ITEMS) .add(Items.WHITE_BANNER).add(Items.WHITE_BED).add(Items.WHITE_CANDLE).add(Items.WHITE_CARPET) .add(Items.WHITE_CONCRETE).add(Items.WHITE_CONCRETE_POWDER).add(Items.WHITE_GLAZED_TERRACOTTA) .add(Items.WHITE_SHULKER_BOX).add(Items.WHITE_STAINED_GLASS).add(Items.WHITE_STAINED_GLASS_PANE) .add(Items.WHITE_TERRACOTTA).add(Items.WHITE_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS_YELLOW) + getOrCreateTagBuilder(ConventionalItemTags.YELLOW_DYED_ITEMS) .add(Items.YELLOW_BANNER).add(Items.YELLOW_BED).add(Items.YELLOW_CANDLE).add(Items.YELLOW_CARPET) .add(Items.YELLOW_CONCRETE).add(Items.YELLOW_CONCRETE_POWDER).add(Items.YELLOW_GLAZED_TERRACOTTA) .add(Items.YELLOW_SHULKER_BOX).add(Items.YELLOW_STAINED_GLASS).add(Items.YELLOW_STAINED_GLASS_PANE) .add(Items.YELLOW_TERRACOTTA).add(Items.YELLOW_WOOL); getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS) - .addTag(ConventionalItemTags.DYED_ITEMS_BLACK) - .addTag(ConventionalItemTags.DYED_ITEMS_BLUE) - .addTag(ConventionalItemTags.DYED_ITEMS_BROWN) - .addTag(ConventionalItemTags.DYED_ITEMS_CYAN) - .addTag(ConventionalItemTags.DYED_ITEMS_GRAY) - .addTag(ConventionalItemTags.DYED_ITEMS_GREEN) - .addTag(ConventionalItemTags.DYED_ITEMS_LIGHT_BLUE) - .addTag(ConventionalItemTags.DYED_ITEMS_LIGHT_GRAY) - .addTag(ConventionalItemTags.DYED_ITEMS_LIME) - .addTag(ConventionalItemTags.DYED_ITEMS_MAGENTA) - .addTag(ConventionalItemTags.DYED_ITEMS_ORANGE) - .addTag(ConventionalItemTags.DYED_ITEMS_PINK) - .addTag(ConventionalItemTags.DYED_ITEMS_PURPLE) - .addTag(ConventionalItemTags.DYED_ITEMS_RED) - .addTag(ConventionalItemTags.DYED_ITEMS_WHITE) - .addTag(ConventionalItemTags.DYED_ITEMS_YELLOW); + .addTag(ConventionalItemTags.BLACK_DYED_ITEMS) + .addTag(ConventionalItemTags.BLUE_DYED_ITEMS) + .addTag(ConventionalItemTags.BROWN_DYED_ITEMS) + .addTag(ConventionalItemTags.CYAN_DYED_ITEMS) + .addTag(ConventionalItemTags.GRAY_DYED_ITEMS) + .addTag(ConventionalItemTags.GREEN_DYED_ITEMS) + .addTag(ConventionalItemTags.LIGHT_BLUE_DYED_ITEMS) + .addTag(ConventionalItemTags.LIGHT_GRAY_DYED_ITEMS) + .addTag(ConventionalItemTags.LIME_DYED_ITEMS) + .addTag(ConventionalItemTags.MAGENTA_DYED_ITEMS) + .addTag(ConventionalItemTags.ORANGE_DYED_ITEMS) + .addTag(ConventionalItemTags.PINK_DYED_ITEMS) + .addTag(ConventionalItemTags.PURPLE_DYED_ITEMS) + .addTag(ConventionalItemTags.RED_DYED_ITEMS) + .addTag(ConventionalItemTags.WHITE_DYED_ITEMS) + .addTag(ConventionalItemTags.YELLOW_DYED_ITEMS); } private void generateBackwardsCompatTags() { // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. // TODO: Remove backwards compat tag entries in 1.22 - getOrCreateTagBuilder(ConventionalItemTags.DYES_BLACK).addOptionalTag(new Identifier("c", "black_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.DYES_BLUE).addOptionalTag(new Identifier("c", "blue_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.DYES_BROWN).addOptionalTag(new Identifier("c", "brown_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.DYES_GREEN).addOptionalTag(new Identifier("c", "green_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.DYES_RED).addOptionalTag(new Identifier("c", "red_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.DYES_WHITE).addOptionalTag(new Identifier("c", "white_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.DYES_YELLOW).addOptionalTag(new Identifier("c", "yellow_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.DYES_LIGHT_BLUE).addOptionalTag(new Identifier("c", "light_blue_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.DYES_LIGHT_GRAY).addOptionalTag(new Identifier("c", "light_gray_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.DYES_LIME).addOptionalTag(new Identifier("c", "lime_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.DYES_MAGENTA).addOptionalTag(new Identifier("c", "magenta_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.DYES_ORANGE).addOptionalTag(new Identifier("c", "orange_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.DYES_PINK).addOptionalTag(new Identifier("c", "pink_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.DYES_CYAN).addOptionalTag(new Identifier("c", "cyan_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.DYES_GRAY).addOptionalTag(new Identifier("c", "gray_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.DYES_PURPLE).addOptionalTag(new Identifier("c", "purple_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.BLACK_DYES).addOptionalTag(new Identifier("c", "black_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.BLUE_DYES).addOptionalTag(new Identifier("c", "blue_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.BROWN_DYES).addOptionalTag(new Identifier("c", "brown_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.GREEN_DYES).addOptionalTag(new Identifier("c", "green_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.RED_DYES).addOptionalTag(new Identifier("c", "red_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.WHITE_DYES).addOptionalTag(new Identifier("c", "white_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.YELLOW_DYES).addOptionalTag(new Identifier("c", "yellow_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.LIGHT_BLUE_DYES).addOptionalTag(new Identifier("c", "light_blue_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.LIGHT_GRAY_DYES).addOptionalTag(new Identifier("c", "light_gray_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.LIME_DYES).addOptionalTag(new Identifier("c", "lime_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.MAGENTA_DYES).addOptionalTag(new Identifier("c", "magenta_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.ORANGE_DYES).addOptionalTag(new Identifier("c", "orange_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.PINK_DYES).addOptionalTag(new Identifier("c", "pink_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.CYAN_DYES).addOptionalTag(new Identifier("c", "cyan_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.GRAY_DYES).addOptionalTag(new Identifier("c", "gray_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.PURPLE_DYES).addOptionalTag(new Identifier("c", "purple_dyes")); getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.DYES); getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.FOODS); getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.POTIONS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.BUCKETS_EMPTY).addOptionalTag(new Identifier("c", "empty_buckets")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.BUCKETS_LAVA).addOptionalTag(new Identifier("c", "lava_buckets")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.BUCKETS_ENTITY_WATER).addOptionalTag(new Identifier("c", "entity_water_buckets")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.BUCKETS_WATER).addOptionalTag(new Identifier("c", "water_buckets")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.BUCKETS_MILK).addOptionalTag(new Identifier("c", "milk_buckets")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.EMPTY_BUCKETS).addOptionalTag(new Identifier("c", "empty_buckets")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.LAVA_BUCKETS).addOptionalTag(new Identifier("c", "lava_buckets")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.ENTITY_WATER_BUCKETS).addOptionalTag(new Identifier("c", "entity_water_buckets")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.WATER_BUCKETS).addOptionalTag(new Identifier("c", "water_buckets")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.MILK_BUCKETS).addOptionalTag(new Identifier("c", "milk_buckets")); getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.DUSTS); getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.GEMS); getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.INGOTS); getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.NUGGETS); getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.RAW_MATERIALS).addOptionalTag(new Identifier("c", "raw_ores")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.INGOTS_IRON).addOptionalTag(new Identifier("c", "iron_ingots")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.INGOTS_COPPER).addOptionalTag(new Identifier("c", "copper_ingots")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.INGOTS_GOLD).addOptionalTag(new Identifier("c", "gold_ingots")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.INGOTS_NETHERITE).addOptionalTag(new Identifier("c", "netherite_ingots")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.DUSTS_REDSTONE).addOptionalTag(new Identifier("c", "dusts")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.ORES_QUARTZ).addOptionalTag(new Identifier("c", "quartz_ores")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.RAW_BLOCKS_IRON).addOptionalTag(new Identifier("c", "raw_iron_blocks")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.RAW_BLOCKS_COPPER).addOptionalTag(new Identifier("c", "raw_copper_blocks")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.RAW_BLOCKS_GOLD).addOptionalTag(new Identifier("c", "raw_gold_blocks")); - getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS_IRON).addOptionalTag(new Identifier("c", "raw_iron_ores")); - getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS_COPPER).addOptionalTag(new Identifier("c", "raw_copper_ores")); - getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS_GOLD).addOptionalTag(new Identifier("c", "raw_gold_ores")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.IRON_INGOTS).addOptionalTag(new Identifier("c", "iron_ingots")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.COPPER_INGOTS).addOptionalTag(new Identifier("c", "copper_ingots")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.GOLD_INGOTS).addOptionalTag(new Identifier("c", "gold_ingots")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.NETHERITE_INGOTS).addOptionalTag(new Identifier("c", "netherite_ingots")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.REDSTONE_DUSTS).addOptionalTag(new Identifier("c", "dusts")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.QUARTZ_ORES).addOptionalTag(new Identifier("c", "quartz_ores")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.IRON_RAW_BLOCKS).addOptionalTag(new Identifier("c", "raw_iron_blocks")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.COPPER_RAW_BLOCKS).addOptionalTag(new Identifier("c", "raw_copper_blocks")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.GOLD_RAW_BLOCKS).addOptionalTag(new Identifier("c", "raw_gold_blocks")); + getOrCreateTagBuilder(ConventionalItemTags.IRON_RAW_MATERIALS).addOptionalTag(new Identifier("c", "raw_iron_ores")); + getOrCreateTagBuilder(ConventionalItemTags.COPPER_RAW_MATERIALS).addOptionalTag(new Identifier("c", "raw_copper_ores")); + getOrCreateTagBuilder(ConventionalItemTags.GOLD_RAW_MATERIALS).addOptionalTag(new Identifier("c", "raw_gold_ores")); getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.COAL); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.GEMS_EMERALD); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.GEMS_LAPIS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.GEMS_DIAMOND); - getOrCreateTagBuilder(ConventionalItemTags.GEMS_DIAMOND).addOptionalTag(new Identifier("c", "diamonds")); - getOrCreateTagBuilder(ConventionalItemTags.GEMS_LAPIS).addOptionalTag(new Identifier("c", "lapis")); - getOrCreateTagBuilder(ConventionalItemTags.GEMS_EMERALD).addOptionalTag(new Identifier("c", "emeralds")); - getOrCreateTagBuilder(ConventionalItemTags.GEMS_QUARTZ).addOptionalTag(new Identifier("c", "quartz")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.TOOLS_SHEARS).addOptionalTag(new Identifier("c", "shears")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.TOOLS_SPEARS).addOptionalTag(new Identifier("c", "spears")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.TOOLS_BOWS).addOptionalTag(new Identifier("c", "bows")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.TOOLS_SHIELDS).addOptionalTag(new Identifier("c", "shields")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.EMERALD_GEMS); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.LAPIS_GEMS); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.DIAMOND_GEMS); + getOrCreateTagBuilder(ConventionalItemTags.DIAMOND_GEMS).addOptionalTag(new Identifier("c", "diamonds")); + getOrCreateTagBuilder(ConventionalItemTags.LAPIS_GEMS).addOptionalTag(new Identifier("c", "lapis")); + getOrCreateTagBuilder(ConventionalItemTags.EMERALD_GEMS).addOptionalTag(new Identifier("c", "emeralds")); + getOrCreateTagBuilder(ConventionalItemTags.QUARTZ_GEMS).addOptionalTag(new Identifier("c", "quartz")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.SHEARS_TOOLS).addOptionalTag(new Identifier("c", "shears")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.SPEARS_TOOLS).addOptionalTag(new Identifier("c", "spears")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.BOWS_TOOLS).addOptionalTag(new Identifier("c", "bows")); + getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.SHIELDS_TOOLS).addOptionalTag(new Identifier("c", "shields")); getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.VILLAGER_JOB_SITES); } diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java index 1a8e75c11f..0d9a814ac9 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java +++ b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java @@ -81,27 +81,35 @@ private ConventionalBiomeTags() { public static final TagKey IS_UNDERGROUND = register("is_underground"); public static final TagKey IS_MOUNTAIN = register("is_mountain"); - public static final TagKey IS_HOT_OVERWORLD = register("is_hot/overworld"); public static final TagKey IS_HOT = register("is_hot"); - public static final TagKey IS_TEMPERATE_OVERWORLD = register("is_temperate/overworld"); + public static final TagKey OVERWORLD_IS_HOT = register("is_hot/overworld"); + public static final TagKey IS_TEMPERATE = register("is_temperate"); - public static final TagKey IS_COLD_OVERWORLD = register("is_cold/overworld"); + public static final TagKey OVERWORLD_IS_TEMPERATE = register("is_temperate/overworld"); + public static final TagKey IS_COLD = register("is_cold"); - public static final TagKey IS_WET_OVERWORLD = register("is_wet/overworld"); + public static final TagKey OVERWORLD_IS_COLD = register("is_cold/overworld"); + public static final TagKey IS_WET = register("is_wet"); - public static final TagKey IS_DRY_OVERWORLD = register("is_dry/overworld"); + public static final TagKey OVERWORLD_IS_WET = register("is_wet/overworld"); + public static final TagKey IS_DRY = register("is_dry"); + public static final TagKey OVERWORLD_IS_DRY = register("is_dry/overworld"); + 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 OVERWORLD_IS_VEGETATION_SPARSE = register("is_sparse_vegetation/overworld"); + 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_TREE_CONIFEROUS = register("is_tree/coniferous"); - public static final TagKey IS_TREE_SAVANNA = register("is_tree/savanna"); - public static final TagKey IS_TREE_JUNGLE = register("is_tree/jungle"); - public static final TagKey IS_TREE_DECIDUOUS = register("is_tree/deciduous"); + public static final TagKey OVERWORLD_IS_VEGETATION_DENSE = register("is_dense_vegetation/overworld"); + + public static final TagKey CONIFEROUS_IS_TREE = register("is_tree/coniferous"); + public static final TagKey SAVANNA_IS_TREE = register("is_tree/savanna"); + public static final TagKey JUNGLE_IS_TREE = register("is_tree/jungle"); + public static final TagKey DECIDUOUS_IS_TREE = register("is_tree/deciduous"); + public static final TagKey IS_VOID = register("is_void"); - public static final TagKey IS_MOUNTAIN_PEAK = register("is_mountain/peak"); - public static final TagKey IS_MOUNTAIN_SLOPE = register("is_mountain/slope"); + public static final TagKey PEAK_IS_MOUNTAIN = register("is_mountain/peak"); + public static final TagKey SLOPE_IS_MOUNTAIN = register("is_mountain/slope"); /** * Biomes consisting primarily of water. */ diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java index 40a2d0100f..5e48334708 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java +++ b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java @@ -34,11 +34,11 @@ private ConventionalBlockTags() { public static final TagKey ORES = register("ores"); // Ores and ingots - vanilla instances - public static final TagKey ORES_QUARTZ = register("ores/quartz"); - public static final TagKey ORES_NETHERITE_SCRAP = register("ores/netherite_scrap"); + public static final TagKey QUARTZ_ORES = register("ores/quartz"); + public static final TagKey NETHERITE_SCRAP_ORES = register("ores/netherite_scrap"); public static final TagKey BARRELS = register("barrels"); - public static final TagKey BARRELS_WOODEN = register("barrels/wooden"); + public static final TagKey WOODEN_BARRELS = register("barrels/wooden"); public static final TagKey BOOKSHELVES = register("bookshelves"); public static final TagKey CHESTS = register("chests"); public static final TagKey GLASS_BLOCKS = register("glass_blocks"); @@ -53,34 +53,34 @@ private ConventionalBlockTags() { public static final TagKey VILLAGER_JOB_SITES = register("villager_job_sites"); // Sandstone - public static final TagKey SANDSTONE_BLOCKS = register("sandstone/blocks"); - public static final TagKey SANDSTONE_SLABS = register("sandstone/slabs"); - public static final TagKey SANDSTONE_STAIRS = register("sandstone/stairs"); - public static final TagKey SANDSTONE_RED_BLOCKS = register("sandstone/red_blocks"); - public static final TagKey SANDSTONE_RED_SLABS = register("sandstone/red_slabs"); - public static final TagKey SANDSTONE_RED_STAIRS = register("sandstone/red_stairs"); - public static final TagKey SANDSTONE_UNCOLORED_BLOCKS = register("sandstone/uncolored_blocks"); - public static final TagKey SANDSTONE_UNCOLORED_SLABS = register("sandstone/uncolored_slabs"); - public static final TagKey SANDSTONE_UNCOLORED_STAIRS = register("sandstone/uncolored_stairs"); + public static final TagKey BLOCKS_SANDSTONE = register("sandstone/blocks"); + public static final TagKey SLABS_SANDSTONE = register("sandstone/slabs"); + public static final TagKey STAIRS_SANDSTONE = register("sandstone/stairs"); + public static final TagKey RED_BLOCKS_SANDSTONE = register("sandstone/red_blocks"); + public static final TagKey RED_SLABS_SANDSTONE = register("sandstone/red_slabs"); + public static final TagKey RED_STAIRS_SANDSTONE = register("sandstone/red_stairs"); + public static final TagKey UNCOLORED_BLOCKS_SANDSTONE = register("sandstone/uncolored_blocks"); + public static final TagKey UNCOLORED_SLABS_SANDSTONE = register("sandstone/uncolored_slabs"); + public static final TagKey UNCOLORED_STAIRS_SANDSTONE = register("sandstone/uncolored_stairs"); // Blocks created with dyes public static final TagKey DYED_BLOCKS = register("dyed_blocks"); - public static final TagKey DYED_BLOCKS_BLACK = register("dyed_blocks/black"); - public static final TagKey DYED_BLOCKS_BLUE = register("dyed_blocks/blue"); - public static final TagKey DYED_BLOCKS_BROWN = register("dyed_blocks/brown"); - public static final TagKey DYED_BLOCKS_CYAN = register("dyed_blocks/cyan"); - public static final TagKey DYED_BLOCKS_GRAY = register("dyed_blocks/gray"); - public static final TagKey DYED_BLOCKS_GREEN = register("dyed_blocks/green"); - public static final TagKey DYED_BLOCKS_LIGHT_BLUE = register("dyed_blocks/light_blue"); - public static final TagKey DYED_BLOCKS_LIGHT_GRAY = register("dyed_blocks/light_gray"); - public static final TagKey DYED_BLOCKS_LIME = register("dyed_blocks/lime"); - public static final TagKey DYED_BLOCKS_MAGENTA = register("dyed_blocks/magenta"); - public static final TagKey DYED_BLOCKS_ORANGE = register("dyed_blocks/orange"); - public static final TagKey DYED_BLOCKS_PINK = register("dyed_blocks/pink"); - public static final TagKey DYED_BLOCKS_PURPLE = register("dyed_blocks/purple"); - public static final TagKey DYED_BLOCKS_RED = register("dyed_blocks/red"); - public static final TagKey DYED_BLOCKS_WHITE = register("dyed_blocks/white"); - public static final TagKey DYED_BLOCKS_YELLOW = register("dyed_blocks/yellow"); + public static final TagKey BLACK_DYED_BLOCKS = register("dyed_blocks/black"); + public static final TagKey BLUE_DYED_BLOCKS = register("dyed_blocks/blue"); + public static final TagKey BROWN_DYED_BLOCKS = register("dyed_blocks/brown"); + public static final TagKey CYAN_DYED_BLOCKS = register("dyed_blocks/cyan"); + public static final TagKey GRAY_DYED_BLOCKS = register("dyed_blocks/gray"); + public static final TagKey GREEN_DYED_BLOCKS = register("dyed_blocks/green"); + public static final TagKey LIGHT_BLUE_DYED_BLOCKS = register("dyed_blocks/light_blue"); + public static final TagKey LIGHT_GRAY_DYED_BLOCKS = register("dyed_blocks/light_gray"); + public static final TagKey LIME_DYED_BLOCKS = register("dyed_blocks/lime"); + public static final TagKey MAGENTA_DYED_BLOCKS = register("dyed_blocks/magenta"); + public static final TagKey ORANGE_DYED_BLOCKS = register("dyed_blocks/orange"); + public static final TagKey PINK_DYED_BLOCKS = register("dyed_blocks/pink"); + public static final TagKey PURPLE_DYED_BLOCKS = register("dyed_blocks/purple"); + public static final TagKey RED_DYED_BLOCKS = register("dyed_blocks/red"); + public static final TagKey WHITE_DYED_BLOCKS = register("dyed_blocks/white"); + public static final TagKey YELLOW_DYED_BLOCKS = register("dyed_blocks/yellow"); /** * Blocks should be included in this tag if their movement can cause serious issues such as world corruption diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java index ad840a14c9..3c780cfeea 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java +++ b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java @@ -31,15 +31,15 @@ private ConventionalItemTags() { // Tool tags public static final TagKey TOOLS = register("tools"); - public static final TagKey TOOLS_SHEARS = register("tools/shears"); + public static final TagKey SHEARS_TOOLS = register("tools/shears"); /** * For throwable weapons, like Minecraft tridents. */ - public static final TagKey TOOLS_SPEARS = register("tools/spears"); - public static final TagKey TOOLS_BOWS = register("tools/bows"); - public static final TagKey TOOLS_CROSSBOWS = register("tools/crossbows"); - public static final TagKey TOOLS_SHIELDS = register("tools/shields"); - public static final TagKey TOOLS_FISHING_RODS = register("tools/fishing_rods"); + public static final TagKey SPEARS_TOOLS = register("tools/spears"); + public static final TagKey BOWS_TOOLS = register("tools/bows"); + public static final TagKey CROSSBOWS_TOOLS = register("tools/crossbows"); + public static final TagKey SHIELDS_TOOLS = register("tools/shields"); + public static final TagKey FISHING_RODS_TOOLS = register("tools/fishing_rods"); // Ores and ingots - categories public static final TagKey DUSTS = register("dusts"); @@ -51,34 +51,34 @@ private ConventionalItemTags() { public static final TagKey RAW_BLOCKS = register("raw_blocks"); // Raw material and blocks - vanilla instances - public static final TagKey RAW_MATERIALS_IRON = register("raw_materials/iron"); - public static final TagKey RAW_MATERIALS_GOLD = register("raw_materials/gold"); - public static final TagKey RAW_MATERIALS_COPPER = register("raw_materials/copper"); - public static final TagKey RAW_BLOCKS_IRON = register("raw_blocks/iron"); - public static final TagKey RAW_BLOCKS_GOLD = register("raw_blocks/gold"); - public static final TagKey RAW_BLOCKS_COPPER = register("raw_blocks/copper"); + public static final TagKey IRON_RAW_MATERIALS = register("raw_materials/iron"); + public static final TagKey GOLD_RAW_MATERIALS = register("raw_materials/gold"); + public static final TagKey COPPER_RAW_MATERIALS = register("raw_materials/copper"); + public static final TagKey IRON_RAW_BLOCKS = register("raw_blocks/iron"); + public static final TagKey GOLD_RAW_BLOCKS = register("raw_blocks/gold"); + public static final TagKey COPPER_RAW_BLOCKS = register("raw_blocks/copper"); // Ingots - vanilla instances - public static final TagKey INGOTS_IRON = register("ingots/iron"); - public static final TagKey INGOTS_GOLD = register("ingots/gold"); - public static final TagKey INGOTS_COPPER = register("ingots/copper"); - public static final TagKey INGOTS_NETHERITE = register("ingots/netherite"); + public static final TagKey IRON_INGOTS = register("ingots/iron"); + public static final TagKey GOLD_INGOTS = register("ingots/gold"); + public static final TagKey COPPER_INGOTS = register("ingots/copper"); + public static final TagKey NETHERITE_INGOTS = register("ingots/netherite"); // Ores - vanilla instances - public static final TagKey ORES_NETHERITE_SCRAP = register("ores/netherite_scrap"); - public static final TagKey ORES_QUARTZ = register("ores/quartz"); + public static final TagKey NETHERITE_SCRAP_ORES = register("ores/netherite_scrap"); + public static final TagKey QUARTZ_ORES = register("ores/quartz"); // Gems - vanilla instances - public static final TagKey GEMS_QUARTZ = register("gems/quartz"); - public static final TagKey GEMS_LAPIS = register("gems/lapis"); - public static final TagKey GEMS_DIAMOND = register("gems/diamond"); - public static final TagKey GEMS_AMETHYST = register("gems/amethyst"); - public static final TagKey GEMS_EMERALD = register("gems/emerald"); - public static final TagKey GEMS_PRISMARINE = register("gems/prismarine"); + public static final TagKey QUARTZ_GEMS = register("gems/quartz"); + public static final TagKey LAPIS_GEMS = register("gems/lapis"); + public static final TagKey DIAMOND_GEMS = register("gems/diamond"); + public static final TagKey AMETHYST_GEMS = register("gems/amethyst"); + public static final TagKey EMERALD_GEMS = register("gems/emerald"); + public static final TagKey PRISMARINE_GEMS = register("gems/prismarine"); // Dusts and Misc - vanilla instances - public static final TagKey DUSTS_REDSTONE = register("dusts/redstone"); - public static final TagKey DUSTS_GLOWSTONE = register("dusts/glowstone"); + public static final TagKey REDSTONE_DUSTS = register("dusts/redstone"); + public static final TagKey GLOWSTONE_DUSTS = register("dusts/glowstone"); public static final TagKey COAL = register("coal"); // Consumables @@ -88,14 +88,14 @@ private ConventionalItemTags() { /** * Does not include entity water buckets. */ - public static final TagKey BUCKETS_WATER = register("buckets/water"); - public static final TagKey BUCKETS_ENTITY_WATER = register("buckets/entity_water"); - public static final TagKey BUCKETS_LAVA = register("buckets/lava"); - public static final TagKey BUCKETS_MILK = register("buckets/milk"); - public static final TagKey BUCKETS_EMPTY = register("buckets/empty"); + public static final TagKey WATER_BUCKETS = register("buckets/water"); + public static final TagKey ENTITY_WATER_BUCKETS = register("buckets/entity_water"); + public static final TagKey LAVA_BUCKETS = register("buckets/lava"); + public static final TagKey MILK_BUCKETS = register("buckets/milk"); + public static final TagKey EMPTY_BUCKETS = register("buckets/empty"); public static final TagKey BARRELS = register("barrels"); - public static final TagKey BARRELS_WOODEN = register("barrels/wooden"); + public static final TagKey WOODEN_BARRELS = register("barrels/wooden"); public static final TagKey BOOKSHELVES = register("bookshelves"); public static final TagKey CHESTS = register("chests"); public static final TagKey GLASS_BLOCKS = register("glass_blocks"); @@ -110,53 +110,53 @@ private ConventionalItemTags() { public static final TagKey VILLAGER_JOB_SITES = register("villager_job_sites"); // Sandstone - public static final TagKey SANDSTONE_BLOCKS = register("sandstone/blocks"); - public static final TagKey SANDSTONE_SLABS = register("sandstone/slabs"); - public static final TagKey SANDSTONE_STAIRS = register("sandstone/stairs"); - public static final TagKey SANDSTONE_RED_BLOCKS = register("sandstone/red_blocks"); - public static final TagKey SANDSTONE_RED_SLABS = register("sandstone/red_slabs"); - public static final TagKey SANDSTONE_RED_STAIRS = register("sandstone/red_stairs"); - public static final TagKey SANDSTONE_UNCOLORED_BLOCKS = register("sandstone/uncolored_blocks"); - public static final TagKey SANDSTONE_UNCOLORED_SLABS = register("sandstone/uncolored_slabs"); - public static final TagKey SANDSTONE_UNCOLORED_STAIRS = register("sandstone/uncolored_stairs"); + public static final TagKey BLOCKS_SANDSTONE = register("sandstone/blocks"); + public static final TagKey SLABS_SANDSTONE = register("sandstone/slabs"); + public static final TagKey STAIRS_SANDSTONE = register("sandstone/stairs"); + public static final TagKey RED_BLOCKS_SANDSTONE = register("sandstone/red_blocks"); + public static final TagKey RED_SLABS_SANDSTONE = register("sandstone/red_slabs"); + public static final TagKey RED_STAIRS_SANDSTONE = register("sandstone/red_stairs"); + public static final TagKey UNCOLORED_BLOCKS_SANDSTONE = register("sandstone/uncolored_blocks"); + public static final TagKey UNCOLORED_SLABS_SANDSTONE = register("sandstone/uncolored_slabs"); + public static final TagKey UNCOLORED_STAIRS_SANDSTONE = register("sandstone/uncolored_stairs"); // Dyes public static final TagKey DYES = register("dyes"); - public static final TagKey DYES_BLACK = register("dyes/black"); - public static final TagKey DYES_BLUE = register("dyes/blue"); - public static final TagKey DYES_BROWN = register("dyes/brown"); - public static final TagKey DYES_CYAN = register("dyes/cyan"); - public static final TagKey DYES_GRAY = register("dyes/gray"); - public static final TagKey DYES_GREEN = register("dyes/green"); - public static final TagKey DYES_LIGHT_BLUE = register("dyes/light_blue"); - public static final TagKey DYES_LIGHT_GRAY = register("dyes/light_gray"); - public static final TagKey DYES_LIME = register("dyes/lime"); - public static final TagKey DYES_MAGENTA = register("dyes/magenta"); - public static final TagKey DYES_ORANGE = register("dyes/orange"); - public static final TagKey DYES_PINK = register("dyes/pink"); - public static final TagKey DYES_PURPLE = register("dyes/purple"); - public static final TagKey DYES_RED = register("dyes/red"); - public static final TagKey DYES_WHITE = register("dyes/white"); - public static final TagKey DYES_YELLOW = register("dyes/yellow"); + public static final TagKey BLACK_DYES = register("dyes/black"); + public static final TagKey BLUE_DYES = register("dyes/blue"); + public static final TagKey BROWN_DYES = register("dyes/brown"); + public static final TagKey CYAN_DYES = register("dyes/cyan"); + public static final TagKey GRAY_DYES = register("dyes/gray"); + public static final TagKey GREEN_DYES = register("dyes/green"); + public static final TagKey LIGHT_BLUE_DYES = register("dyes/light_blue"); + public static final TagKey LIGHT_GRAY_DYES = register("dyes/light_gray"); + public static final TagKey LIME_DYES = register("dyes/lime"); + public static final TagKey MAGENTA_DYES = register("dyes/magenta"); + public static final TagKey ORANGE_DYES = register("dyes/orange"); + public static final TagKey PINK_DYES = register("dyes/pink"); + public static final TagKey PURPLE_DYES = register("dyes/purple"); + public static final TagKey RED_DYES = register("dyes/red"); + public static final TagKey WHITE_DYES = register("dyes/white"); + public static final TagKey YELLOW_DYES = register("dyes/yellow"); // Items created with dyes public static final TagKey DYED_ITEMS = register("dyed_items"); - public static final TagKey DYED_ITEMS_BLACK = register("dyed_items/black"); - public static final TagKey DYED_ITEMS_BLUE = register("dyed_items/blue"); - public static final TagKey DYED_ITEMS_BROWN = register("dyed_items/brown"); - public static final TagKey DYED_ITEMS_CYAN = register("dyed_items/cyan"); - public static final TagKey DYED_ITEMS_GRAY = register("dyed_items/gray"); - public static final TagKey DYED_ITEMS_GREEN = register("dyed_items/green"); - public static final TagKey DYED_ITEMS_LIGHT_BLUE = register("dyed_items/light_blue"); - public static final TagKey DYED_ITEMS_LIGHT_GRAY = register("dyed_items/light_gray"); - public static final TagKey DYED_ITEMS_LIME = register("dyed_items/lime"); - public static final TagKey DYED_ITEMS_MAGENTA = register("dyed_items/magenta"); - public static final TagKey DYED_ITEMS_ORANGE = register("dyed_items/orange"); - public static final TagKey DYED_ITEMS_PINK = register("dyed_items/pink"); - public static final TagKey DYED_ITEMS_PURPLE = register("dyed_items/purple"); - public static final TagKey DYED_ITEMS_RED = register("dyed_items/red"); - public static final TagKey DYED_ITEMS_WHITE = register("dyed_items/white"); - public static final TagKey DYED_ITEMS_YELLOW = register("dyed_items/yellow"); + public static final TagKey BLACK_DYED_ITEMS = register("dyed_items/black"); + public static final TagKey BLUE_DYED_ITEMS = register("dyed_items/blue"); + public static final TagKey BROWN_DYED_ITEMS = register("dyed_items/brown"); + public static final TagKey CYAN_DYED_ITEMS = register("dyed_items/cyan"); + public static final TagKey GRAY_DYED_ITEMS = register("dyed_items/gray"); + public static final TagKey GREEN_DYED_ITEMS = register("dyed_items/green"); + public static final TagKey LIGHT_BLUE_DYED_ITEMS = register("dyed_items/light_blue"); + public static final TagKey LIGHT_GRAY_DYED_ITEMS = register("dyed_items/light_gray"); + public static final TagKey LIME_DYED_ITEMS = register("dyed_items/lime"); + public static final TagKey MAGENTA_DYED_ITEMS = register("dyed_items/magenta"); + public static final TagKey ORANGE_DYED_ITEMS = register("dyed_items/orange"); + public static final TagKey PINK_DYED_ITEMS = register("dyed_items/pink"); + public static final TagKey PURPLE_DYED_ITEMS = register("dyed_items/purple"); + public static final TagKey RED_DYED_ITEMS = register("dyed_items/red"); + public static final TagKey WHITE_DYED_ITEMS = register("dyed_items/white"); + public static final TagKey YELLOW_DYED_ITEMS = register("dyed_items/yellow"); private static TagKey register(String tagID) { return TagRegistration.ITEM_TAG_REGISTRATION.registerCommon(tagID); From cab27e5bf406ae156fd377dae0e01a61ad83ea67 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 10 Sep 2023 15:46:51 -0400 Subject: [PATCH 015/123] Split out non-clientside warning to its own init --- .../client/ConventionLogWarnings.java | 216 ------------------ .../client/ConventionLogWarningsClient.java | 95 ++++++++ .../ConventionLogWarningConfigs.java | 99 ++++++++ .../tag/convention/ConventionLogWarnings.java | 93 ++++++++ .../src/main/resources/fabric.mod.json | 5 +- 5 files changed, 291 insertions(+), 217 deletions(-) delete mode 100644 fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java create mode 100644 fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java create mode 100644 fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java create mode 100644 fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java diff --git a/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java b/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java deleted file mode 100644 index bf3af2d94d..0000000000 --- a/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarnings.java +++ /dev/null @@ -1,216 +0,0 @@ -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.fabricmc.fabric.impl.tag.convention.client; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.List; -import java.util.Properties; - -import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import net.minecraft.client.resource.language.I18n; -import net.minecraft.item.Item; -import net.minecraft.registry.DynamicRegistryManager; -import net.minecraft.registry.Registry; -import net.minecraft.registry.RegistryKeys; -import net.minecraft.registry.tag.TagKey; - -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; -import net.fabricmc.fabric.api.tag.convention.v1.TagUtil; -import net.fabricmc.loader.api.FabricLoader; - -public class ConventionLogWarnings implements ClientModInitializer { - public static final Logger LOGGER = LoggerFactory.getLogger(ConventionLogWarnings.class); - /** - * A config option mainly for developers. - * Logs out modded item tags that do not have translations when running on integrated server. - * Defaults to DEV_SHORT. - */ - private static final LOG_WARNING_MODES LOG_UNTRANSLATED_WARNING_MODE; - /** - * A config option mainly for developers. - * Logs out modded tags that are using the 'c' namespace when running on integrated server. - * Defaults to DEV_SHORT. - */ - private static final LOG_WARNING_MODES LOG_LEGACY_WARNING_MODE; - - private enum LOG_WARNING_MODES { - SILENCED, - DEV_SHORT, - DEV_VERBOSE, - PROD_SHORT, - PROD_VERBOSE - } - - static { - File configDir = FabricLoader.getInstance().getConfigDir().resolve("fabric").toFile(); - - if (!configDir.exists()) { - if (!configDir.mkdir()) { - LOGGER.warn("[Fabric Tag Conventions v1] Could not create configuration directory: " + configDir.getAbsolutePath()); - } - } - - File configFile = new File(configDir, "fabric-tag-conventions-v1.properties"); - Properties properties = new Properties(); - - if (configFile.exists()) { - try (FileInputStream stream = new FileInputStream(configFile)) { - properties.load(stream); - } catch (IOException e) { - LOGGER.warn("[Fabric Tag Conventions v1] Could not read property file '" + configFile.getAbsolutePath() + "'", e); - } - } - - LOG_UNTRANSLATED_WARNING_MODE = asEnum((String) properties.computeIfAbsent("log-untranslated-item-tag-warnings", (a) -> "DEV_SHORT"), LOG_WARNING_MODES.DEV_SHORT); - LOG_LEGACY_WARNING_MODE = asEnum((String) properties.computeIfAbsent("log-legacy-tag-warnings", (a) -> "DEV_SHORT"), LOG_WARNING_MODES.DEV_SHORT); - - try (FileOutputStream stream = new FileOutputStream(configFile)) { - properties.store(stream, "Fabric Tag Conventions v1 properties file"); - } catch (IOException e) { - LOGGER.warn("[Fabric Tag Conventions v1] Could not store property file '" + configFile.getAbsolutePath() + "'", e); - } - } - - @Override - public void onInitializeClient() { - if (LOG_UNTRANSLATED_WARNING_MODE != LOG_WARNING_MODES.SILENCED) setupUntranslatedItemTagWarning(); - if (LOG_LEGACY_WARNING_MODE != LOG_WARNING_MODES.SILENCED) setupLegacyTagWarning(); - } - - private static void setupUntranslatedItemTagWarning() { - // Log missing item tag translations only in development environment and not running dedicated server. - ServerLifecycleEvents.SERVER_STARTED.register(server -> { - boolean isConfigSetToDev = - LOG_UNTRANSLATED_WARNING_MODE == LOG_WARNING_MODES.DEV_SHORT - || LOG_UNTRANSLATED_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE; - - if (FabricLoader.getInstance().isDevelopmentEnvironment() == isConfigSetToDev) { - Registry itemRegistry = server.getRegistryManager().get(RegistryKeys.ITEM); - List> untranslatedItemTags = new ObjectArrayList<>(); - itemRegistry.streamTags().forEach(itemTagKey -> { - // We do not translate vanilla's tags at this moment. - if (itemTagKey.id().getNamespace().equals("minecraft")) { - return; - } - - String translationKey = TagUtil.getTagTranslationKey(itemTagKey); - - if (!I18n.hasTranslation(translationKey)) { - untranslatedItemTags.add(itemTagKey); - } - }); - - if (!untranslatedItemTags.isEmpty()) { - StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append(""" - \n Dev warning - Untranslated Item Tags detected. Please translate your item tags so other mods such as recipe viewers can properly display your tag's name. - You can disable this dev message in Fabric API's properties config file by setting log-untranslated-item-tag-warning to "SILENCED" or see individual tags with "DEV_VERBOSE". - """); - - // Print out all untranslated tags when desired. - boolean isConfigSetToVerbose = - LOG_UNTRANSLATED_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE - || LOG_UNTRANSLATED_WARNING_MODE == LOG_WARNING_MODES.PROD_VERBOSE; - - if (isConfigSetToVerbose) { - stringBuilder.append("\nUntranslated item tags:"); - - for (TagKey tagKey : untranslatedItemTags) { - stringBuilder.append("\n ").append(tagKey.id()); - } - } - - LOGGER.warn(stringBuilder.toString()); - } - } - }); - } - - // Remove in 1.22 - private static void setupLegacyTagWarning() { - // Log tags that are still using legacy 'c' namespace - ServerLifecycleEvents.SERVER_STARTED.register(server -> { - boolean isConfigSetToDev = - LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_SHORT - || LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE; - - if (FabricLoader.getInstance().isDevelopmentEnvironment() == isConfigSetToDev) { - List> legacyTags = new ObjectArrayList<>(); - DynamicRegistryManager.Immutable dynamicRegistries = server.getRegistryManager(); - - // We only care about vanilla registries - dynamicRegistries.streamAllRegistries().forEach(registryEntry -> { - if (registryEntry.key().getValue().getNamespace().equals("minecraft")) { - registryEntry.value().streamTags().forEach(tagKey -> { - // Grab tags under 'c' namespace - if (tagKey.id().getNamespace().equals("c")) { - legacyTags.add(tagKey); - } - }); - } - }); - - if (!legacyTags.isEmpty()) { - StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append(""" - \n Dev warning - Legacy Tags detected. Please migrate your 'c' namespace tags to 'common' namespace! See classes under net.fabricmc.fabric.api.tag.convention.v1 package for all tags. - NOTE: Many tags have been moved around or renamed. Some new ones were added so please review the new tags. And make sure you follow tag conventions for new tags! - You can disable this message in Fabric API's properties config file by setting log-legacy-tag-warnings to "SILENCED" or see individual tags with "DEV_VERBOSE". - """); - - // Print out all legacy tags when desired. - boolean isConfigSetToVerbose = - LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE - || LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.PROD_VERBOSE; - - if (isConfigSetToVerbose) { - stringBuilder.append("\nLegacy tags:"); - - for (TagKey tagKey : legacyTags) { - stringBuilder.append("\n ").append(tagKey); - } - } - - LOGGER.warn(stringBuilder.toString()); - } - } - }); - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - private static T asEnum(String property, T defValue) { - if (property == null || property.isEmpty()) { - return defValue; - } else { - for (Enum obj : defValue.getClass().getEnumConstants()) { - if (property.equalsIgnoreCase(obj.name())) { - //noinspection unchecked - return (T) obj; - } - } - - return defValue; - } - } -} diff --git a/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java b/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java new file mode 100644 index 0000000000..09d187b3fa --- /dev/null +++ b/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.impl.tag.convention.client; + +import static net.fabricmc.fabric.impl.tag.convention.ConventionLogWarningConfigs.LOG_WARNING_MODES; +import static net.fabricmc.fabric.impl.tag.convention.ConventionLogWarningConfigs.LOG_UNTRANSLATED_WARNING_MODE; + +import java.util.List; + +import it.unimi.dsi.fastutil.objects.ObjectArrayList; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import net.minecraft.client.resource.language.I18n; +import net.minecraft.item.Item; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.tag.TagKey; + +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; +import net.fabricmc.fabric.api.tag.convention.v1.TagUtil; +import net.fabricmc.loader.api.FabricLoader; + +public class ConventionLogWarningsClient implements ClientModInitializer { + public static final Logger LOGGER = LoggerFactory.getLogger(ConventionLogWarningsClient.class); + + @Override + public void onInitializeClient() { + if (LOG_UNTRANSLATED_WARNING_MODE != LOG_WARNING_MODES.SILENCED) setupUntranslatedItemTagWarning(); + } + + private static void setupUntranslatedItemTagWarning() { + // Log missing item tag translations only in development environment and not running dedicated server. + ServerLifecycleEvents.SERVER_STARTED.register(server -> { + boolean isConfigSetToDev = + LOG_UNTRANSLATED_WARNING_MODE == LOG_WARNING_MODES.DEV_SHORT + || LOG_UNTRANSLATED_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE; + + if (FabricLoader.getInstance().isDevelopmentEnvironment() == isConfigSetToDev) { + Registry itemRegistry = server.getRegistryManager().get(RegistryKeys.ITEM); + List> untranslatedItemTags = new ObjectArrayList<>(); + itemRegistry.streamTags().forEach(itemTagKey -> { + // We do not translate vanilla's tags at this moment. + if (itemTagKey.id().getNamespace().equals("minecraft")) { + return; + } + + String translationKey = TagUtil.getTagTranslationKey(itemTagKey); + + if (!I18n.hasTranslation(translationKey)) { + untranslatedItemTags.add(itemTagKey); + } + }); + + if (!untranslatedItemTags.isEmpty()) { + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append(""" + \n Dev warning - Untranslated Item Tags detected. Please translate your item tags so other mods such as recipe viewers can properly display your tag's name. + You can disable this dev message in Fabric API's properties config file by setting log-untranslated-item-tag-warning to "SILENCED" or see individual tags with "DEV_VERBOSE". + """); + + // Print out all untranslated tags when desired. + boolean isConfigSetToVerbose = + LOG_UNTRANSLATED_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE + || LOG_UNTRANSLATED_WARNING_MODE == LOG_WARNING_MODES.PROD_VERBOSE; + + if (isConfigSetToVerbose) { + stringBuilder.append("\nUntranslated item tags:"); + + for (TagKey tagKey : untranslatedItemTags) { + stringBuilder.append("\n ").append(tagKey.id()); + } + } + + LOGGER.warn(stringBuilder.toString()); + } + } + }); + } +} diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java new file mode 100644 index 0000000000..387033dd42 --- /dev/null +++ b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.impl.tag.convention; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Properties; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import net.fabricmc.loader.api.FabricLoader; + +public class ConventionLogWarningConfigs { + public static final Logger LOGGER = LoggerFactory.getLogger(ConventionLogWarningConfigs.class); + + /** + * A config option mainly for developers. + * Logs out modded item tags that do not have translations when running on integrated server. + * Defaults to DEV_SHORT. + */ + public static final LOG_WARNING_MODES LOG_UNTRANSLATED_WARNING_MODE; + /** + * A config option mainly for developers. + * Logs out modded tags that are using the 'c' namespace when running on integrated server or dedicated server. + * Defaults to DEV_SHORT. + */ + public static final LOG_WARNING_MODES LOG_LEGACY_WARNING_MODE; + + public enum LOG_WARNING_MODES { + SILENCED, + DEV_SHORT, + DEV_VERBOSE, + PROD_SHORT, + PROD_VERBOSE + } + + static { + File configDir = FabricLoader.getInstance().getConfigDir().resolve("fabric").toFile(); + + if (!configDir.exists()) { + if (!configDir.mkdir()) { + LOGGER.warn("[Fabric Tag Conventions v1] Could not create configuration directory: " + configDir.getAbsolutePath()); + } + } + + File configFile = new File(configDir, "fabric-tag-conventions-v1.properties"); + Properties properties = new Properties(); + + if (configFile.exists()) { + try (FileInputStream stream = new FileInputStream(configFile)) { + properties.load(stream); + } catch (IOException e) { + LOGGER.warn("[Fabric Tag Conventions v1] Could not read property file '" + configFile.getAbsolutePath() + "'", e); + } + } + + LOG_UNTRANSLATED_WARNING_MODE = asEnum((String) properties.computeIfAbsent("log-untranslated-item-tag-warnings", (a) -> "DEV_SHORT"), LOG_WARNING_MODES.DEV_SHORT); + LOG_LEGACY_WARNING_MODE = asEnum((String) properties.computeIfAbsent("log-legacy-tag-warnings", (a) -> "DEV_SHORT"), LOG_WARNING_MODES.DEV_SHORT); + + try (FileOutputStream stream = new FileOutputStream(configFile)) { + properties.store(stream, "Fabric Tag Conventions v1 properties file"); + } catch (IOException e) { + LOGGER.warn("[Fabric Tag Conventions v1] Could not store property file '" + configFile.getAbsolutePath() + "'", e); + } + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + private static T asEnum(String property, T defValue) { + if (property == null || property.isEmpty()) { + return defValue; + } else { + for (Enum obj : defValue.getClass().getEnumConstants()) { + if (property.equalsIgnoreCase(obj.name())) { + //noinspection unchecked + return (T) obj; + } + } + + return defValue; + } + } +} diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java new file mode 100644 index 0000000000..851d26518d --- /dev/null +++ b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.impl.tag.convention; + +import static net.fabricmc.fabric.impl.tag.convention.ConventionLogWarningConfigs.LOG_LEGACY_WARNING_MODE; +import static net.fabricmc.fabric.impl.tag.convention.ConventionLogWarningConfigs.LOG_WARNING_MODES; + +import java.util.List; + +import it.unimi.dsi.fastutil.objects.ObjectArrayList; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import net.minecraft.registry.DynamicRegistryManager; +import net.minecraft.registry.tag.TagKey; + +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; +import net.fabricmc.loader.api.FabricLoader; + +public class ConventionLogWarnings implements ModInitializer { + public static final Logger LOGGER = LoggerFactory.getLogger(ConventionLogWarnings.class); + + @Override + public void onInitialize() { + if (LOG_LEGACY_WARNING_MODE != LOG_WARNING_MODES.SILENCED) setupLegacyTagWarning(); + } + + // Remove in 1.22 + private static void setupLegacyTagWarning() { + // Log tags that are still using legacy 'c' namespace + ServerLifecycleEvents.SERVER_STARTED.register(server -> { + boolean isConfigSetToDev = + LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_SHORT + || LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE; + + if (FabricLoader.getInstance().isDevelopmentEnvironment() == isConfigSetToDev) { + List> legacyTags = new ObjectArrayList<>(); + DynamicRegistryManager.Immutable dynamicRegistries = server.getRegistryManager(); + + // We only care about vanilla registries + dynamicRegistries.streamAllRegistries().forEach(registryEntry -> { + if (registryEntry.key().getValue().getNamespace().equals("minecraft")) { + registryEntry.value().streamTags().forEach(tagKey -> { + // Grab tags under 'c' namespace + if (tagKey.id().getNamespace().equals("c")) { + legacyTags.add(tagKey); + } + }); + } + }); + + if (!legacyTags.isEmpty()) { + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append(""" + \n Dev warning - Legacy Tags detected. Please migrate your 'c' namespace tags to 'common' namespace! See classes under net.fabricmc.fabric.api.tag.convention.v1 package for all tags. + NOTE: Many tags have been moved around or renamed. Some new ones were added so please review the new tags. And make sure you follow tag conventions for new tags! + You can disable this message in Fabric API's properties config file by setting log-legacy-tag-warnings to "SILENCED" or see individual tags with "DEV_VERBOSE". + """); + + // Print out all legacy tags when desired. + boolean isConfigSetToVerbose = + LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE + || LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.PROD_VERBOSE; + + if (isConfigSetToVerbose) { + stringBuilder.append("\nLegacy tags:"); + + for (TagKey tagKey : legacyTags) { + stringBuilder.append("\n ").append(tagKey); + } + } + + LOGGER.warn(stringBuilder.toString()); + } + } + }); + } +} diff --git a/fabric-convention-tags-v1/src/main/resources/fabric.mod.json b/fabric-convention-tags-v1/src/main/resources/fabric.mod.json index a69031c1e5..df3a4aad55 100644 --- a/fabric-convention-tags-v1/src/main/resources/fabric.mod.json +++ b/fabric-convention-tags-v1/src/main/resources/fabric.mod.json @@ -16,8 +16,11 @@ "FabricMC" ], "entrypoints": { + "main": [ + "net.fabricmc.fabric.impl.tag.convention.ConventionLogWarnings" + ], "client": [ - "net.fabricmc.fabric.impl.tag.convention.client.ConventionLogWarnings" + "net.fabricmc.fabric.impl.tag.convention.client.ConventionLogWarningsClient" ] }, "depends": { From a1df3d17e90ab686f5e045928984b67db7dcf6c2 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Tue, 12 Sep 2023 21:21:13 -0400 Subject: [PATCH 016/123] Make tag switch no longer a code breaking change --- CONTRIBUTING.md | 2 +- .../fabric-convention-tags-v1/build.gradle | 3 + .../convention/v1/ConventionalBiomeTags.java | 139 ++++++++++++ .../convention/v1/ConventionalBlockTags.java | 73 ++++++ .../v1/ConventionalEnchantmentTags.java | 58 +++++ .../v1/ConventionalEntityTypeTags.java | 42 ++++ .../convention/v1/ConventionalFluidTags.java | 39 ++++ .../convention/v1/ConventionalItemTags.java | 156 +++++++++++++ .../fabric/api/tag/convention/v1/TagUtil.java | 72 ++++++ .../impl/tag/convention/TagRegistration.java | 58 +++++ .../assets/fabric-convention-tags-v1/icon.png | Bin .../src/main/resources/fabric.mod.json | 26 +++ fabric-client-tags-api-v1/build.gradle | 2 +- .../fabric/api/tag/client/v1/ClientTags.java | 2 +- .../test/tag/client/v1/ClientTagTest.java | 6 +- .../testmodClient/resources/fabric.mod.json | 2 +- .../lang/en_us.json | 209 ------------------ .../.gitignore | 0 .../build.gradle | 0 .../client/ConventionLogWarningsClient.java | 2 +- .../convention/datagen/DatagenEntrypoint.java | 0 .../datagen/generators/BiomeTagGenerator.java | 2 +- .../BlockEntityTypeTagGenerator.java | 2 +- .../datagen/generators/BlockTagGenerator.java | 2 +- .../generators/EnchantmentTagGenerator.java | 2 +- .../generators/EnglishTagLangGenerator.java | 14 +- .../generators/EntityTypeTagGenerator.java | 2 +- .../datagen/generators/FluidTagGenerator.java | 2 +- .../datagen/generators/ItemTagGenerator.java | 4 +- .../src/datagen/resources/fabric.mod.json | 4 +- .../lang/en_us.json | 209 ++++++++++++++++++ .../relocation_not_supported.json | 0 .../data/common/tags/blocks/barrels.json | 0 .../common/tags/blocks/barrels/wooden.json | 0 .../data/common/tags/blocks/bookshelves.json | 0 .../common/tags/blocks/budding_blocks.json | 0 .../data/common/tags/blocks/buds.json | 0 .../data/common/tags/blocks/chests.json | 0 .../data/common/tags/blocks/clusters.json | 0 .../data/common/tags/blocks/dyed_blocks.json | 0 .../common/tags/blocks/dyed_blocks/black.json | 0 .../common/tags/blocks/dyed_blocks/blue.json | 0 .../common/tags/blocks/dyed_blocks/brown.json | 0 .../common/tags/blocks/dyed_blocks/cyan.json | 0 .../common/tags/blocks/dyed_blocks/gray.json | 0 .../common/tags/blocks/dyed_blocks/green.json | 0 .../tags/blocks/dyed_blocks/light_blue.json | 0 .../tags/blocks/dyed_blocks/light_gray.json | 0 .../common/tags/blocks/dyed_blocks/lime.json | 0 .../tags/blocks/dyed_blocks/magenta.json | 0 .../tags/blocks/dyed_blocks/orange.json | 0 .../common/tags/blocks/dyed_blocks/pink.json | 0 .../tags/blocks/dyed_blocks/purple.json | 0 .../common/tags/blocks/dyed_blocks/red.json | 0 .../common/tags/blocks/dyed_blocks/white.json | 0 .../tags/blocks/dyed_blocks/yellow.json | 0 .../data/common/tags/blocks/glass_blocks.json | 0 .../data/common/tags/blocks/glass_panes.json | 0 .../data/common/tags/blocks/ores.json | 0 .../tags/blocks/ores/netherite_scrap.json | 0 .../data/common/tags/blocks/ores/quartz.json | 0 .../tags/blocks/relocation_not_supported.json | 0 .../common/tags/blocks/sandstone/blocks.json | 0 .../tags/blocks/sandstone/red_blocks.json | 0 .../tags/blocks/sandstone/red_slabs.json | 0 .../tags/blocks/sandstone/red_stairs.json | 0 .../common/tags/blocks/sandstone/slabs.json | 0 .../common/tags/blocks/sandstone/stairs.json | 0 .../blocks/sandstone/uncolored_blocks.json | 0 .../blocks/sandstone/uncolored_slabs.json | 0 .../blocks/sandstone/uncolored_stairs.json | 0 .../common/tags/blocks/shulker_boxes.json | 0 .../tags/blocks/villager_job_sites.json | 0 .../entity_defense_enhancement.json | 0 .../entity_movement_enhancement.json | 0 .../data/common/tags/enchantment/fortune.json | 0 .../data/common/tags/enchantment/looting.json | 0 .../weapon_damage_enhancement.json | 0 .../data/common/tags/entity_types/boats.json | 0 .../data/common/tags/entity_types/bosses.json | 0 .../entity_types/capturing_not_supported.json | 0 .../common/tags/entity_types/minecarts.json | 0 .../data/common/tags/fluids/honey.json | 0 .../data/common/tags/fluids/lava.json | 0 .../data/common/tags/fluids/milk.json | 0 .../data/common/tags/fluids/water.json | 0 .../data/common/tags/items/barrels.json | 0 .../common/tags/items/barrels/wooden.json | 0 .../data/common/tags/items/bookshelves.json | 0 .../data/common/tags/items/buckets/empty.json | 0 .../tags/items/buckets/entity_water.json | 0 .../data/common/tags/items/buckets/lava.json | 0 .../data/common/tags/items/buckets/milk.json | 0 .../data/common/tags/items/buckets/water.json | 0 .../common/tags/items/budding_blocks.json | 0 .../data/common/tags/items/buds.json | 0 .../data/common/tags/items/chests.json | 0 .../data/common/tags/items/clusters.json | 0 .../data/common/tags/items/coal.json | 0 .../data/common/tags/items/dusts.json | 0 .../common/tags/items/dusts/glowstone.json | 0 .../common/tags/items/dusts/redstone.json | 0 .../data/common/tags/items/dyed_items.json | 0 .../common/tags/items/dyed_items/black.json | 0 .../common/tags/items/dyed_items/blue.json | 0 .../common/tags/items/dyed_items/brown.json | 0 .../common/tags/items/dyed_items/cyan.json | 0 .../common/tags/items/dyed_items/gray.json | 0 .../common/tags/items/dyed_items/green.json | 0 .../tags/items/dyed_items/light_blue.json | 0 .../tags/items/dyed_items/light_gray.json | 0 .../common/tags/items/dyed_items/lime.json | 0 .../common/tags/items/dyed_items/magenta.json | 0 .../common/tags/items/dyed_items/orange.json | 0 .../common/tags/items/dyed_items/pink.json | 0 .../common/tags/items/dyed_items/purple.json | 0 .../common/tags/items/dyed_items/red.json | 0 .../common/tags/items/dyed_items/white.json | 0 .../common/tags/items/dyed_items/yellow.json | 0 .../data/common/tags/items/dyes.json | 0 .../data/common/tags/items/dyes/black.json | 0 .../data/common/tags/items/dyes/blue.json | 0 .../data/common/tags/items/dyes/brown.json | 0 .../data/common/tags/items/dyes/cyan.json | 0 .../data/common/tags/items/dyes/gray.json | 0 .../data/common/tags/items/dyes/green.json | 0 .../common/tags/items/dyes/light_blue.json | 0 .../common/tags/items/dyes/light_gray.json | 0 .../data/common/tags/items/dyes/lime.json | 0 .../data/common/tags/items/dyes/magenta.json | 0 .../data/common/tags/items/dyes/orange.json | 0 .../data/common/tags/items/dyes/pink.json | 0 .../data/common/tags/items/dyes/purple.json | 0 .../data/common/tags/items/dyes/red.json | 0 .../data/common/tags/items/dyes/white.json | 0 .../data/common/tags/items/dyes/yellow.json | 0 .../data/common/tags/items/foods.json | 0 .../data/common/tags/items/gems.json | 0 .../data/common/tags/items/gems/amethyst.json | 0 .../data/common/tags/items/gems/diamond.json | 0 .../data/common/tags/items/gems/emerald.json | 0 .../data/common/tags/items/gems/lapis.json | 0 .../common/tags/items/gems/prismarine.json | 0 .../data/common/tags/items/gems/quartz.json | 0 .../data/common/tags/items/glass_blocks.json | 0 .../data/common/tags/items/glass_panes.json | 0 .../data/common/tags/items/ingots.json | 0 .../data/common/tags/items/ingots/copper.json | 0 .../data/common/tags/items/ingots/gold.json | 0 .../data/common/tags/items/ingots/iron.json | 0 .../common/tags/items/ingots/netherite.json | 0 .../data/common/tags/items/nuggets.json | 0 .../data/common/tags/items/ores.json | 0 .../tags/items/ores/netherite_scrap.json | 0 .../data/common/tags/items/ores/quartz.json | 0 .../data/common/tags/items/potions.json | 0 .../data/common/tags/items/raw_blocks.json | 0 .../common/tags/items/raw_blocks/copper.json | 0 .../common/tags/items/raw_blocks/gold.json | 0 .../common/tags/items/raw_blocks/iron.json | 0 .../data/common/tags/items/raw_materials.json | 0 .../tags/items/raw_materials/copper.json | 0 .../common/tags/items/raw_materials/gold.json | 0 .../common/tags/items/raw_materials/iron.json | 0 .../common/tags/items/sandstone/blocks.json | 0 .../tags/items/sandstone/red_blocks.json | 0 .../tags/items/sandstone/red_slabs.json | 0 .../tags/items/sandstone/red_stairs.json | 0 .../common/tags/items/sandstone/slabs.json | 0 .../common/tags/items/sandstone/stairs.json | 0 .../items/sandstone/uncolored_blocks.json | 0 .../tags/items/sandstone/uncolored_slabs.json | 0 .../items/sandstone/uncolored_stairs.json | 0 .../data/common/tags/items/shulker_boxes.json | 0 .../data/common/tags/items/tools.json | 0 .../data/common/tags/items/tools/bows.json | 0 .../common/tags/items/tools/crossbows.json | 0 .../common/tags/items/tools/fishing_rods.json | 0 .../data/common/tags/items/tools/shears.json | 0 .../data/common/tags/items/tools/shields.json | 0 .../data/common/tags/items/tools/spears.json | 0 .../common/tags/items/villager_job_sites.json | 0 .../tags/worldgen/biome/is_aquatic.json | 0 .../tags/worldgen/biome/is_aquatic_icy.json | 0 .../tags/worldgen/biome/is_badlands.json | 0 .../common/tags/worldgen/biome/is_beach.json | 0 .../tags/worldgen/biome/is_birch_forest.json | 0 .../common/tags/worldgen/biome/is_cave.json | 0 .../common/tags/worldgen/biome/is_cold.json | 0 .../worldgen/biome/is_cold/overworld.json | 0 .../common/tags/worldgen/biome/is_dead.json | 0 .../tags/worldgen/biome/is_deep_ocean.json | 0 .../worldgen/biome/is_dense_vegetation.json | 0 .../biome/is_dense_vegetation/overworld.json | 0 .../common/tags/worldgen/biome/is_desert.json | 0 .../common/tags/worldgen/biome/is_dry.json | 0 .../tags/worldgen/biome/is_dry/overworld.json | 0 .../tags/worldgen/biome/is_end_island.json | 0 .../tags/worldgen/biome/is_extreme_hills.json | 0 .../common/tags/worldgen/biome/is_floral.json | 0 .../tags/worldgen/biome/is_flower_forest.json | 0 .../common/tags/worldgen/biome/is_forest.json | 0 .../common/tags/worldgen/biome/is_hot.json | 0 .../tags/worldgen/biome/is_hot/overworld.json | 0 .../common/tags/worldgen/biome/is_icy.json | 0 .../common/tags/worldgen/biome/is_jungle.json | 0 .../tags/worldgen/biome/is_mountain.json | 0 .../tags/worldgen/biome/is_mountain/peak.json | 0 .../worldgen/biome/is_mountain/slope.json | 0 .../tags/worldgen/biome/is_mushroom.json | 0 .../common/tags/worldgen/biome/is_nether.json | 0 .../tags/worldgen/biome/is_nether_forest.json | 0 .../common/tags/worldgen/biome/is_ocean.json | 0 .../tags/worldgen/biome/is_overworld.json | 0 .../common/tags/worldgen/biome/is_plains.json | 0 .../common/tags/worldgen/biome/is_river.json | 0 .../tags/worldgen/biome/is_savanna.json | 0 .../tags/worldgen/biome/is_shallow_ocean.json | 0 .../common/tags/worldgen/biome/is_snowy.json | 0 .../tags/worldgen/biome/is_snowy_plains.json | 0 .../worldgen/biome/is_sparse_vegetation.json | 0 .../biome/is_sparse_vegetation/overworld.json | 0 .../tags/worldgen/biome/is_stony_shores.json | 0 .../common/tags/worldgen/biome/is_swamp.json | 0 .../common/tags/worldgen/biome/is_taiga.json | 0 .../tags/worldgen/biome/is_temperate.json | 0 .../biome/is_temperate/overworld.json | 0 .../tags/worldgen/biome/is_the_end.json | 0 .../worldgen/biome/is_tree/coniferous.json | 0 .../worldgen/biome/is_tree/deciduous.json | 0 .../tags/worldgen/biome/is_tree/jungle.json | 0 .../tags/worldgen/biome/is_tree/savanna.json | 0 .../tags/worldgen/biome/is_underground.json | 0 .../common/tags/worldgen/biome/is_void.json | 0 .../tags/worldgen/biome/is_wasteland.json | 0 .../common/tags/worldgen/biome/is_wet.json | 0 .../tags/worldgen/biome/is_wet/overworld.json | 0 .../tags/worldgen/biome/is_windswept.json | 0 .../convention/v2}/ConventionalBiomeTags.java | 2 +- .../v2}/ConventionalBlockEntityTypeTags.java | 2 +- .../convention/v2}/ConventionalBlockTags.java | 2 +- .../v2}/ConventionalEnchantmentTags.java | 2 +- .../v2}/ConventionalEntityTypeTags.java | 2 +- .../convention/v2}/ConventionalFluidTags.java | 2 +- .../convention/v2}/ConventionalItemTags.java | 2 +- .../api/tag/convention/v2}/TagUtil.java | 2 +- .../ConventionLogWarningConfigs.java | 0 .../tag/convention/ConventionLogWarnings.java | 0 .../impl/tag/convention/TagRegistration.java | 0 .../assets/fabric-convention-tags-v1/icon.png | Bin 0 -> 1579 bytes .../src/main/resources/fabric.mod.json | 4 +- .../test/tag/convention/v1/TagUtilTest.java | 10 +- .../src/testmod/resources/fabric.mod.json | 2 +- fabric-data-generation-api-v1/build.gradle | 2 +- .../v1/provider/FabricLanguageProvider.java | 2 +- gradle.properties | 1 + settings.gradle | 3 +- 257 files changed, 921 insertions(+), 253 deletions(-) create mode 100644 deprecated/fabric-convention-tags-v1/build.gradle create mode 100644 deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java create mode 100644 deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java create mode 100644 deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEnchantmentTags.java create mode 100644 deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java create mode 100644 deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalFluidTags.java create mode 100644 deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java create mode 100644 deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java create mode 100644 deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java rename {fabric-convention-tags-v1 => deprecated/fabric-convention-tags-v1}/src/main/resources/assets/fabric-convention-tags-v1/icon.png (100%) create mode 100644 deprecated/fabric-convention-tags-v1/src/main/resources/fabric.mod.json delete mode 100644 fabric-convention-tags-v1/src/generated/resources/assets/fabric-convention-tags-v1-datagen/lang/en_us.json rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/.gitignore (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/build.gradle (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java (98%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java (99%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java (95%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java (99%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java (98%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java (97%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java (97%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java (97%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java (99%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/datagen/resources/fabric.mod.json (88%) create mode 100644 fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/block_entity_type/relocation_not_supported.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/barrels.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/barrels/wooden.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/bookshelves.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/budding_blocks.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/buds.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/chests.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/clusters.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/dyed_blocks.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/dyed_blocks/black.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/dyed_blocks/blue.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/dyed_blocks/brown.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/dyed_blocks/cyan.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/dyed_blocks/gray.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/dyed_blocks/green.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_blue.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_gray.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/dyed_blocks/lime.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/dyed_blocks/magenta.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/dyed_blocks/orange.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/dyed_blocks/pink.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/dyed_blocks/purple.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/dyed_blocks/red.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/dyed_blocks/white.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/dyed_blocks/yellow.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/glass_blocks.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/glass_panes.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/ores.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/ores/netherite_scrap.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/ores/quartz.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/relocation_not_supported.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/sandstone/blocks.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/sandstone/red_blocks.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/sandstone/red_slabs.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/sandstone/red_stairs.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/sandstone/slabs.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/sandstone/stairs.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_blocks.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_slabs.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_stairs.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/shulker_boxes.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/blocks/villager_job_sites.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/enchantment/entity_defense_enhancement.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/enchantment/entity_movement_enhancement.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/enchantment/fortune.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/enchantment/looting.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/enchantment/weapon_damage_enhancement.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/entity_types/boats.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/entity_types/bosses.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/entity_types/capturing_not_supported.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/entity_types/minecarts.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/fluids/honey.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/fluids/lava.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/fluids/milk.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/fluids/water.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/barrels.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/barrels/wooden.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/bookshelves.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/buckets/empty.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/buckets/entity_water.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/buckets/lava.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/buckets/milk.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/buckets/water.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/budding_blocks.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/buds.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/chests.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/clusters.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/coal.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dusts.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dusts/glowstone.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dusts/redstone.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyed_items.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyed_items/black.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyed_items/blue.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyed_items/brown.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyed_items/cyan.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyed_items/gray.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyed_items/green.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyed_items/light_blue.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyed_items/light_gray.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyed_items/lime.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyed_items/magenta.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyed_items/orange.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyed_items/pink.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyed_items/purple.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyed_items/red.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyed_items/white.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyed_items/yellow.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyes.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyes/black.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyes/blue.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyes/brown.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyes/cyan.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyes/gray.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyes/green.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyes/light_blue.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyes/light_gray.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyes/lime.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyes/magenta.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyes/orange.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyes/pink.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyes/purple.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyes/red.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyes/white.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/dyes/yellow.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/foods.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/gems.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/gems/amethyst.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/gems/diamond.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/gems/emerald.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/gems/lapis.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/gems/prismarine.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/gems/quartz.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/glass_blocks.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/glass_panes.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/ingots.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/ingots/copper.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/ingots/gold.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/ingots/iron.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/ingots/netherite.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/nuggets.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/ores.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/ores/netherite_scrap.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/ores/quartz.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/potions.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/raw_blocks.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/raw_blocks/copper.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/raw_blocks/gold.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/raw_blocks/iron.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/raw_materials.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/raw_materials/copper.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/raw_materials/gold.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/raw_materials/iron.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/sandstone/blocks.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/sandstone/red_blocks.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/sandstone/red_slabs.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/sandstone/red_stairs.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/sandstone/slabs.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/sandstone/stairs.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/sandstone/uncolored_blocks.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/sandstone/uncolored_slabs.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/sandstone/uncolored_stairs.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/shulker_boxes.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/tools.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/tools/bows.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/tools/crossbows.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/tools/fishing_rods.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/tools/shears.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/tools/shields.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/tools/spears.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/items/villager_job_sites.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic_icy.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_badlands.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_beach.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_birch_forest.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_cave.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_cold.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_cold/overworld.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_dead.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_deep_ocean.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation/overworld.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_desert.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_dry.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_dry/overworld.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_end_island.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_extreme_hills.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_floral.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_flower_forest.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_forest.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_hot.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_hot/overworld.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_icy.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_jungle.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_mountain.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/peak.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/slope.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_mushroom.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_nether.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_nether_forest.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_ocean.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_overworld.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_plains.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_river.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_savanna.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_shallow_ocean.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_snowy.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_snowy_plains.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation/overworld.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_stony_shores.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_swamp.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_taiga.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_temperate.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_temperate/overworld.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_the_end.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_tree/coniferous.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_tree/deciduous.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_tree/jungle.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_tree/savanna.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_underground.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_void.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_wasteland.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_wet.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_wet/overworld.json (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/generated/resources/data/common/tags/worldgen/biome/is_windswept.json (100%) rename {fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1 => fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2}/ConventionalBiomeTags.java (99%) rename {fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1 => fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2}/ConventionalBlockEntityTypeTags.java (96%) rename {fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1 => fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2}/ConventionalBlockTags.java (99%) rename {fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1 => fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2}/ConventionalEnchantmentTags.java (97%) rename {fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1 => fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2}/ConventionalEntityTypeTags.java (96%) rename {fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1 => fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2}/ConventionalFluidTags.java (96%) rename {fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1 => fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2}/ConventionalItemTags.java (99%) rename {fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1 => fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2}/TagUtil.java (98%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java (100%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java (100%) create mode 100644 fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v1/icon.png rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/main/resources/fabric.mod.json (90%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v1/TagUtilTest.java (87%) rename {fabric-convention-tags-v1 => fabric-convention-tags-v2}/src/testmod/resources/fabric.mod.json (89%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 688eb13c26..69ecc3559b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -287,7 +287,7 @@ Fabric API is organized in different modules. Each module is located in a specif - Module names should be named after the exposed functionality. - Consider future developments when naming a module: they might later be expanded. - Module names should usually be suffixed by `-api`. - - Modules whose primary purpose is not interaction with their API do not need this suffix. For example, `fabric-transitive-access-wideners-v1` or `fabric-convention-tags-v1`. + - Modules whose primary purpose is not interaction with their API do not need this suffix. For example, `fabric-transitive-access-wideners-v1` or `fabric-convention-tags-v2`. - Event modules should have the `-events` suffix instead. - Module names should always be suffixed by a major version (`-v1`, `-v2`, etc). - The major version starts at `v1` for new functionality, unless they replace a module with equivalent functionality, in which case the version is incremented. diff --git a/deprecated/fabric-convention-tags-v1/build.gradle b/deprecated/fabric-convention-tags-v1/build.gradle new file mode 100644 index 0000000000..a95a5a5ef9 --- /dev/null +++ b/deprecated/fabric-convention-tags-v1/build.gradle @@ -0,0 +1,3 @@ +version = getSubprojectVersion(project) + +moduleDependencies(project, ['fabric-api-base']) \ No newline at end of file diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java new file mode 100644 index 0000000000..508912bad4 --- /dev/null +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java @@ -0,0 +1,139 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.api.tag.convention.v1; + +import net.minecraft.registry.tag.TagKey; +import net.minecraft.world.biome.Biome; + +import net.fabricmc.fabric.impl.tag.convention.TagRegistration; + +/** + * @deprecated Please use {@link net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags} + */ +@Deprecated +public final class ConventionalBiomeTags { + private ConventionalBiomeTags() { + } + + /** + * Biomes that spawn in the Overworld. + */ + public static final TagKey IN_OVERWORLD = register("in_overworld"); + // The following are based on Biome categories, see Biome$Category for details + /** + * Biomes that spawn in the End. + */ + public static final TagKey IN_THE_END = register("in_the_end"); + /** + * Biomes that spawn in the Nether. + */ + public static final TagKey IN_NETHER = register("in_nether"); + public static final TagKey TAIGA = register("taiga"); + public static final TagKey EXTREME_HILLS = register("extreme_hills"); + public static final TagKey WINDSWEPT = register("windswept"); + public static final TagKey JUNGLE = register("jungle"); + public static final TagKey MESA = register("mesa"); + /** + * For temperate or warmer plains-like biomes. + * For snowy plains-like biomes, see {@link ConventionalBiomeTags#SNOWY_PLAINS}. + */ + public static final TagKey PLAINS = register("plains"); + public static final TagKey SAVANNA = register("savanna"); + /** + * For land biomes where ice naturally spawns. + * For biomes where snow alone spawns, see {@link ConventionalBiomeTags#SNOWY}. + */ + public static final TagKey ICY = register("icy"); + /** + * For water biomes where ice naturally spawns. + * For biomes where snow alone spawns, see {@link ConventionalBiomeTags#SNOWY}. + */ + public static final TagKey AQUATIC_ICY = register("aquatic_icy"); + /** + * Biomes that exist on the shoreline of a body of water. + */ + public static final TagKey BEACH = register("beach"); + /** + * Biomes densely populated with deciduous trees. + */ + public static final TagKey FOREST = register("forest"); + public static final TagKey BIRCH_FOREST = register("birch_forest"); + public static final TagKey OCEAN = register("ocean"); + public static final TagKey DESERT = register("desert"); + public static final TagKey RIVER = register("river"); + public static final TagKey SWAMP = register("swamp"); + public static final TagKey MUSHROOM = register("mushroom"); + public static final TagKey UNDERGROUND = register("underground"); + public static final TagKey MOUNTAIN = register("mountain"); + + public static final TagKey CLIMATE_HOT = register("climate_hot"); + public static final TagKey CLIMATE_TEMPERATE = register("climate_temperate"); + public static final TagKey CLIMATE_COLD = register("climate_cold"); + public static final TagKey CLIMATE_WET = register("climate_wet"); + public static final TagKey CLIMATE_DRY = register("climate_dry"); + public static final TagKey VEGETATION_SPARSE = register("vegetation_sparse"); + public static final TagKey VEGETATION_DENSE = register("vegetation_dense"); + public static final TagKey TREE_CONIFEROUS = register("tree_coniferous"); + public static final TagKey TREE_SAVANNA = register("tree_savanna"); + public static final TagKey TREE_JUNGLE = register("tree_jungle"); + public static final TagKey TREE_DECIDUOUS = register("tree_deciduous"); + public static final TagKey VOID = register("void"); + public static final TagKey MOUNTAIN_PEAK = register("mountain_peak"); + public static final TagKey MOUNTAIN_SLOPE = register("mountain_slope"); + /** + * Biomes consisting primarily of water. + */ + public static final TagKey AQUATIC = register("aquatic"); + /** + * Barren biomes that lack vegetation. + */ + public static final TagKey WASTELAND = register("wasteland"); + /** + * Biomes whose flora primarily consists of dead or decaying vegetation. + */ + public static final TagKey DEAD = register("dead"); + /** + * Biomes with a large amount of flowers. + */ + public static final TagKey FLORAL = register("floral"); + /** + * For biomes where snow, and not ice, naturally spawns as a predominant feature. + * For biomes where ice is a predominant feature, see {@link ConventionalBiomeTags#ICY}. + */ + public static final TagKey SNOWY = register("snowy"); + + public static final TagKey BADLANDS = register("badlands"); + public static final TagKey CAVES = register("caves"); + /** + * Biomes that spawn as or on islands in the End. + */ + public static final TagKey END_ISLANDS = register("end_islands"); + public static final TagKey NETHER_FORESTS = register("nether_forests"); + /** + * For snowy plains-like biomes. + * For warmer plains-like biomes, see {@link ConventionalBiomeTags#PLAINS}. + */ + public static final TagKey SNOWY_PLAINS = register("snowy_plains"); + public static final TagKey STONY_SHORES = register("stony_shores"); + public static final TagKey FLOWER_FORESTS = register("flower_forests"); + public static final TagKey DEEP_OCEAN = register("deep_ocean"); + public static final TagKey SHALLOW_OCEAN = register("shallow_ocean"); + + private static TagKey register(String tagID) { + return TagRegistration.BIOME_TAG_REGISTRATION.registerCommon(tagID); + } +} diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java new file mode 100644 index 0000000000..8cede6a311 --- /dev/null +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.api.tag.convention.v1; + +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.Block; +import net.minecraft.registry.tag.TagKey; + +import net.fabricmc.fabric.impl.tag.convention.TagRegistration; + +/** + * @deprecated Please use {@link net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags} + */ +@Deprecated +public final class ConventionalBlockTags { + private ConventionalBlockTags() { + } + + // Ores and ingots - broad categories + public static final TagKey ORES = register("ores"); + // Ores and ingots - vanilla instances + public static final TagKey QUARTZ_ORES = register("quartz_ores"); + + public static final TagKey BOOKSHELVES = register("bookshelves"); + public static final TagKey CHESTS = register("chests"); + public static final TagKey GLASS_BLOCKS = register("glass_blocks"); + public static final TagKey GLASS_PANES = register("glass_panes"); + public static final TagKey SHULKER_BOXES = register("shulker_boxes"); + public static final TagKey WOODEN_BARRELS = register("wooden_barrels"); + + // Related to budding mechanics + public static final TagKey BUDDING_BLOCKS = register("budding_blocks"); + public static final TagKey BUDS = register("buds"); + public static final TagKey CLUSTERS = register("clusters"); + + public static final TagKey VILLAGER_JOB_SITES = register("villager_job_sites"); + + // Sandstone + public static final TagKey SANDSTONE_BLOCKS = register("sandstone_blocks"); + public static final TagKey SANDSTONE_SLABS = register("sandstone_slabs"); + public static final TagKey SANDSTONE_STAIRS = register("sandstone_stairs"); + public static final TagKey RED_SANDSTONE_BLOCKS = register("red_sandstone_blocks"); + public static final TagKey RED_SANDSTONE_SLABS = register("red_sandstone_slabs"); + public static final TagKey RED_SANDSTONE_STAIRS = register("red_sandstone_stairs"); + public static final TagKey UNCOLORED_SANDSTONE_BLOCKS = register("uncolored_sandstone_blocks"); + public static final TagKey UNCOLORED_SANDSTONE_SLABS = register("uncolored_sandstone_slabs"); + public static final TagKey UNCOLORED_SANDSTONE_STAIRS = register("uncolored_sandstone_stairs"); + + /** + * Blocks should be included in this tag if their movement can cause serious issues such as world corruption + * upon being moved, such as chunk loaders or pipes, + * for mods that move blocks but do not respect {@link AbstractBlock.AbstractBlockState#getPistonBehavior}. + */ + public static final TagKey MOVEMENT_RESTRICTED = register("movement_restricted"); + + private static TagKey register(String tagID) { + return TagRegistration.BLOCK_TAG_REGISTRATION.registerCommon(tagID); + } +} diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEnchantmentTags.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEnchantmentTags.java new file mode 100644 index 0000000000..41d7e8cc4d --- /dev/null +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEnchantmentTags.java @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.api.tag.convention.v1; + +import net.minecraft.enchantment.Enchantment; +import net.minecraft.registry.tag.TagKey; + +import net.fabricmc.fabric.impl.tag.convention.TagRegistration; + +/** + * @deprecated Please use {@link net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags} + */ +@Deprecated +public final class ConventionalEnchantmentTags { + private ConventionalEnchantmentTags() { + } + + /** + * A tag containing enchantments that increase the amount or + * quality of drops from blocks, such as {@link net.minecraft.enchantment.Enchantments#FORTUNE}. + */ + public static final TagKey INCREASES_BLOCK_DROPS = register("fortune"); + /** + * A tag containing enchantments that increase the amount or + * quality of drops from entities, such as {@link net.minecraft.enchantment.Enchantments#LOOTING}. + */ + public static final TagKey INCREASES_ENTITY_DROPS = register("looting"); + /** + * For enchantments that increase the damage dealt by an item. + */ + public static final TagKey WEAPON_DAMAGE_ENHANCEMENT = register("weapon_damage_enhancement"); + /** + * For enchantments that increase movement speed or otherwise benefit the entity wearing armor enchanted with it. + */ + public static final TagKey ENTITY_MOVEMENT_ENHANCEMENT = register("entity_movement_enhancement"); + /** + * For enchantments that decrease damage taken or otherwise benefit, in regard to damage, the entity wearing armor enchanted with it. + */ + public static final TagKey ENTITY_DEFENSE_ENHANCEMENT = register("entity_defense_enhancement"); + + private static TagKey register(String tagID) { + return TagRegistration.ENCHANTMENT_TAG_REGISTRATION.registerCommon(tagID); + } +} diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java new file mode 100644 index 0000000000..70bc40d1e0 --- /dev/null +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.api.tag.convention.v1; + +import net.minecraft.entity.EntityType; +import net.minecraft.registry.tag.TagKey; + +import net.fabricmc.fabric.impl.tag.convention.TagRegistration; + +/** + * @deprecated Please use {@link net.fabricmc.fabric.api.tag.convention.v2.ConventionalEntityTypeTags} + */ +@Deprecated +public final class ConventionalEntityTypeTags { + private ConventionalEntityTypeTags() { + } + + /** + * Tag containing entity types that display a boss health bar. + */ + public static final TagKey> BOSSES = register("bosses"); + public static final TagKey> MINECARTS = register("minecarts"); + public static final TagKey> BOATS = register("boats"); + + private static TagKey> register(String tagID) { + return TagRegistration.ENTITY_TYPE_TAG_REGISTRATION.registerCommon(tagID); + } +} diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalFluidTags.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalFluidTags.java new file mode 100644 index 0000000000..fcb9f0c845 --- /dev/null +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalFluidTags.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.api.tag.convention.v1; + +import net.minecraft.fluid.Fluid; +import net.minecraft.registry.tag.TagKey; + +import net.fabricmc.fabric.impl.tag.convention.TagRegistration; + +/** + * @deprecated Please use {@link net.fabricmc.fabric.api.tag.convention.v2.ConventionalFluidTags} + */ +public final class ConventionalFluidTags { + private ConventionalFluidTags() { + } + + public static final TagKey LAVA = register("lava"); + public static final TagKey WATER = register("water"); + public static final TagKey MILK = register("milk"); + public static final TagKey HONEY = register("honey"); + + private static TagKey register(String tagID) { + return TagRegistration.FLUID_TAG_REGISTRATION.registerCommon(tagID); + } +} diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java new file mode 100644 index 0000000000..e764c0bf91 --- /dev/null +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java @@ -0,0 +1,156 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.api.tag.convention.v1; + +import net.minecraft.item.Item; +import net.minecraft.registry.tag.ItemTags; +import net.minecraft.registry.tag.TagKey; + +import net.fabricmc.fabric.impl.tag.convention.TagRegistration; + +/** + * @deprecated Please use {@link net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags} + */ +@Deprecated +public final class ConventionalItemTags { + private ConventionalItemTags() { + } + + // Tool tags + public static final TagKey SHEARS = register("shears"); + /** + * For throwable weapons, like Minecraft tridents. + */ + public static final TagKey SPEARS = register("spears"); + public static final TagKey BOWS = register("bows"); + public static final TagKey SHIELDS = register("shields"); + // Ores and ingots - categories + public static final TagKey DUSTS = register("dusts"); + public static final TagKey GEMS = register("gems"); + public static final TagKey INGOTS = register("ingots"); + public static final TagKey NUGGETS = register("nuggets"); + public static final TagKey ORES = register("ores"); + public static final TagKey RAW_ORES = register("raw_ores"); + // Ores and ingots - vanilla instances + public static final TagKey IRON_INGOTS = register("iron_ingots"); + public static final TagKey RAW_IRON_ORES = register("raw_iron_ores"); + public static final TagKey RAW_IRON_BLOCKS = register("raw_iron_blocks"); + public static final TagKey RAW_GOLD_ORES = register("raw_gold_ores"); + public static final TagKey RAW_GOLD_BLOCKS = register("raw_gold_blocks"); + public static final TagKey GOLD_INGOTS = register("gold_ingots"); + public static final TagKey REDSTONE_DUSTS = register("redstone_dusts"); + public static final TagKey COPPER_INGOTS = register("copper_ingots"); + public static final TagKey RAW_COPPER_ORES = register("raw_copper_ores"); + public static final TagKey RAW_COPPER_BLOCKS = register("raw_copper_blocks"); + public static final TagKey NETHERITE_INGOTS = register("netherite_ingots"); + public static final TagKey QUARTZ_ORES = register("quartz_ores"); + public static final TagKey QUARTZ = register("quartz"); + public static final TagKey LAPIS = register("lapis"); + public static final TagKey DIAMONDS = register("diamonds"); + public static final TagKey EMERALDS = register("emeralds"); + public static final TagKey COAL = register("coal"); + // Consumables + public static final TagKey FOODS = register("foods"); + public static final TagKey POTIONS = register("potions"); + // Buckets + /** + * Does not include entity water buckets. + */ + public static final TagKey WATER_BUCKETS = register("water_buckets"); + public static final TagKey ENTITY_WATER_BUCKETS = register("entity_water_buckets"); + public static final TagKey LAVA_BUCKETS = register("lava_buckets"); + public static final TagKey MILK_BUCKETS = register("milk_buckets"); + public static final TagKey EMPTY_BUCKETS = register("empty_buckets"); + + public static final TagKey BOOKSHELVES = register("bookshelves"); + public static final TagKey CHESTS = register("chests"); + public static final TagKey GLASS_BLOCKS = register("glass_blocks"); + public static final TagKey GLASS_PANES = register("glass_panes"); + public static final TagKey SHULKER_BOXES = register("shulker_boxes"); + public static final TagKey WOODEN_BARRELS = register("wooden_barrels"); + + // Related to budding mechanics + public static final TagKey BUDDING_BLOCKS = register("budding_blocks"); + public static final TagKey BUDS = register("buds"); + public static final TagKey CLUSTERS = register("clusters"); + + public static final TagKey VILLAGER_JOB_SITES = register("villager_job_sites"); + + // Sandstone + public static final TagKey SANDSTONE_BLOCKS = register("sandstone_blocks"); + public static final TagKey SANDSTONE_SLABS = register("sandstone_slabs"); + public static final TagKey SANDSTONE_STAIRS = register("sandstone_stairs"); + public static final TagKey RED_SANDSTONE_BLOCKS = register("red_sandstone_blocks"); + public static final TagKey RED_SANDSTONE_SLABS = register("red_sandstone_slabs"); + public static final TagKey RED_SANDSTONE_STAIRS = register("red_sandstone_stairs"); + public static final TagKey UNCOLORED_SANDSTONE_BLOCKS = register("uncolored_sandstone_blocks"); + public static final TagKey UNCOLORED_SANDSTONE_SLABS = register("uncolored_sandstone_slabs"); + public static final TagKey UNCOLORED_SANDSTONE_STAIRS = register("uncolored_sandstone_stairs"); + + // Dyes + public static final TagKey DYES = register("dyes"); + public static final TagKey BLACK_DYES = register("black_dyes"); + public static final TagKey BLUE_DYES = register("blue_dyes"); + public static final TagKey BROWN_DYES = register("brown_dyes"); + public static final TagKey CYAN_DYES = register("cyan_dyes"); + public static final TagKey GRAY_DYES = register("gray_dyes"); + public static final TagKey GREEN_DYES = register("green_dyes"); + public static final TagKey LIGHT_BLUE_DYES = register("light_blue_dyes"); + public static final TagKey LIGHT_GRAY_DYES = register("light_gray_dyes"); + public static final TagKey LIME_DYES = register("lime_dyes"); + public static final TagKey MAGENTA_DYES = register("magenta_dyes"); + public static final TagKey ORANGE_DYES = register("orange_dyes"); + public static final TagKey PINK_DYES = register("pink_dyes"); + public static final TagKey PURPLE_DYES = register("purple_dyes"); + public static final TagKey RED_DYES = register("red_dyes"); + public static final TagKey WHITE_DYES = register("white_dyes"); + public static final TagKey YELLOW_DYES = register("yellow_dyes"); + + // Deprecated + /** @deprecated Replaced with {@link #WATER_BUCKETS}. */ + @Deprecated(forRemoval = true) + public static final TagKey WATER_BUCKET = WATER_BUCKETS; + /** @deprecated Replaced with {@link #LAVA_BUCKETS}. */ + @Deprecated(forRemoval = true) + public static final TagKey LAVA_BUCKET = LAVA_BUCKETS; + /** @deprecated Replaced with {@link #MILK_BUCKETS}. */ + @Deprecated(forRemoval = true) + public static final TagKey MILK_BUCKET = MILK_BUCKETS; + /** @deprecated Replaced with {@link #EMPTY_BUCKETS}. */ + @Deprecated(forRemoval = true) + public static final TagKey EMPTY_BUCKET = EMPTY_BUCKETS; + + /** @deprecated Replaced with {@link ItemTags#PICKAXES}. */ + @Deprecated(forRemoval = true) + public static final TagKey PICKAXES = register("pickaxes"); + /** @deprecated Replaced with {@link ItemTags#SHOVELS}. */ + @Deprecated(forRemoval = true) + public static final TagKey SHOVELS = register("shovels"); + /** @deprecated Replaced with {@link ItemTags#HOES}. */ + @Deprecated(forRemoval = true) + public static final TagKey HOES = register("hoes"); + /** @deprecated Replaced with {@link ItemTags#AXES}. */ + @Deprecated(forRemoval = true) + public static final TagKey AXES = register("axes"); + /** @deprecated Replaced with {@link ItemTags#SWORDS}. */ + @Deprecated(forRemoval = true) + public static final TagKey SWORDS = register("swords"); + + private static TagKey register(String tagID) { + return TagRegistration.ITEM_TAG_REGISTRATION.registerCommon(tagID); + } +} diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java new file mode 100644 index 0000000000..c4bbb8ed23 --- /dev/null +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.api.tag.convention.v1; + +import java.util.Objects; +import java.util.Optional; + +import org.jetbrains.annotations.Nullable; + +import net.minecraft.registry.Registries; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.registry.DynamicRegistryManager; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKey; + +@Deprecated +public final class TagUtil { + private TagUtil() { + } + + /** + * @deprecated Please use {@link net.fabricmc.fabric.api.tag.convention.v2.TagUtil#isIn} + */ + public static boolean isIn(TagKey tagKey, T entry) { + return isIn(null, tagKey, entry); + } + + /** + * @deprecated Please use {@link net.fabricmc.fabric.api.tag.convention.v2.TagUtil#isIn} + */ + @SuppressWarnings("unchecked") + public static boolean isIn(@Nullable DynamicRegistryManager registryManager, TagKey tagKey, T entry) { + Optional> maybeRegistry; + Objects.requireNonNull(tagKey); + Objects.requireNonNull(entry); + + if (registryManager != null) { + maybeRegistry = registryManager.getOptional(tagKey.registry()); + } else { + maybeRegistry = Registries.REGISTRIES.getOrEmpty(tagKey.registry().getValue()); + } + + if (maybeRegistry.isPresent()) { + if (tagKey.isOf(maybeRegistry.get().getKey())) { + Registry registry = (Registry) maybeRegistry.get(); + + Optional> maybeKey = registry.getKey(entry); + + // Check synced tag + if (maybeKey.isPresent()) { + return registry.entryOf(maybeKey.get()).isIn(tagKey); + } + } + } + + return false; + } +} diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java new file mode 100644 index 0000000000..3466cfaec0 --- /dev/null +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.impl.tag.convention; + +import net.minecraft.block.Block; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.entity.EntityType; +import net.minecraft.fluid.Fluid; +import net.minecraft.item.Item; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKey; +import net.minecraft.world.biome.Biome; + +@Deprecated +public class TagRegistration { + public static final TagRegistration ITEM_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.ITEM); + public static final TagRegistration BLOCK_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.BLOCK); + public static final TagRegistration BIOME_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.BIOME); + public static final TagRegistration FLUID_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.FLUID); + public static final TagRegistration> ENTITY_TYPE_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.ENTITY_TYPE); + public static final TagRegistration ENCHANTMENT_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.ENCHANTMENT); + private final RegistryKey> registryKey; + + private TagRegistration(RegistryKey> registry) { + registryKey = registry; + } + + /** + * @deprecated Please use {@link net.fabricmc.fabric.impl.tag.convention.TagRegistration#registerFabric} + */ + public TagKey registerFabric(String tagId) { + return TagKey.of(registryKey, new Identifier("fabric", tagId)); + } + + /** + * @deprecated Please use {@link net.fabricmc.fabric.impl.tag.convention.TagRegistration#registerCommon} + */ + public TagKey registerCommon(String tagId) { + return TagKey.of(registryKey, new Identifier("c", tagId)); + } +} diff --git a/fabric-convention-tags-v1/src/main/resources/assets/fabric-convention-tags-v1/icon.png b/deprecated/fabric-convention-tags-v1/src/main/resources/assets/fabric-convention-tags-v1/icon.png similarity index 100% rename from fabric-convention-tags-v1/src/main/resources/assets/fabric-convention-tags-v1/icon.png rename to deprecated/fabric-convention-tags-v1/src/main/resources/assets/fabric-convention-tags-v1/icon.png diff --git a/deprecated/fabric-convention-tags-v1/src/main/resources/fabric.mod.json b/deprecated/fabric-convention-tags-v1/src/main/resources/fabric.mod.json new file mode 100644 index 0000000000..9fd425d38c --- /dev/null +++ b/deprecated/fabric-convention-tags-v1/src/main/resources/fabric.mod.json @@ -0,0 +1,26 @@ +{ + "schemaVersion": 1, + "id": "fabric-convention-tags-v1", + "name": "Fabric Convention Tags", + "version": "${version}", + "environment": "*", + "license": "Apache-2.0", + "icon": "assets/fabric-convention-tags-v1/icon.png", + "contact": { + "homepage": "https://fabricmc.net", + "irc": "irc://irc.esper.net:6667/fabric", + "issues": "https://github.com/FabricMC/fabric/issues", + "sources": "https://github.com/FabricMC/fabric" + }, + "authors": [ + "FabricMC" + ], + "depends": { + "fabricloader": ">=0.4.0", + "minecraft": ">=1.18.2" + }, + "description": "Contains common tags used by mods for vanilla things.", + "custom": { + "fabric-api:module-lifecycle": "stable" + } +} diff --git a/fabric-client-tags-api-v1/build.gradle b/fabric-client-tags-api-v1/build.gradle index 406c6a3cbb..40ea8782ad 100644 --- a/fabric-client-tags-api-v1/build.gradle +++ b/fabric-client-tags-api-v1/build.gradle @@ -3,7 +3,7 @@ version = getSubprojectVersion(project) moduleDependencies(project, ['fabric-api-base']) testDependencies(project, [ - ':fabric-convention-tags-v1', + ':fabric-convention-tags-v2', ':fabric-lifecycle-events-v1', ':fabric-resource-loader-v0', ]) diff --git a/fabric-client-tags-api-v1/src/client/java/net/fabricmc/fabric/api/tag/client/v1/ClientTags.java b/fabric-client-tags-api-v1/src/client/java/net/fabricmc/fabric/api/tag/client/v1/ClientTags.java index 21d1e1226e..438445d0fa 100644 --- a/fabric-client-tags-api-v1/src/client/java/net/fabricmc/fabric/api/tag/client/v1/ClientTags.java +++ b/fabric-client-tags-api-v1/src/client/java/net/fabricmc/fabric/api/tag/client/v1/ClientTags.java @@ -35,7 +35,7 @@ * query it. * *

Client Tags resolve that issue by lazily reading the tag json files within the mods on the side of the caller, - * directly, allowing for mods to query tags such as {@link net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags} + * directly, allowing for mods to query tags such as {@link net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags} * even when connected to a vanilla server. */ public final class ClientTags { diff --git a/fabric-client-tags-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java b/fabric-client-tags-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java index 29cc8377f8..a33aebfde3 100644 --- a/fabric-client-tags-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java +++ b/fabric-client-tags-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java @@ -31,9 +31,9 @@ import net.fabricmc.fabric.api.resource.ResourceManagerHelper; import net.fabricmc.fabric.api.resource.ResourcePackActivationType; import net.fabricmc.fabric.api.tag.client.v1.ClientTags; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBiomeTags; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalEnchantmentTags; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.ModContainer; diff --git a/fabric-client-tags-api-v1/src/testmodClient/resources/fabric.mod.json b/fabric-client-tags-api-v1/src/testmodClient/resources/fabric.mod.json index 5f4d62b0a7..29ba7f357a 100644 --- a/fabric-client-tags-api-v1/src/testmodClient/resources/fabric.mod.json +++ b/fabric-client-tags-api-v1/src/testmodClient/resources/fabric.mod.json @@ -6,7 +6,7 @@ "environment": "*", "license": "Apache-2.0", "depends": { - "fabric-convention-tags-v1": "*" + "fabric-convention-tags-v2": "*" }, "entrypoints": { "client": [ diff --git a/fabric-convention-tags-v1/src/generated/resources/assets/fabric-convention-tags-v1-datagen/lang/en_us.json b/fabric-convention-tags-v1/src/generated/resources/assets/fabric-convention-tags-v1-datagen/lang/en_us.json deleted file mode 100644 index 40e0468b6b..0000000000 --- a/fabric-convention-tags-v1/src/generated/resources/assets/fabric-convention-tags-v1-datagen/lang/en_us.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "tag.block.common.barrels": "Barrels", - "tag.block.common.barrels.wooden": "Barrels Wooden", - "tag.block.common.bookshelves": "Bookshelves", - "tag.block.common.budding_blocks": "Budding Blocks", - "tag.block.common.buds": "Buds", - "tag.block.common.chests": "Chests", - "tag.block.common.clusters": "Clusters", - "tag.block.common.dyed_blocks": "Dyed Blocks", - "tag.block.common.dyed_blocks.black": "Black Dyed Blocks", - "tag.block.common.dyed_blocks.blue": "Blue Dyed Blocks", - "tag.block.common.dyed_blocks.brown": "Brown Dyed Blocks", - "tag.block.common.dyed_blocks.cyan": "Cyan Dyed Blocks", - "tag.block.common.dyed_blocks.gray": "Gray Dyed Blocks", - "tag.block.common.dyed_blocks.green": "Green Dyed Blocks", - "tag.block.common.dyed_blocks.light_blue": "Light Blue Dyed Blocks", - "tag.block.common.dyed_blocks.light_gray": "Light Gray Dyed Blocks", - "tag.block.common.dyed_blocks.lime": "Lime Dyed Blocks", - "tag.block.common.dyed_blocks.magenta": "Magenta Dyed Blocks", - "tag.block.common.dyed_blocks.orange": "Orange Dyed Blocks", - "tag.block.common.dyed_blocks.pink": "Pink Dyed Blocks", - "tag.block.common.dyed_blocks.purple": "Purple Dyed Blocks", - "tag.block.common.dyed_blocks.red": "Red Dyed Blocks", - "tag.block.common.dyed_blocks.white": "White Dyed Blocks", - "tag.block.common.dyed_blocks.yellow": "Yellow Dyed Blocks", - "tag.block.common.glass_blocks": "Glass Blocks", - "tag.block.common.glass_panes": "Glass Panes", - "tag.block.common.ores": "Ores", - "tag.block.common.ores.netherite_scrap": "Netherite Scrapes Ores", - "tag.block.common.ores.quartz": "Quartz Ores", - "tag.block.common.relocation_not_supported": "Relocation Not Supported", - "tag.block.common.sandstone.blocks": "Sandstone Blocks", - "tag.block.common.sandstone.red_blocks": "Red Sandstone Blocks", - "tag.block.common.sandstone.red_slabs": "Red Sandstone Slabs", - "tag.block.common.sandstone.red_stairs": "Red Sandstone Stairs", - "tag.block.common.sandstone.slabs": "Sandstone Slabs", - "tag.block.common.sandstone.stairs": "Sandstone Stairs", - "tag.block.common.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", - "tag.block.common.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", - "tag.block.common.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", - "tag.block.common.shulker_boxes": "Shulker Boxes", - "tag.block.common.villager_job_sites": "Villager Job Sites", - "tag.block_entity_type.common.relocation_not_supported": "Relocation Not Supported", - "tag.enchantment.common.entity_defense_enhancement": "Entity Defense Enhancements", - "tag.enchantment.common.entity_movement_enhancement": "Entity Movement Enhancements", - "tag.enchantment.common.fortune": "Increases Block Drops", - "tag.enchantment.common.looting": "Increases Entity Drops", - "tag.enchantment.common.weapon_damage_enhancement": "Weapon Damage Enhancements", - "tag.entity_type.common.boats": "Boats", - "tag.entity_type.common.bosses": "Bosses", - "tag.entity_type.common.capturing_not_supported": "Capturing Not Supported", - "tag.entity_type.common.minecarts": "Minecarts", - "tag.fluid.common.honey": "Honey", - "tag.fluid.common.lava": "Lava", - "tag.fluid.common.milk": "Milk", - "tag.fluid.common.water": "Water", - "tag.item.common.barrels": "Barrels", - "tag.item.common.barrels.wooden": "Wooden Barrels", - "tag.item.common.bookshelves": "Bookshelves", - "tag.item.common.buckets.empty": "Empty Buckets", - "tag.item.common.buckets.entity_water": "Entity Water Buckets", - "tag.item.common.buckets.lava": "Lava Buckets", - "tag.item.common.buckets.milk": "Milk Buckets", - "tag.item.common.buckets.water": "Water Buckets", - "tag.item.common.budding_blocks": "Budding Blocks", - "tag.item.common.buds": "Buds", - "tag.item.common.chests": "Chests", - "tag.item.common.clusters": "Clusters", - "tag.item.common.coal": "Coal", - "tag.item.common.dusts": "Dusts", - "tag.item.common.dusts.glowstone": "Glowstone Dusts", - "tag.item.common.dusts.redstone": "Redstone Dusts", - "tag.item.common.dyed_items": "Dyed Items", - "tag.item.common.dyed_items.black": "Black Dyed Items", - "tag.item.common.dyed_items.blue": "Blue Dyed Items", - "tag.item.common.dyed_items.brown": "Brown Dyed Items", - "tag.item.common.dyed_items.cyan": "Cyan Dyed Items", - "tag.item.common.dyed_items.gray": "Gray Dyed Items", - "tag.item.common.dyed_items.green": "Green Dyed Items", - "tag.item.common.dyed_items.light_blue": "Light Blue Dyed Items", - "tag.item.common.dyed_items.light_gray": "Light Gray Dyed Items", - "tag.item.common.dyed_items.lime": "Lime Dyed Items", - "tag.item.common.dyed_items.magenta": "Magenta Dyed Items", - "tag.item.common.dyed_items.orange": "Orange Dyed Items", - "tag.item.common.dyed_items.pink": "Pink Dyed Items", - "tag.item.common.dyed_items.purple": "Purple Dyed Items", - "tag.item.common.dyed_items.red": "Red Dyed Items", - "tag.item.common.dyed_items.white": "White Dyed Items", - "tag.item.common.dyed_items.yellow": "Yellow Dyed Items", - "tag.item.common.dyes": "Dyes", - "tag.item.common.dyes.black": "Black Dyes", - "tag.item.common.dyes.blue": "Blue Dyes", - "tag.item.common.dyes.brown": "Brown Dyes", - "tag.item.common.dyes.cyan": "Cyan Dyes", - "tag.item.common.dyes.gray": "Gray Dyes", - "tag.item.common.dyes.green": "Green Dyes", - "tag.item.common.dyes.light_blue": "Light Blue Dyes", - "tag.item.common.dyes.light_gray": "Light Gray Dyes", - "tag.item.common.dyes.lime": "Lime Dyes", - "tag.item.common.dyes.magenta": "Magenta Dyes", - "tag.item.common.dyes.orange": "Orange Dyes", - "tag.item.common.dyes.pink": "Pink Dyes", - "tag.item.common.dyes.purple": "Purple Dyes", - "tag.item.common.dyes.red": "Red Dyes", - "tag.item.common.dyes.white": "White Dyes", - "tag.item.common.dyes.yellow": "Yellow Dyes", - "tag.item.common.foods": "Foods", - "tag.item.common.gems": "Gems", - "tag.item.common.gems.amethyst": "Amethyst Gems", - "tag.item.common.gems.diamond": "Diamond Gems", - "tag.item.common.gems.emerald": "Emerald Gems", - "tag.item.common.gems.lapis": "Lapis Gems", - "tag.item.common.gems.prismarine": "Prismarine Gems", - "tag.item.common.gems.quartz": "Quartz Gems", - "tag.item.common.glass_blocks": "Glass Blocks", - "tag.item.common.glass_panes": "Glass Panes", - "tag.item.common.ingots": "Ingots", - "tag.item.common.ingots.copper": "Ingots Copper", - "tag.item.common.ingots.gold": "Ingots Gold", - "tag.item.common.ingots.iron": "Ingots Iron", - "tag.item.common.ingots.netherite": "Ingots Netherite", - "tag.item.common.nuggets": "Nuggets", - "tag.item.common.ores": "Ores", - "tag.item.common.ores.netherite_scrap": "Netherite Scrap Ores", - "tag.item.common.ores.quartz": "Quartz Ores", - "tag.item.common.potions": "Potions", - "tag.item.common.raw_blocks": "Raw Blocks", - "tag.item.common.raw_blocks.copper": "Raw Blocks Copper", - "tag.item.common.raw_blocks.gold": "Raw Blocks Gold", - "tag.item.common.raw_blocks.iron": "Raw Blocks Iron", - "tag.item.common.raw_materials": "Raw Materials", - "tag.item.common.raw_materials.copper": "Raw Materials Copper", - "tag.item.common.raw_materials.gold": "Raw Materials Gold", - "tag.item.common.raw_materials.iron": "Raw Materials Iron", - "tag.item.common.sandstone.blocks": "Sandstone Blocks", - "tag.item.common.sandstone.red_blocks": "Red Sandstone Blocks", - "tag.item.common.sandstone.red_slabs": "Red Sandstone Slabs", - "tag.item.common.sandstone.red_stairs": "Red Sandstone Stairs", - "tag.item.common.sandstone.slabs": "Sandstone Slabs", - "tag.item.common.sandstone.stairs": "Sandstone Stairs", - "tag.item.common.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", - "tag.item.common.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", - "tag.item.common.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", - "tag.item.common.shulker_boxes": "Shulker Boxes", - "tag.item.common.tools": "Tools", - "tag.item.common.tools.bows": "Bows", - "tag.item.common.tools.crossbows": "Crossbows", - "tag.item.common.tools.fishing_rods": "Fishing Rods", - "tag.item.common.tools.shears": "Shears", - "tag.item.common.tools.shields": "Shields", - "tag.item.common.tools.spears": "Spears", - "tag.item.common.villager_job_sites": "Villager Job Sites", - "tag.worldgen.biome.common.is_aquatic": "Aquatic", - "tag.worldgen.biome.common.is_aquatic_icy": "Icy Aquatic", - "tag.worldgen.biome.common.is_badlands": "Badlands", - "tag.worldgen.biome.common.is_beach": "Beach", - "tag.worldgen.biome.common.is_birch_forest": "Birch Forest", - "tag.worldgen.biome.common.is_cave": "Cave", - "tag.worldgen.biome.common.is_cold": "Cold", - "tag.worldgen.biome.common.is_cold.overworld": "Cold Overworld", - "tag.worldgen.biome.common.is_dead": "Dead", - "tag.worldgen.biome.common.is_deep_ocean": "Deep Ocean", - "tag.worldgen.biome.common.is_dense_vegetation": "Dense Vegetation", - "tag.worldgen.biome.common.is_dense_vegetation.overworld": "Dense Overworld Vegetation", - "tag.worldgen.biome.common.is_desert": "Desert", - "tag.worldgen.biome.common.is_dry": "Dry", - "tag.worldgen.biome.common.is_dry.overworld": "Dry Overworld", - "tag.worldgen.biome.common.is_end_island": "End Island", - "tag.worldgen.biome.common.is_extreme_hills": "Extreme Hills", - "tag.worldgen.biome.common.is_floral": "Floral", - "tag.worldgen.biome.common.is_flower_forest": "Flower Forest", - "tag.worldgen.biome.common.is_forest": "Forest", - "tag.worldgen.biome.common.is_hot": "Hot", - "tag.worldgen.biome.common.is_hot.overworld": "Hot Overworld", - "tag.worldgen.biome.common.is_icy": "Icy", - "tag.worldgen.biome.common.is_jungle": "Jungle", - "tag.worldgen.biome.common.is_mountain": "Mountain", - "tag.worldgen.biome.common.is_mountain.peak": "Mountain Peak", - "tag.worldgen.biome.common.is_mountain.slope": "Mountain Slope", - "tag.worldgen.biome.common.is_mushroom": "Mushroom", - "tag.worldgen.biome.common.is_nether": "Nether", - "tag.worldgen.biome.common.is_nether_forest": "Nether Forest", - "tag.worldgen.biome.common.is_ocean": "Ocean", - "tag.worldgen.biome.common.is_overworld": "Overworld", - "tag.worldgen.biome.common.is_plains": "Plains", - "tag.worldgen.biome.common.is_river": "River", - "tag.worldgen.biome.common.is_savanna": "Savanna", - "tag.worldgen.biome.common.is_shallow_ocean": "Shallow Ocean", - "tag.worldgen.biome.common.is_snowy": "Snowy", - "tag.worldgen.biome.common.is_snowy_plains": "Snowy Plains", - "tag.worldgen.biome.common.is_sparse_vegetation": "Sparse Vegetation", - "tag.worldgen.biome.common.is_sparse_vegetation.overworld": "Sparse Overworld Vegetation", - "tag.worldgen.biome.common.is_stony_shores": "Stony Shores", - "tag.worldgen.biome.common.is_swamp": "Swamp", - "tag.worldgen.biome.common.is_taiga": "Taiga", - "tag.worldgen.biome.common.is_temperate": "Temperate", - "tag.worldgen.biome.common.is_temperate.overworld": "Temperate Overworld", - "tag.worldgen.biome.common.is_the_end": "The End", - "tag.worldgen.biome.common.is_tree.coniferous": "Coniferous Tree", - "tag.worldgen.biome.common.is_tree.deciduous": "Deciduous Tree", - "tag.worldgen.biome.common.is_tree.jungle": "Jungle Tree", - "tag.worldgen.biome.common.is_tree.savanna": "Savanna Tree", - "tag.worldgen.biome.common.is_underground": "Underground", - "tag.worldgen.biome.common.is_void": "Void", - "tag.worldgen.biome.common.is_wasteland": "Wasteland", - "tag.worldgen.biome.common.is_wet": "Wet", - "tag.worldgen.biome.common.is_wet.overworld": "Wet Overworld", - "tag.worldgen.biome.common.is_windswept": "Windswept" -} \ No newline at end of file diff --git a/fabric-convention-tags-v1/.gitignore b/fabric-convention-tags-v2/.gitignore similarity index 100% rename from fabric-convention-tags-v1/.gitignore rename to fabric-convention-tags-v2/.gitignore diff --git a/fabric-convention-tags-v1/build.gradle b/fabric-convention-tags-v2/build.gradle similarity index 100% rename from fabric-convention-tags-v1/build.gradle rename to fabric-convention-tags-v2/build.gradle diff --git a/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java b/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java similarity index 98% rename from fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java rename to fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java index 09d187b3fa..6e23ab788b 100644 --- a/fabric-convention-tags-v1/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java +++ b/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java @@ -33,7 +33,7 @@ import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; -import net.fabricmc.fabric.api.tag.convention.v1.TagUtil; +import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; import net.fabricmc.loader.api.FabricLoader; public class ConventionLogWarningsClient implements ClientModInitializer { diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java similarity index 100% rename from fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java rename to fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java diff --git a/fabric-convention-tags-v1/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 similarity index 99% rename from fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java rename to fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java index cb04a197f7..aa479d03a1 100644 --- a/fabric-convention-tags-v1/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 @@ -28,7 +28,7 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBiomeTags; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags; public class BiomeTagGenerator extends FabricTagProvider { public BiomeTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java similarity index 95% rename from fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java rename to fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java index 6de1bce37a..4366011694 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java @@ -22,7 +22,7 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockEntityTypeTags; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockEntityTypeTags; public class BlockEntityTypeTagGenerator extends FabricTagProvider.BlockEntityTypeTagProvider { public BlockEntityTypeTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { diff --git a/fabric-convention-tags-v1/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 similarity index 99% rename from fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java rename to fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java index b25a987c6f..c8b75a17de 100644 --- a/fabric-convention-tags-v1/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 @@ -28,7 +28,7 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags; public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { static List VILLAGER_JOB_SITE_BLOCKS = List.of( diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java similarity index 98% rename from fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java rename to fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java index 25e1da15f7..eb5502d89f 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java @@ -26,7 +26,7 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalEnchantmentTags; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags; public class EnchantmentTagGenerator extends FabricTagProvider.EnchantmentTagProvider { public EnchantmentTagGenerator(FabricDataOutput output, CompletableFuture registriesFuture) { diff --git a/fabric-convention-tags-v1/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 similarity index 97% rename from fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java rename to fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 70deffb92c..6cf46c778c 100644 --- a/fabric-convention-tags-v1/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 @@ -18,13 +18,13 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBiomeTags; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockEntityTypeTags; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalEnchantmentTags; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalEntityTypeTags; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalFluidTags; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalItemTags; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockEntityTypeTags; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalEntityTypeTags; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalFluidTags; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags; public class EnglishTagLangGenerator extends FabricLanguageProvider { public EnglishTagLangGenerator(FabricDataOutput output) { diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java similarity index 97% rename from fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java rename to fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java index 104f34021f..9415040031 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java @@ -25,7 +25,7 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalEntityTypeTags; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalEntityTypeTags; public class EntityTypeTagGenerator extends FabricTagProvider.EntityTypeTagProvider { public EntityTypeTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java similarity index 97% rename from fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java rename to fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java index 44db85dfcd..6cc40cbe9e 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java @@ -26,7 +26,7 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalFluidTags; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalFluidTags; public class FluidTagGenerator extends FabricTagProvider.FluidTagProvider { public FluidTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { diff --git a/fabric-convention-tags-v1/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 similarity index 99% rename from fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java rename to fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index 7e441ddc6e..c5cef46653 100644 --- a/fabric-convention-tags-v1/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 @@ -29,8 +29,8 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalItemTags; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags; public class ItemTagGenerator extends FabricTagProvider.ItemTagProvider { public ItemTagGenerator(FabricDataOutput output, CompletableFuture completableFuture, FabricTagProvider.BlockTagProvider blockTags) { diff --git a/fabric-convention-tags-v1/src/datagen/resources/fabric.mod.json b/fabric-convention-tags-v2/src/datagen/resources/fabric.mod.json similarity index 88% rename from fabric-convention-tags-v1/src/datagen/resources/fabric.mod.json rename to fabric-convention-tags-v2/src/datagen/resources/fabric.mod.json index 613990364b..9f414972b4 100644 --- a/fabric-convention-tags-v1/src/datagen/resources/fabric.mod.json +++ b/fabric-convention-tags-v2/src/datagen/resources/fabric.mod.json @@ -1,11 +1,11 @@ { "schemaVersion": 1, - "id": "fabric-convention-tags-v1-datagen", + "id": "fabric-convention-tags-v2-datagen", "name": "Fabric Convention Tags Datagen", "version": "1.0.0", "environment": "*", "license": "Apache-2.0", - "icon": "assets/fabric-convention-tags-v1/icon.png", + "icon": "assets/fabric-convention-tags-v2/icon.png", "contact": { "homepage": "https://fabricmc.net", "irc": "irc://irc.esper.net:6667/fabric", diff --git a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json new file mode 100644 index 0000000000..8d7fdac6a4 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json @@ -0,0 +1,209 @@ +{ + "tag.minecraft.block.common.barrels": "Barrels", + "tag.minecraft.block.common.barrels.wooden": "Barrels Wooden", + "tag.minecraft.block.common.bookshelves": "Bookshelves", + "tag.minecraft.block.common.budding_blocks": "Budding Blocks", + "tag.minecraft.block.common.buds": "Buds", + "tag.minecraft.block.common.chests": "Chests", + "tag.minecraft.block.common.clusters": "Clusters", + "tag.minecraft.block.common.dyed_blocks": "Dyed Blocks", + "tag.minecraft.block.common.dyed_blocks.black": "Black Dyed Blocks", + "tag.minecraft.block.common.dyed_blocks.blue": "Blue Dyed Blocks", + "tag.minecraft.block.common.dyed_blocks.brown": "Brown Dyed Blocks", + "tag.minecraft.block.common.dyed_blocks.cyan": "Cyan Dyed Blocks", + "tag.minecraft.block.common.dyed_blocks.gray": "Gray Dyed Blocks", + "tag.minecraft.block.common.dyed_blocks.green": "Green Dyed Blocks", + "tag.minecraft.block.common.dyed_blocks.light_blue": "Light Blue Dyed Blocks", + "tag.minecraft.block.common.dyed_blocks.light_gray": "Light Gray Dyed Blocks", + "tag.minecraft.block.common.dyed_blocks.lime": "Lime Dyed Blocks", + "tag.minecraft.block.common.dyed_blocks.magenta": "Magenta Dyed Blocks", + "tag.minecraft.block.common.dyed_blocks.orange": "Orange Dyed Blocks", + "tag.minecraft.block.common.dyed_blocks.pink": "Pink Dyed Blocks", + "tag.minecraft.block.common.dyed_blocks.purple": "Purple Dyed Blocks", + "tag.minecraft.block.common.dyed_blocks.red": "Red Dyed Blocks", + "tag.minecraft.block.common.dyed_blocks.white": "White Dyed Blocks", + "tag.minecraft.block.common.dyed_blocks.yellow": "Yellow Dyed Blocks", + "tag.minecraft.block.common.glass_blocks": "Glass Blocks", + "tag.minecraft.block.common.glass_panes": "Glass Panes", + "tag.minecraft.block.common.ores": "Ores", + "tag.minecraft.block.common.ores.netherite_scrap": "Netherite Scrapes Ores", + "tag.minecraft.block.common.ores.quartz": "Quartz Ores", + "tag.minecraft.block.common.relocation_not_supported": "Relocation Not Supported", + "tag.minecraft.block.common.sandstone.blocks": "Sandstone Blocks", + "tag.minecraft.block.common.sandstone.red_blocks": "Red Sandstone Blocks", + "tag.minecraft.block.common.sandstone.red_slabs": "Red Sandstone Slabs", + "tag.minecraft.block.common.sandstone.red_stairs": "Red Sandstone Stairs", + "tag.minecraft.block.common.sandstone.slabs": "Sandstone Slabs", + "tag.minecraft.block.common.sandstone.stairs": "Sandstone Stairs", + "tag.minecraft.block.common.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", + "tag.minecraft.block.common.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", + "tag.minecraft.block.common.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", + "tag.minecraft.block.common.shulker_boxes": "Shulker Boxes", + "tag.minecraft.block.common.villager_job_sites": "Villager Job Sites", + "tag.minecraft.block_entity_type.common.relocation_not_supported": "Relocation Not Supported", + "tag.minecraft.enchantment.common.entity_defense_enhancement": "Entity Defense Enhancements", + "tag.minecraft.enchantment.common.entity_movement_enhancement": "Entity Movement Enhancements", + "tag.minecraft.enchantment.common.fortune": "Increases Block Drops", + "tag.minecraft.enchantment.common.looting": "Increases Entity Drops", + "tag.minecraft.enchantment.common.weapon_damage_enhancement": "Weapon Damage Enhancements", + "tag.minecraft.entity_type.common.boats": "Boats", + "tag.minecraft.entity_type.common.bosses": "Bosses", + "tag.minecraft.entity_type.common.capturing_not_supported": "Capturing Not Supported", + "tag.minecraft.entity_type.common.minecarts": "Minecarts", + "tag.minecraft.fluid.common.honey": "Honey", + "tag.minecraft.fluid.common.lava": "Lava", + "tag.minecraft.fluid.common.milk": "Milk", + "tag.minecraft.fluid.common.water": "Water", + "tag.minecraft.item.common.barrels": "Barrels", + "tag.minecraft.item.common.barrels.wooden": "Wooden Barrels", + "tag.minecraft.item.common.bookshelves": "Bookshelves", + "tag.minecraft.item.common.buckets.empty": "Empty Buckets", + "tag.minecraft.item.common.buckets.entity_water": "Entity Water Buckets", + "tag.minecraft.item.common.buckets.lava": "Lava Buckets", + "tag.minecraft.item.common.buckets.milk": "Milk Buckets", + "tag.minecraft.item.common.buckets.water": "Water Buckets", + "tag.minecraft.item.common.budding_blocks": "Budding Blocks", + "tag.minecraft.item.common.buds": "Buds", + "tag.minecraft.item.common.chests": "Chests", + "tag.minecraft.item.common.clusters": "Clusters", + "tag.minecraft.item.common.coal": "Coal", + "tag.minecraft.item.common.dusts": "Dusts", + "tag.minecraft.item.common.dusts.glowstone": "Glowstone Dusts", + "tag.minecraft.item.common.dusts.redstone": "Redstone Dusts", + "tag.minecraft.item.common.dyed_items": "Dyed Items", + "tag.minecraft.item.common.dyed_items.black": "Black Dyed Items", + "tag.minecraft.item.common.dyed_items.blue": "Blue Dyed Items", + "tag.minecraft.item.common.dyed_items.brown": "Brown Dyed Items", + "tag.minecraft.item.common.dyed_items.cyan": "Cyan Dyed Items", + "tag.minecraft.item.common.dyed_items.gray": "Gray Dyed Items", + "tag.minecraft.item.common.dyed_items.green": "Green Dyed Items", + "tag.minecraft.item.common.dyed_items.light_blue": "Light Blue Dyed Items", + "tag.minecraft.item.common.dyed_items.light_gray": "Light Gray Dyed Items", + "tag.minecraft.item.common.dyed_items.lime": "Lime Dyed Items", + "tag.minecraft.item.common.dyed_items.magenta": "Magenta Dyed Items", + "tag.minecraft.item.common.dyed_items.orange": "Orange Dyed Items", + "tag.minecraft.item.common.dyed_items.pink": "Pink Dyed Items", + "tag.minecraft.item.common.dyed_items.purple": "Purple Dyed Items", + "tag.minecraft.item.common.dyed_items.red": "Red Dyed Items", + "tag.minecraft.item.common.dyed_items.white": "White Dyed Items", + "tag.minecraft.item.common.dyed_items.yellow": "Yellow Dyed Items", + "tag.minecraft.item.common.dyes": "Dyes", + "tag.minecraft.item.common.dyes.black": "Black Dyes", + "tag.minecraft.item.common.dyes.blue": "Blue Dyes", + "tag.minecraft.item.common.dyes.brown": "Brown Dyes", + "tag.minecraft.item.common.dyes.cyan": "Cyan Dyes", + "tag.minecraft.item.common.dyes.gray": "Gray Dyes", + "tag.minecraft.item.common.dyes.green": "Green Dyes", + "tag.minecraft.item.common.dyes.light_blue": "Light Blue Dyes", + "tag.minecraft.item.common.dyes.light_gray": "Light Gray Dyes", + "tag.minecraft.item.common.dyes.lime": "Lime Dyes", + "tag.minecraft.item.common.dyes.magenta": "Magenta Dyes", + "tag.minecraft.item.common.dyes.orange": "Orange Dyes", + "tag.minecraft.item.common.dyes.pink": "Pink Dyes", + "tag.minecraft.item.common.dyes.purple": "Purple Dyes", + "tag.minecraft.item.common.dyes.red": "Red Dyes", + "tag.minecraft.item.common.dyes.white": "White Dyes", + "tag.minecraft.item.common.dyes.yellow": "Yellow Dyes", + "tag.minecraft.item.common.foods": "Foods", + "tag.minecraft.item.common.gems": "Gems", + "tag.minecraft.item.common.gems.amethyst": "Amethyst Gems", + "tag.minecraft.item.common.gems.diamond": "Diamond Gems", + "tag.minecraft.item.common.gems.emerald": "Emerald Gems", + "tag.minecraft.item.common.gems.lapis": "Lapis Gems", + "tag.minecraft.item.common.gems.prismarine": "Prismarine Gems", + "tag.minecraft.item.common.gems.quartz": "Quartz Gems", + "tag.minecraft.item.common.glass_blocks": "Glass Blocks", + "tag.minecraft.item.common.glass_panes": "Glass Panes", + "tag.minecraft.item.common.ingots": "Ingots", + "tag.minecraft.item.common.ingots.copper": "Ingots Copper", + "tag.minecraft.item.common.ingots.gold": "Ingots Gold", + "tag.minecraft.item.common.ingots.iron": "Ingots Iron", + "tag.minecraft.item.common.ingots.netherite": "Ingots Netherite", + "tag.minecraft.item.common.nuggets": "Nuggets", + "tag.minecraft.item.common.ores": "Ores", + "tag.minecraft.item.common.ores.netherite_scrap": "Netherite Scrap Ores", + "tag.minecraft.item.common.ores.quartz": "Quartz Ores", + "tag.minecraft.item.common.potions": "Potions", + "tag.minecraft.item.common.raw_blocks": "Raw Blocks", + "tag.minecraft.item.common.raw_blocks.copper": "Raw Blocks Copper", + "tag.minecraft.item.common.raw_blocks.gold": "Raw Blocks Gold", + "tag.minecraft.item.common.raw_blocks.iron": "Raw Blocks Iron", + "tag.minecraft.item.common.raw_materials": "Raw Materials", + "tag.minecraft.item.common.raw_materials.copper": "Raw Materials Copper", + "tag.minecraft.item.common.raw_materials.gold": "Raw Materials Gold", + "tag.minecraft.item.common.raw_materials.iron": "Raw Materials Iron", + "tag.minecraft.item.common.sandstone.blocks": "Sandstone Blocks", + "tag.minecraft.item.common.sandstone.red_blocks": "Red Sandstone Blocks", + "tag.minecraft.item.common.sandstone.red_slabs": "Red Sandstone Slabs", + "tag.minecraft.item.common.sandstone.red_stairs": "Red Sandstone Stairs", + "tag.minecraft.item.common.sandstone.slabs": "Sandstone Slabs", + "tag.minecraft.item.common.sandstone.stairs": "Sandstone Stairs", + "tag.minecraft.item.common.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", + "tag.minecraft.item.common.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", + "tag.minecraft.item.common.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", + "tag.minecraft.item.common.shulker_boxes": "Shulker Boxes", + "tag.minecraft.item.common.tools": "Tools", + "tag.minecraft.item.common.tools.bows": "Bows", + "tag.minecraft.item.common.tools.crossbows": "Crossbows", + "tag.minecraft.item.common.tools.fishing_rods": "Fishing Rods", + "tag.minecraft.item.common.tools.shears": "Shears", + "tag.minecraft.item.common.tools.shields": "Shields", + "tag.minecraft.item.common.tools.spears": "Spears", + "tag.minecraft.item.common.villager_job_sites": "Villager Job Sites", + "tag.minecraft.worldgen.biome.common.is_aquatic": "Aquatic", + "tag.minecraft.worldgen.biome.common.is_aquatic_icy": "Icy Aquatic", + "tag.minecraft.worldgen.biome.common.is_badlands": "Badlands", + "tag.minecraft.worldgen.biome.common.is_beach": "Beach", + "tag.minecraft.worldgen.biome.common.is_birch_forest": "Birch Forest", + "tag.minecraft.worldgen.biome.common.is_cave": "Cave", + "tag.minecraft.worldgen.biome.common.is_cold": "Cold", + "tag.minecraft.worldgen.biome.common.is_cold.overworld": "Cold Overworld", + "tag.minecraft.worldgen.biome.common.is_dead": "Dead", + "tag.minecraft.worldgen.biome.common.is_deep_ocean": "Deep Ocean", + "tag.minecraft.worldgen.biome.common.is_dense_vegetation": "Dense Vegetation", + "tag.minecraft.worldgen.biome.common.is_dense_vegetation.overworld": "Dense Overworld Vegetation", + "tag.minecraft.worldgen.biome.common.is_desert": "Desert", + "tag.minecraft.worldgen.biome.common.is_dry": "Dry", + "tag.minecraft.worldgen.biome.common.is_dry.overworld": "Dry Overworld", + "tag.minecraft.worldgen.biome.common.is_end_island": "End Island", + "tag.minecraft.worldgen.biome.common.is_extreme_hills": "Extreme Hills", + "tag.minecraft.worldgen.biome.common.is_floral": "Floral", + "tag.minecraft.worldgen.biome.common.is_flower_forest": "Flower Forest", + "tag.minecraft.worldgen.biome.common.is_forest": "Forest", + "tag.minecraft.worldgen.biome.common.is_hot": "Hot", + "tag.minecraft.worldgen.biome.common.is_hot.overworld": "Hot Overworld", + "tag.minecraft.worldgen.biome.common.is_icy": "Icy", + "tag.minecraft.worldgen.biome.common.is_jungle": "Jungle", + "tag.minecraft.worldgen.biome.common.is_mountain": "Mountain", + "tag.minecraft.worldgen.biome.common.is_mountain.peak": "Mountain Peak", + "tag.minecraft.worldgen.biome.common.is_mountain.slope": "Mountain Slope", + "tag.minecraft.worldgen.biome.common.is_mushroom": "Mushroom", + "tag.minecraft.worldgen.biome.common.is_nether": "Nether", + "tag.minecraft.worldgen.biome.common.is_nether_forest": "Nether Forest", + "tag.minecraft.worldgen.biome.common.is_ocean": "Ocean", + "tag.minecraft.worldgen.biome.common.is_overworld": "Overworld", + "tag.minecraft.worldgen.biome.common.is_plains": "Plains", + "tag.minecraft.worldgen.biome.common.is_river": "River", + "tag.minecraft.worldgen.biome.common.is_savanna": "Savanna", + "tag.minecraft.worldgen.biome.common.is_shallow_ocean": "Shallow Ocean", + "tag.minecraft.worldgen.biome.common.is_snowy": "Snowy", + "tag.minecraft.worldgen.biome.common.is_snowy_plains": "Snowy Plains", + "tag.minecraft.worldgen.biome.common.is_sparse_vegetation": "Sparse Vegetation", + "tag.minecraft.worldgen.biome.common.is_sparse_vegetation.overworld": "Sparse Overworld Vegetation", + "tag.minecraft.worldgen.biome.common.is_stony_shores": "Stony Shores", + "tag.minecraft.worldgen.biome.common.is_swamp": "Swamp", + "tag.minecraft.worldgen.biome.common.is_taiga": "Taiga", + "tag.minecraft.worldgen.biome.common.is_temperate": "Temperate", + "tag.minecraft.worldgen.biome.common.is_temperate.overworld": "Temperate Overworld", + "tag.minecraft.worldgen.biome.common.is_the_end": "The End", + "tag.minecraft.worldgen.biome.common.is_tree.coniferous": "Coniferous Tree", + "tag.minecraft.worldgen.biome.common.is_tree.deciduous": "Deciduous Tree", + "tag.minecraft.worldgen.biome.common.is_tree.jungle": "Jungle Tree", + "tag.minecraft.worldgen.biome.common.is_tree.savanna": "Savanna Tree", + "tag.minecraft.worldgen.biome.common.is_underground": "Underground", + "tag.minecraft.worldgen.biome.common.is_void": "Void", + "tag.minecraft.worldgen.biome.common.is_wasteland": "Wasteland", + "tag.minecraft.worldgen.biome.common.is_wet": "Wet", + "tag.minecraft.worldgen.biome.common.is_wet.overworld": "Wet Overworld", + "tag.minecraft.worldgen.biome.common.is_windswept": "Windswept" +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/block_entity_type/relocation_not_supported.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/block_entity_type/relocation_not_supported.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/block_entity_type/relocation_not_supported.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/block_entity_type/relocation_not_supported.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/barrels.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/barrels.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/barrels.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/barrels.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/barrels/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/barrels/wooden.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/barrels/wooden.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/barrels/wooden.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/bookshelves.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/bookshelves.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/bookshelves.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/bookshelves.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/budding_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/budding_blocks.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/budding_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/budding_blocks.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/buds.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/buds.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/buds.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/buds.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/chests.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/chests.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/chests.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/chests.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/clusters.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/clusters.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/clusters.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/clusters.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/black.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/black.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/black.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/black.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/blue.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/blue.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/blue.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/blue.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/brown.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/brown.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/brown.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/brown.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/cyan.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/cyan.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/cyan.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/cyan.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/gray.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/gray.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/gray.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/gray.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/green.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/green.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/green.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/green.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_blue.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_blue.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_blue.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_blue.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_gray.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_gray.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_gray.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_gray.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/lime.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/lime.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/lime.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/lime.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/magenta.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/magenta.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/magenta.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/magenta.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/orange.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/orange.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/orange.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/orange.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/pink.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/pink.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/pink.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/pink.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/purple.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/purple.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/purple.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/purple.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/red.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/red.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/red.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/red.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/white.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/white.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/white.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/white.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/yellow.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/yellow.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/dyed_blocks/yellow.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/yellow.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/glass_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/glass_blocks.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/glass_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/glass_blocks.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/glass_panes.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/glass_panes.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/glass_panes.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/glass_panes.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/ores.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/ores.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores/netherite_scrap.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/ores/netherite_scrap.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores/netherite_scrap.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/ores/netherite_scrap.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores/quartz.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/ores/quartz.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/ores/quartz.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/ores/quartz.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/relocation_not_supported.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/relocation_not_supported.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/relocation_not_supported.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/relocation_not_supported.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/blocks.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/blocks.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/red_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/red_blocks.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/red_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/red_blocks.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/red_slabs.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/red_slabs.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/red_slabs.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/red_slabs.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/red_stairs.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/red_stairs.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/red_stairs.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/red_stairs.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/slabs.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/slabs.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/slabs.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/slabs.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/stairs.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/stairs.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/stairs.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/stairs.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_blocks.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_blocks.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_slabs.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_slabs.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_slabs.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_slabs.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_stairs.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_stairs.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_stairs.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_stairs.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/shulker_boxes.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/shulker_boxes.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/shulker_boxes.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/shulker_boxes.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/villager_job_sites.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/villager_job_sites.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/blocks/villager_job_sites.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/villager_job_sites.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/entity_defense_enhancement.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/enchantment/entity_defense_enhancement.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/entity_defense_enhancement.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/enchantment/entity_defense_enhancement.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/entity_movement_enhancement.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/enchantment/entity_movement_enhancement.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/entity_movement_enhancement.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/enchantment/entity_movement_enhancement.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/fortune.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/enchantment/fortune.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/fortune.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/enchantment/fortune.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/looting.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/enchantment/looting.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/looting.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/enchantment/looting.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/weapon_damage_enhancement.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/enchantment/weapon_damage_enhancement.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/enchantment/weapon_damage_enhancement.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/enchantment/weapon_damage_enhancement.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/boats.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/entity_types/boats.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/boats.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/entity_types/boats.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/bosses.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/entity_types/bosses.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/bosses.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/entity_types/bosses.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/capturing_not_supported.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/entity_types/capturing_not_supported.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/capturing_not_supported.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/entity_types/capturing_not_supported.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/minecarts.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/entity_types/minecarts.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/entity_types/minecarts.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/entity_types/minecarts.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/fluids/honey.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/fluids/honey.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/fluids/honey.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/fluids/honey.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/fluids/lava.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/fluids/lava.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/fluids/lava.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/fluids/lava.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/fluids/milk.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/fluids/milk.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/fluids/milk.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/fluids/milk.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/fluids/water.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/fluids/water.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/fluids/water.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/fluids/water.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/barrels.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/barrels.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/barrels.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/barrels.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/barrels/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/barrels/wooden.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/barrels/wooden.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/barrels/wooden.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/bookshelves.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/bookshelves.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/bookshelves.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/bookshelves.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/empty.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buckets/empty.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/empty.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buckets/empty.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/entity_water.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buckets/entity_water.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/entity_water.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buckets/entity_water.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/lava.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buckets/lava.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/lava.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buckets/lava.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/milk.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buckets/milk.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/milk.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buckets/milk.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/water.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buckets/water.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buckets/water.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buckets/water.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/budding_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/budding_blocks.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/budding_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/budding_blocks.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buds.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buds.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/buds.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buds.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/chests.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/chests.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/chests.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/chests.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/clusters.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/clusters.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/clusters.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/clusters.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/coal.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/coal.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/coal.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/coal.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dusts.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dusts.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dusts.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dusts.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dusts/glowstone.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dusts/glowstone.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dusts/glowstone.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dusts/glowstone.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dusts/redstone.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dusts/redstone.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dusts/redstone.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dusts/redstone.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/black.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/black.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/black.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/black.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/blue.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/blue.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/blue.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/blue.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/brown.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/brown.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/brown.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/brown.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/cyan.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/cyan.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/cyan.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/cyan.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/gray.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/gray.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/gray.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/gray.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/green.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/green.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/green.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/green.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/light_blue.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/light_blue.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/light_blue.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/light_blue.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/light_gray.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/light_gray.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/light_gray.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/light_gray.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/lime.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/lime.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/lime.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/lime.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/magenta.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/magenta.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/magenta.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/magenta.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/orange.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/orange.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/orange.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/orange.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/pink.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/pink.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/pink.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/pink.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/purple.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/purple.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/purple.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/purple.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/red.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/red.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/red.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/red.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/white.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/white.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/white.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/white.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/yellow.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/yellow.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyed_items/yellow.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/yellow.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/black.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/black.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/black.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/black.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/blue.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/blue.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/blue.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/blue.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/brown.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/brown.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/brown.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/brown.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/cyan.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/cyan.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/cyan.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/cyan.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/gray.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/gray.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/gray.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/gray.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/green.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/green.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/green.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/green.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/light_blue.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/light_blue.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/light_blue.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/light_blue.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/light_gray.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/light_gray.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/light_gray.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/light_gray.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/lime.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/lime.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/lime.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/lime.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/magenta.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/magenta.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/magenta.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/magenta.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/orange.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/orange.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/orange.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/orange.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/pink.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/pink.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/pink.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/pink.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/purple.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/purple.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/purple.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/purple.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/red.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/red.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/red.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/red.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/white.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/white.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/white.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/white.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/yellow.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/yellow.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/dyes/yellow.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/yellow.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/foods.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/foods.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/foods.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/foods.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/amethyst.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/amethyst.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/amethyst.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/amethyst.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/diamond.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/diamond.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/diamond.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/diamond.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/emerald.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/emerald.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/emerald.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/emerald.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/lapis.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/lapis.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/lapis.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/lapis.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/prismarine.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/prismarine.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/prismarine.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/prismarine.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/quartz.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/quartz.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/gems/quartz.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/quartz.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/glass_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/glass_blocks.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/glass_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/glass_blocks.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/glass_panes.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/glass_panes.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/glass_panes.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/glass_panes.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ingots.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ingots.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/copper.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ingots/copper.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/copper.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ingots/copper.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/gold.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ingots/gold.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/gold.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ingots/gold.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/iron.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ingots/iron.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/iron.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ingots/iron.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/netherite.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ingots/netherite.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ingots/netherite.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ingots/netherite.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/nuggets.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/nuggets.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/nuggets.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/nuggets.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ores.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ores.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ores.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ores.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ores/netherite_scrap.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ores/netherite_scrap.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ores/netherite_scrap.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ores/netherite_scrap.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ores/quartz.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ores/quartz.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/ores/quartz.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ores/quartz.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/potions.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/potions.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/potions.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/potions.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_blocks.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_blocks.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks/copper.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_blocks/copper.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks/copper.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_blocks/copper.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks/gold.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_blocks/gold.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks/gold.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_blocks/gold.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks/iron.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_blocks/iron.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_blocks/iron.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_blocks/iron.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_materials.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_materials.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials/copper.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_materials/copper.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials/copper.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_materials/copper.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials/gold.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_materials/gold.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials/gold.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_materials/gold.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials/iron.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_materials/iron.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/raw_materials/iron.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_materials/iron.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/blocks.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/blocks.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/red_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/red_blocks.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/red_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/red_blocks.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/red_slabs.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/red_slabs.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/red_slabs.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/red_slabs.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/red_stairs.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/red_stairs.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/red_stairs.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/red_stairs.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/slabs.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/slabs.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/slabs.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/slabs.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/stairs.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/stairs.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/stairs.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/stairs.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/uncolored_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/uncolored_blocks.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/uncolored_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/uncolored_blocks.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/uncolored_slabs.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/uncolored_slabs.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/uncolored_slabs.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/uncolored_slabs.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/uncolored_stairs.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/uncolored_stairs.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/sandstone/uncolored_stairs.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/uncolored_stairs.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/shulker_boxes.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/shulker_boxes.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/shulker_boxes.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/shulker_boxes.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/bows.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/bows.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/bows.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/bows.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/crossbows.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/crossbows.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/crossbows.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/crossbows.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/fishing_rods.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/fishing_rods.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/fishing_rods.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/fishing_rods.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/shears.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/shears.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/shears.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/shears.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/shields.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/shields.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/shields.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/shields.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/spears.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/spears.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/tools/spears.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/spears.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/villager_job_sites.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/villager_job_sites.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/items/villager_job_sites.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/villager_job_sites.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic_icy.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic_icy.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic_icy.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic_icy.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_badlands.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_badlands.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_badlands.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_badlands.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_beach.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_beach.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_beach.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_beach.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_birch_forest.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_birch_forest.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_birch_forest.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_birch_forest.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_cave.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_cave.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_cave.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_cave.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_cold.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_cold.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_cold.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_cold.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_cold/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_cold/overworld.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_cold/overworld.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_cold/overworld.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dead.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dead.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dead.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dead.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_deep_ocean.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_deep_ocean.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_deep_ocean.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_deep_ocean.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation/overworld.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation/overworld.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation/overworld.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_desert.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_desert.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_desert.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_desert.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dry.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dry.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dry.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dry.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dry/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dry/overworld.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_dry/overworld.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dry/overworld.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_end_island.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_end_island.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_end_island.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_end_island.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_extreme_hills.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_extreme_hills.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_extreme_hills.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_extreme_hills.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_floral.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_floral.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_floral.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_floral.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_flower_forest.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_flower_forest.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_flower_forest.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_flower_forest.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_forest.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_forest.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_forest.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_forest.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_hot.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_hot.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_hot.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_hot.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_hot/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_hot/overworld.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_hot/overworld.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_hot/overworld.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_icy.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_icy.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_icy.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_icy.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_jungle.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_jungle.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_jungle.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_jungle.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mountain.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_mountain.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mountain.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_mountain.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/peak.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/peak.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/peak.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/peak.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/slope.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/slope.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/slope.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/slope.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mushroom.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_mushroom.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_mushroom.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_mushroom.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_nether.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_nether.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_nether.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_nether.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_nether_forest.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_nether_forest.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_nether_forest.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_nether_forest.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_ocean.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_ocean.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_ocean.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_ocean.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_overworld.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_overworld.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_overworld.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_plains.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_plains.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_plains.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_plains.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_river.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_river.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_river.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_river.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_savanna.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_savanna.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_savanna.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_savanna.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_shallow_ocean.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_shallow_ocean.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_shallow_ocean.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_shallow_ocean.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_snowy.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_snowy.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_snowy.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_snowy.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_snowy_plains.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_snowy_plains.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_snowy_plains.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_snowy_plains.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation/overworld.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation/overworld.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation/overworld.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_stony_shores.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_stony_shores.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_stony_shores.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_stony_shores.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_swamp.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_swamp.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_swamp.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_swamp.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_taiga.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_taiga.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_taiga.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_taiga.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_temperate.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_temperate.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_temperate.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_temperate.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_temperate/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_temperate/overworld.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_temperate/overworld.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_temperate/overworld.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_the_end.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_the_end.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_the_end.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_the_end.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/coniferous.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_tree/coniferous.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/coniferous.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_tree/coniferous.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/deciduous.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_tree/deciduous.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/deciduous.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_tree/deciduous.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/jungle.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_tree/jungle.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/jungle.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_tree/jungle.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/savanna.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_tree/savanna.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_tree/savanna.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_tree/savanna.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_underground.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_underground.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_underground.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_underground.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_void.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_void.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_void.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_void.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_wasteland.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_wasteland.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_wasteland.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_wasteland.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_wet.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_wet.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_wet.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_wet.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_wet/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_wet/overworld.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_wet/overworld.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_wet/overworld.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_windswept.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_windswept.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/common/tags/worldgen/biome/is_windswept.json rename to fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_windswept.json diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java similarity index 99% rename from fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java rename to fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java index 0d9a814ac9..5f3a0bbab5 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.fabricmc.fabric.api.tag.convention.v1; +package net.fabricmc.fabric.api.tag.convention.v2; import net.minecraft.registry.tag.TagKey; import net.minecraft.world.biome.Biome; diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockEntityTypeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java similarity index 96% rename from fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockEntityTypeTags.java rename to fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java index c58ea53ebc..e8f9e5237f 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockEntityTypeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.fabricmc.fabric.api.tag.convention.v1; +package net.fabricmc.fabric.api.tag.convention.v2; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.registry.tag.TagKey; diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java similarity index 99% rename from fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java rename to fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java index 5e48334708..d454e8dbf2 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.fabricmc.fabric.api.tag.convention.v1; +package net.fabricmc.fabric.api.tag.convention.v2; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEnchantmentTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java similarity index 97% rename from fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEnchantmentTags.java rename to fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java index e2deb23986..9baef41bc5 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEnchantmentTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.fabricmc.fabric.api.tag.convention.v1; +package net.fabricmc.fabric.api.tag.convention.v2; import net.minecraft.enchantment.Enchantment; import net.minecraft.registry.tag.TagKey; diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java similarity index 96% rename from fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java rename to fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java index ccc807c5d9..51b6dcf22a 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.fabricmc.fabric.api.tag.convention.v1; +package net.fabricmc.fabric.api.tag.convention.v2; import net.minecraft.entity.EntityType; import net.minecraft.registry.tag.TagKey; diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalFluidTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalFluidTags.java similarity index 96% rename from fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalFluidTags.java rename to fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalFluidTags.java index 62e7348da2..e6fdb7a266 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalFluidTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalFluidTags.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.fabricmc.fabric.api.tag.convention.v1; +package net.fabricmc.fabric.api.tag.convention.v2; import net.minecraft.fluid.Fluid; import net.minecraft.registry.tag.TagKey; diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java similarity index 99% rename from fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java rename to fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index 3c780cfeea..24e9b2a05f 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.fabricmc.fabric.api.tag.convention.v1; +package net.fabricmc.fabric.api.tag.convention.v2; import net.minecraft.item.Item; import net.minecraft.registry.tag.TagKey; diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/TagUtil.java similarity index 98% rename from fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java rename to fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/TagUtil.java index ddaefd3237..27c7650968 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/TagUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.fabricmc.fabric.api.tag.convention.v1; +package net.fabricmc.fabric.api.tag.convention.v2; import java.util.Objects; import java.util.Optional; diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java similarity index 100% rename from fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java rename to fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java similarity index 100% rename from fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java rename to fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java similarity index 100% rename from fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java rename to fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java diff --git a/fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v1/icon.png b/fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v1/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2931efbf610873c0084debb8690902b0103d27fe GIT binary patch literal 1579 zcmbVMTWB0r7@iGm)TAXsYw<=rnU=;v=W=GRbL=!tc4Brl6GO7t2vVJ$IlDV#XU;e? z+r2ymsZdMQqAyaFLLUo;RumtE8Z@?uf_*4nP^4;o6fOFoSkN+o1$K?f2nE9_*b5G-l)AV)k5Qhb^- zU{V4ZnTKgnmXdpcB*Kg!W(1hvM2N&RO30x1u~eI9meGQGe@_?PDQq%q1CiV$8~M7 z?MQ_mOdqCh^a65Sv|ntwSXjV5se1;VK1|Kr8G7TQoQL&*ctt{L{fClG}xPK5k^yK3%T69N6J=>3jBqc zDNvZsrJ-yOXI^^mWf1cmY^XST)CVzIGjvEPENowmy}ax zvJ8_(Cf#+H-dBlH53`_u-~6BVAMz|(g?jCVdBWNZ(+A}(pFV7>S3QgPiQcMaflkIC z-3Ti|VT~{au*vq0ts9O&m$p&Gl=L6+q6_m$IcVq}o~+Pl{g>1esQp4%wp~|*zk1n` zZ7T6Toc4`y88s}riCP|ZXrJ?FLz@^KTcyqLjey zu95Yz%F&S{<0~f)Iomek?+hQ%MhCu%T^zsg>C_L`1`Br`xNY&))k9yTQb$JC>)w_f zpU(^tu^Q)y%W~lVz`jz;_ jF?g&s@Y=Qe&c#kW|JbvqK0Y=Rw)4XDoVqsk_>;c_`@;F@ literal 0 HcmV?d00001 diff --git a/fabric-convention-tags-v1/src/main/resources/fabric.mod.json b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json similarity index 90% rename from fabric-convention-tags-v1/src/main/resources/fabric.mod.json rename to fabric-convention-tags-v2/src/main/resources/fabric.mod.json index df3a4aad55..f74430caf8 100644 --- a/fabric-convention-tags-v1/src/main/resources/fabric.mod.json +++ b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json @@ -1,11 +1,11 @@ { "schemaVersion": 1, - "id": "fabric-convention-tags-v1", + "id": "fabric-convention-tags-v2", "name": "Fabric Convention Tags", "version": "${version}", "environment": "*", "license": "Apache-2.0", - "icon": "assets/fabric-convention-tags-v1/icon.png", + "icon": "assets/fabric-convention-tags-v2/icon.png", "contact": { "homepage": "https://fabricmc.net", "irc": "irc://irc.esper.net:6667/fabric", diff --git a/fabric-convention-tags-v1/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v1/TagUtilTest.java b/fabric-convention-tags-v2/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v1/TagUtilTest.java similarity index 87% rename from fabric-convention-tags-v1/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v1/TagUtilTest.java rename to fabric-convention-tags-v2/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v1/TagUtilTest.java index 978a2daa3a..f5833c0442 100644 --- a/fabric-convention-tags-v1/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v1/TagUtilTest.java +++ b/fabric-convention-tags-v2/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v1/TagUtilTest.java @@ -26,10 +26,10 @@ import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBiomeTags; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalEnchantmentTags; -import net.fabricmc.fabric.api.tag.convention.v1.TagUtil; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags; +import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; public class TagUtilTest implements ModInitializer { private static final Logger LOGGER = LoggerFactory.getLogger(TagUtilTest.class); @@ -38,7 +38,7 @@ public class TagUtilTest implements ModInitializer { public void onInitialize() { ServerLifecycleEvents.SERVER_STARTED.register(server -> { if (!TagUtil.isIn(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS, Enchantments.FORTUNE)) { - throw new AssertionError("Failed to find fortune in c:fortune!"); + throw new AssertionError("Failed to find fortune in common:fortune!"); } if (TagUtil.isIn(ConventionalBiomeTags.IS_OVERWORLD, server.getRegistryManager().get(RegistryKeys.BIOME).get(BiomeKeys.BADLANDS))) { diff --git a/fabric-convention-tags-v1/src/testmod/resources/fabric.mod.json b/fabric-convention-tags-v2/src/testmod/resources/fabric.mod.json similarity index 89% rename from fabric-convention-tags-v1/src/testmod/resources/fabric.mod.json rename to fabric-convention-tags-v2/src/testmod/resources/fabric.mod.json index 3db1e4d54d..34a4ff0988 100644 --- a/fabric-convention-tags-v1/src/testmod/resources/fabric.mod.json +++ b/fabric-convention-tags-v2/src/testmod/resources/fabric.mod.json @@ -6,7 +6,7 @@ "environment": "*", "license": "Apache-2.0", "depends": { - "fabric-convention-tags-v1": "*" + "fabric-convention-tags-v2": "*" }, "entrypoints": { "main": [ diff --git a/fabric-data-generation-api-v1/build.gradle b/fabric-data-generation-api-v1/build.gradle index 4d38e3bf8c..43e85537b9 100644 --- a/fabric-data-generation-api-v1/build.gradle +++ b/fabric-data-generation-api-v1/build.gradle @@ -7,7 +7,7 @@ moduleDependencies(project, [ 'fabric-resource-conditions-api-v1', 'fabric-item-group-api-v1', 'fabric-recipe-api-v1', - 'fabric-convention-tags-v1' + 'fabric-convention-tags-v2' ]) dependencies { diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java index 42cc87e3d8..06ad11a11a 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java @@ -49,7 +49,7 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.tag.convention.v1.TagUtil; +import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; /** * Extend this class and implement {@link FabricLanguageProvider#generateTranslations(TranslationBuilder)}. diff --git a/gradle.properties b/gradle.properties index 36e27cf82c..953840d626 100644 --- a/gradle.properties +++ b/gradle.properties @@ -61,4 +61,5 @@ fabric-sound-api-v1-version=1.0.13 fabric-transfer-api-v1-version=3.3.6 fabric-transitive-access-wideners-v1-version=5.0.2 fabric-convention-tags-v1-version=1.5.6 +fabric-convention-tags-v2-version=2.0.0 fabric-client-tags-api-v1-version=1.1.3 diff --git a/settings.gradle b/settings.gradle index 2db408cbed..414b767b43 100644 --- a/settings.gradle +++ b/settings.gradle @@ -21,7 +21,7 @@ include 'fabric-blockrenderlayer-v1' include 'fabric-client-tags-api-v1' include 'fabric-command-api-v2' include 'fabric-content-registries-v0' -include 'fabric-convention-tags-v1' +include 'fabric-convention-tags-v2' include 'fabric-crash-report-info-v1' include 'fabric-data-generation-api-v1' include 'fabric-dimensions-v1' @@ -58,6 +58,7 @@ include 'deprecated' include 'deprecated:fabric-command-api-v1' include 'deprecated:fabric-commands-v0' include 'deprecated:fabric-containers-v0' +include 'deprecated:fabric-convention-tags-v1' include 'deprecated:fabric-events-lifecycle-v0' include 'deprecated:fabric-keybindings-v0' include 'deprecated:fabric-models-v0' From fba9b14542666b87fce5be6b825e25fc008b3506 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Tue, 12 Sep 2023 21:49:15 -0400 Subject: [PATCH 017/123] Lang translation suggested fixes --- .../generators/EnglishTagLangGenerator.java | 14 +++++++------- .../lang/en_us.json | 14 +++++++------- 2 files changed, 14 insertions(+), 14 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 6cf46c778c..d1a9a62906 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 @@ -36,7 +36,7 @@ public void generateTranslations(FabricLanguageProvider.TranslationBuilder trans // Blocks translationBuilder.add(ConventionalBlockTags.ORES, "Ores"); translationBuilder.add(ConventionalBlockTags.QUARTZ_ORES, "Quartz Ores"); - translationBuilder.add(ConventionalBlockTags.NETHERITE_SCRAP_ORES, "Netherite Scrapes Ores"); + translationBuilder.add(ConventionalBlockTags.NETHERITE_SCRAP_ORES, "Netherite Scrap Ores"); translationBuilder.add(ConventionalBlockTags.BARRELS, "Barrels"); translationBuilder.add(ConventionalBlockTags.WOODEN_BARRELS, "Barrels Wooden"); translationBuilder.add(ConventionalBlockTags.BOOKSHELVES, "Bookshelves"); @@ -94,12 +94,12 @@ public void generateTranslations(FabricLanguageProvider.TranslationBuilder trans translationBuilder.add(ConventionalItemTags.ORES, "Ores"); translationBuilder.add(ConventionalItemTags.RAW_MATERIALS, "Raw Materials"); translationBuilder.add(ConventionalItemTags.RAW_BLOCKS, "Raw Blocks"); - translationBuilder.add(ConventionalItemTags.IRON_RAW_MATERIALS, "Raw Materials Iron"); - translationBuilder.add(ConventionalItemTags.GOLD_RAW_MATERIALS, "Raw Materials Gold"); - translationBuilder.add(ConventionalItemTags.COPPER_RAW_MATERIALS, "Raw Materials Copper"); - translationBuilder.add(ConventionalItemTags.IRON_RAW_BLOCKS, "Raw Blocks Iron"); - translationBuilder.add(ConventionalItemTags.GOLD_RAW_BLOCKS, "Raw Blocks Gold"); - translationBuilder.add(ConventionalItemTags.COPPER_RAW_BLOCKS, "Raw Blocks Copper"); + translationBuilder.add(ConventionalItemTags.IRON_RAW_MATERIALS, "Raw Iron Materials"); + translationBuilder.add(ConventionalItemTags.GOLD_RAW_MATERIALS, "Raw Gold Materials"); + translationBuilder.add(ConventionalItemTags.COPPER_RAW_MATERIALS, "Raw Copper Materials"); + translationBuilder.add(ConventionalItemTags.IRON_RAW_BLOCKS, "Raw Iron Blocks"); + translationBuilder.add(ConventionalItemTags.GOLD_RAW_BLOCKS, "Raw Gold Blocks"); + translationBuilder.add(ConventionalItemTags.COPPER_RAW_BLOCKS, "Raw Copper Blocks"); translationBuilder.add(ConventionalItemTags.IRON_INGOTS, "Ingots Iron"); translationBuilder.add(ConventionalItemTags.GOLD_INGOTS, "Ingots Gold"); translationBuilder.add(ConventionalItemTags.COPPER_INGOTS, "Ingots Copper"); diff --git a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json index 8d7fdac6a4..eeaae88323 100644 --- a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json +++ b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json @@ -26,7 +26,7 @@ "tag.minecraft.block.common.glass_blocks": "Glass Blocks", "tag.minecraft.block.common.glass_panes": "Glass Panes", "tag.minecraft.block.common.ores": "Ores", - "tag.minecraft.block.common.ores.netherite_scrap": "Netherite Scrapes Ores", + "tag.minecraft.block.common.ores.netherite_scrap": "Netherite Scrap Ores", "tag.minecraft.block.common.ores.quartz": "Quartz Ores", "tag.minecraft.block.common.relocation_not_supported": "Relocation Not Supported", "tag.minecraft.block.common.sandstone.blocks": "Sandstone Blocks", @@ -125,13 +125,13 @@ "tag.minecraft.item.common.ores.quartz": "Quartz Ores", "tag.minecraft.item.common.potions": "Potions", "tag.minecraft.item.common.raw_blocks": "Raw Blocks", - "tag.minecraft.item.common.raw_blocks.copper": "Raw Blocks Copper", - "tag.minecraft.item.common.raw_blocks.gold": "Raw Blocks Gold", - "tag.minecraft.item.common.raw_blocks.iron": "Raw Blocks Iron", + "tag.minecraft.item.common.raw_blocks.copper": "Raw Copper Blocks", + "tag.minecraft.item.common.raw_blocks.gold": "Raw Gold Blocks", + "tag.minecraft.item.common.raw_blocks.iron": "Raw Iron Blocks", "tag.minecraft.item.common.raw_materials": "Raw Materials", - "tag.minecraft.item.common.raw_materials.copper": "Raw Materials Copper", - "tag.minecraft.item.common.raw_materials.gold": "Raw Materials Gold", - "tag.minecraft.item.common.raw_materials.iron": "Raw Materials Iron", + "tag.minecraft.item.common.raw_materials.copper": "Raw Copper Materials", + "tag.minecraft.item.common.raw_materials.gold": "Raw Gold Materials", + "tag.minecraft.item.common.raw_materials.iron": "Raw Iron Materials", "tag.minecraft.item.common.sandstone.blocks": "Sandstone Blocks", "tag.minecraft.item.common.sandstone.red_blocks": "Red Sandstone Blocks", "tag.minecraft.item.common.sandstone.red_slabs": "Red Sandstone Slabs", From b794e98cf7863d0db807e73b53b0c3d96ab6b709 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 13 Sep 2023 06:25:04 -0400 Subject: [PATCH 018/123] Fixed logic and use minecraft constant --- .../tag/convention/client/ConventionLogWarningsClient.java | 3 ++- .../net/fabricmc/fabric/api/tag/convention/v2/TagUtil.java | 2 +- .../fabric/impl/tag/convention/ConventionLogWarnings.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java b/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java index 6e23ab788b..92d594e3fd 100644 --- a/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java +++ b/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java @@ -22,6 +22,7 @@ import java.util.List; import it.unimi.dsi.fastutil.objects.ObjectArrayList; +import net.minecraft.util.Identifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,7 +57,7 @@ private static void setupUntranslatedItemTagWarning() { List> untranslatedItemTags = new ObjectArrayList<>(); itemRegistry.streamTags().forEach(itemTagKey -> { // We do not translate vanilla's tags at this moment. - if (itemTagKey.id().getNamespace().equals("minecraft")) { + if (itemTagKey.id().getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) { return; } diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/TagUtil.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/TagUtil.java index 27c7650968..2492a8ecda 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/TagUtil.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/TagUtil.java @@ -94,7 +94,7 @@ public static String getTagTranslationKey(TagKey tagKey) { Identifier registryIdentifier = tagKey.registry().getValue(); Identifier tagIdentifier = tagKey.id(); - if (registryIdentifier.getNamespace().equals("minecraft")) { + if (!registryIdentifier.getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) { stringBuilder.append(registryIdentifier.getNamespace()) .append("."); } diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 851d26518d..d2708eadcd 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -22,6 +22,7 @@ import java.util.List; import it.unimi.dsi.fastutil.objects.ObjectArrayList; +import net.minecraft.util.Identifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,7 +55,7 @@ private static void setupLegacyTagWarning() { // We only care about vanilla registries dynamicRegistries.streamAllRegistries().forEach(registryEntry -> { - if (registryEntry.key().getValue().getNamespace().equals("minecraft")) { + if (registryEntry.key().getValue().getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) { registryEntry.value().streamTags().forEach(tagKey -> { // Grab tags under 'c' namespace if (tagKey.id().getNamespace().equals("c")) { From 734b1137c761099e751b7bca1959eee317b2524a Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 13 Sep 2023 06:25:59 -0400 Subject: [PATCH 019/123] Fixed imports. Thanks intellij --- .../impl/tag/convention/client/ConventionLogWarningsClient.java | 2 +- .../fabric/impl/tag/convention/ConventionLogWarnings.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java b/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java index 92d594e3fd..3aec244dba 100644 --- a/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java +++ b/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java @@ -22,7 +22,6 @@ import java.util.List; import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import net.minecraft.util.Identifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,6 +30,7 @@ import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index d2708eadcd..a48acbe0f1 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -22,12 +22,12 @@ import java.util.List; import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import net.minecraft.util.Identifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; From 770dd9a167ac2e840ebe1e73aca423e62b9bf3c2 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 13 Sep 2023 18:35:47 -0400 Subject: [PATCH 020/123] set translation warning to silenced by default --- .../impl/tag/convention/client/ConventionLogWarningsClient.java | 1 + .../fabric/impl/tag/convention/ConventionLogWarningConfigs.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java b/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java index 3aec244dba..5a74897d89 100644 --- a/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java +++ b/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java @@ -72,6 +72,7 @@ private static void setupUntranslatedItemTagWarning() { StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append(""" \n Dev warning - Untranslated Item Tags detected. Please translate your item tags so other mods such as recipe viewers can properly display your tag's name. + The format desired is tag.item.. for the translation key with slashes in path turned into periods. You can disable this dev message in Fabric API's properties config file by setting log-untranslated-item-tag-warning to "SILENCED" or see individual tags with "DEV_VERBOSE". """); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java index 387033dd42..57ab8038da 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java @@ -71,7 +71,7 @@ public enum LOG_WARNING_MODES { } } - LOG_UNTRANSLATED_WARNING_MODE = asEnum((String) properties.computeIfAbsent("log-untranslated-item-tag-warnings", (a) -> "DEV_SHORT"), LOG_WARNING_MODES.DEV_SHORT); + LOG_UNTRANSLATED_WARNING_MODE = asEnum((String) properties.computeIfAbsent("log-untranslated-item-tag-warnings", (a) -> "SILENCED"), LOG_WARNING_MODES.SILENCED); LOG_LEGACY_WARNING_MODE = asEnum((String) properties.computeIfAbsent("log-legacy-tag-warnings", (a) -> "DEV_SHORT"), LOG_WARNING_MODES.DEV_SHORT); try (FileOutputStream stream = new FileOutputStream(configFile)) { From 1aad87d1e255d302115fa5df094ac1b47386c0f6 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 13 Sep 2023 19:50:30 -0400 Subject: [PATCH 021/123] Migrated the translation method to TagKey --- .../client/ConventionLogWarningsClient.java | 2 +- .../convention/v2/FabricTagKeyExtension.java | 78 +++++++++++++++++++ .../fabric/api/tag/convention/v2/TagUtil.java | 26 ------- .../TagKeyExtension/TagKeyExtensionMixin.java | 27 +++++++ .../fabric-convention-tags-api-v2.mixins.json | 11 +++ .../src/main/resources/fabric.mod.json | 8 +- .../v1/provider/FabricLanguageProvider.java | 2 +- 7 files changed, 125 insertions(+), 29 deletions(-) create mode 100644 fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/FabricTagKeyExtension.java create mode 100644 fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/TagKeyExtension/TagKeyExtensionMixin.java create mode 100644 fabric-convention-tags-v2/src/main/resources/fabric-convention-tags-api-v2.mixins.json diff --git a/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java b/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java index 5a74897d89..890a05bdbc 100644 --- a/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java +++ b/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java @@ -61,7 +61,7 @@ private static void setupUntranslatedItemTagWarning() { return; } - String translationKey = TagUtil.getTagTranslationKey(itemTagKey); + String translationKey = itemTagKey.getTagTranslationKey(); if (!I18n.hasTranslation(translationKey)) { untranslatedItemTags.add(itemTagKey); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/FabricTagKeyExtension.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/FabricTagKeyExtension.java new file mode 100644 index 0000000000..6db8aa3179 --- /dev/null +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/FabricTagKeyExtension.java @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.api.tag.convention.v2; + +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import net.minecraft.registry.tag.TagKey; + +/** + * General-purpose Fabric-provided extensions for {@link TagKey} subclasses. + * + *

These extensions were designed primarily for giving extra utility methods for TagKeys usages. + * Getting a TagKey's translation key for example. + * + *

Note: This interface is automatically implemented on all {@link TagKey} instances via Mixin and interface injection. + */ +public interface FabricTagKeyExtension { + /** + * Use this to get a TagKey's translation key safely on any side. + * + *

Format for vanilla registry TagKeys is: + * tag.(registry_path).(tag_namespace).(tag_path) + * + *

Format for modded registry TagKeys is: + * tag.(registry_namespace).(registry_path).(tag_namespace).(tag_path) + * + *

The registry's path and tag path's slashes will be converted to periods. + * + * @return the translation key for a TagKey. + */ + default String getTagTranslationKey() { + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append("tag."); + + TagKey tagKey = ((TagKey) this); + Identifier registryIdentifier = tagKey.registry().getValue(); + Identifier tagIdentifier = tagKey.id(); + + if (!registryIdentifier.getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) { + stringBuilder.append(registryIdentifier.getNamespace()) + .append("."); + } + + stringBuilder.append(registryIdentifier.getPath().replace("/", ".")) + .append(".") + .append(tagIdentifier.getNamespace()) + .append(".") + .append(tagIdentifier.getPath().replace("/", ".").replace(":", ".")); + + return stringBuilder.toString(); + } + + /** + * Use this to get a TagKey's translatable text for display purposes. + * + *

The text uses the result of {@link TagKey#getTagTranslationKey} for the translation key + * and will fall back to displaying #tag_namespace:tag_path if no translation exists. + * + * @return the translatable text for a TagKey. + */ + default Text getTagTranslatableText() { + return Text.translatableWithFallback(getTagTranslationKey(), "#" + ((TagKey) this).id().toString()); + } +} diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/TagUtil.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/TagUtil.java index 2492a8ecda..036f74e695 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/TagUtil.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/TagUtil.java @@ -21,7 +21,6 @@ import org.jetbrains.annotations.Nullable; -import net.minecraft.util.Identifier; import net.minecraft.registry.Registries; import net.minecraft.registry.tag.TagKey; import net.minecraft.registry.DynamicRegistryManager; @@ -82,29 +81,4 @@ public static boolean isIn(@Nullable DynamicRegistryManager registryManager, return false; } - - /** - * Use this to get a TagKey's translation key safely on any side. - * @return the translation key for a TagKey. - */ - public static String getTagTranslationKey(TagKey tagKey) { - StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append("tag."); - - Identifier registryIdentifier = tagKey.registry().getValue(); - Identifier tagIdentifier = tagKey.id(); - - if (!registryIdentifier.getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) { - stringBuilder.append(registryIdentifier.getNamespace()) - .append("."); - } - - stringBuilder.append(registryIdentifier.getPath().replace("/", ".")) - .append(".") - .append(tagIdentifier.getNamespace()) - .append(".") - .append(tagIdentifier.getPath().replace("/", ".").replace(":", ".")); - - return stringBuilder.toString(); - } } diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/TagKeyExtension/TagKeyExtensionMixin.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/TagKeyExtension/TagKeyExtensionMixin.java new file mode 100644 index 0000000000..844a25fe33 --- /dev/null +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/TagKeyExtension/TagKeyExtensionMixin.java @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.mixin.TagKeyExtension; + +import org.spongepowered.asm.mixin.Mixin; + +import net.minecraft.registry.tag.TagKey; + +import net.fabricmc.fabric.api.tag.convention.v2.FabricTagKeyExtension; + +@Mixin(TagKey.class) +public interface TagKeyExtensionMixin extends FabricTagKeyExtension { +} diff --git a/fabric-convention-tags-v2/src/main/resources/fabric-convention-tags-api-v2.mixins.json b/fabric-convention-tags-v2/src/main/resources/fabric-convention-tags-api-v2.mixins.json new file mode 100644 index 0000000000..986c35c3e5 --- /dev/null +++ b/fabric-convention-tags-v2/src/main/resources/fabric-convention-tags-api-v2.mixins.json @@ -0,0 +1,11 @@ +{ + "required": true, + "package": "net.fabricmc.fabric.mixin.TagKeyExtension", + "compatibilityLevel": "JAVA_17", + "mixins": [ + "TagKeyExtensionMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/fabric-convention-tags-v2/src/main/resources/fabric.mod.json b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json index f74430caf8..bcaa0d563d 100644 --- a/fabric-convention-tags-v2/src/main/resources/fabric.mod.json +++ b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json @@ -28,8 +28,14 @@ "minecraft": ">=1.18.2", "fabric-lifecycle-events-v1": "*" }, + "mixins": [ + "fabric-convention-tags-api-v2.mixins.json" + ], "description": "Contains common tags used by mods for vanilla things.", "custom": { - "fabric-api:module-lifecycle": "stable" + "fabric-api:module-lifecycle": "stable", + "loom:injected_interfaces": { + "net/minecraft/class_6862": ["net/fabricmc/fabric/api/tag/convention/v2/FabricTagKeyExtension"] + } } } diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java index 06ad11a11a..044f1ce062 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java @@ -231,7 +231,7 @@ default void add(Identifier identifier, String value) { * @param value The value of the entry. */ default void add(TagKey tagKey, String value) { - add(TagUtil.getTagTranslationKey(tagKey), value); + add(tagKey.getTagTranslationKey(), value); } /** From 3b40f243502f06e06bf8535382901d0a50cfd41c Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 13 Sep 2023 19:50:42 -0400 Subject: [PATCH 022/123] datagenned proper lang keys --- .../lang/en_us.json | 414 +++++++++--------- 1 file changed, 207 insertions(+), 207 deletions(-) diff --git a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json index eeaae88323..1840947b5d 100644 --- a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json +++ b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json @@ -1,209 +1,209 @@ { - "tag.minecraft.block.common.barrels": "Barrels", - "tag.minecraft.block.common.barrels.wooden": "Barrels Wooden", - "tag.minecraft.block.common.bookshelves": "Bookshelves", - "tag.minecraft.block.common.budding_blocks": "Budding Blocks", - "tag.minecraft.block.common.buds": "Buds", - "tag.minecraft.block.common.chests": "Chests", - "tag.minecraft.block.common.clusters": "Clusters", - "tag.minecraft.block.common.dyed_blocks": "Dyed Blocks", - "tag.minecraft.block.common.dyed_blocks.black": "Black Dyed Blocks", - "tag.minecraft.block.common.dyed_blocks.blue": "Blue Dyed Blocks", - "tag.minecraft.block.common.dyed_blocks.brown": "Brown Dyed Blocks", - "tag.minecraft.block.common.dyed_blocks.cyan": "Cyan Dyed Blocks", - "tag.minecraft.block.common.dyed_blocks.gray": "Gray Dyed Blocks", - "tag.minecraft.block.common.dyed_blocks.green": "Green Dyed Blocks", - "tag.minecraft.block.common.dyed_blocks.light_blue": "Light Blue Dyed Blocks", - "tag.minecraft.block.common.dyed_blocks.light_gray": "Light Gray Dyed Blocks", - "tag.minecraft.block.common.dyed_blocks.lime": "Lime Dyed Blocks", - "tag.minecraft.block.common.dyed_blocks.magenta": "Magenta Dyed Blocks", - "tag.minecraft.block.common.dyed_blocks.orange": "Orange Dyed Blocks", - "tag.minecraft.block.common.dyed_blocks.pink": "Pink Dyed Blocks", - "tag.minecraft.block.common.dyed_blocks.purple": "Purple Dyed Blocks", - "tag.minecraft.block.common.dyed_blocks.red": "Red Dyed Blocks", - "tag.minecraft.block.common.dyed_blocks.white": "White Dyed Blocks", - "tag.minecraft.block.common.dyed_blocks.yellow": "Yellow Dyed Blocks", - "tag.minecraft.block.common.glass_blocks": "Glass Blocks", - "tag.minecraft.block.common.glass_panes": "Glass Panes", - "tag.minecraft.block.common.ores": "Ores", - "tag.minecraft.block.common.ores.netherite_scrap": "Netherite Scrap Ores", - "tag.minecraft.block.common.ores.quartz": "Quartz Ores", - "tag.minecraft.block.common.relocation_not_supported": "Relocation Not Supported", - "tag.minecraft.block.common.sandstone.blocks": "Sandstone Blocks", - "tag.minecraft.block.common.sandstone.red_blocks": "Red Sandstone Blocks", - "tag.minecraft.block.common.sandstone.red_slabs": "Red Sandstone Slabs", - "tag.minecraft.block.common.sandstone.red_stairs": "Red Sandstone Stairs", - "tag.minecraft.block.common.sandstone.slabs": "Sandstone Slabs", - "tag.minecraft.block.common.sandstone.stairs": "Sandstone Stairs", - "tag.minecraft.block.common.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", - "tag.minecraft.block.common.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", - "tag.minecraft.block.common.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", - "tag.minecraft.block.common.shulker_boxes": "Shulker Boxes", - "tag.minecraft.block.common.villager_job_sites": "Villager Job Sites", - "tag.minecraft.block_entity_type.common.relocation_not_supported": "Relocation Not Supported", - "tag.minecraft.enchantment.common.entity_defense_enhancement": "Entity Defense Enhancements", - "tag.minecraft.enchantment.common.entity_movement_enhancement": "Entity Movement Enhancements", - "tag.minecraft.enchantment.common.fortune": "Increases Block Drops", - "tag.minecraft.enchantment.common.looting": "Increases Entity Drops", - "tag.minecraft.enchantment.common.weapon_damage_enhancement": "Weapon Damage Enhancements", - "tag.minecraft.entity_type.common.boats": "Boats", - "tag.minecraft.entity_type.common.bosses": "Bosses", - "tag.minecraft.entity_type.common.capturing_not_supported": "Capturing Not Supported", - "tag.minecraft.entity_type.common.minecarts": "Minecarts", - "tag.minecraft.fluid.common.honey": "Honey", - "tag.minecraft.fluid.common.lava": "Lava", - "tag.minecraft.fluid.common.milk": "Milk", - "tag.minecraft.fluid.common.water": "Water", - "tag.minecraft.item.common.barrels": "Barrels", - "tag.minecraft.item.common.barrels.wooden": "Wooden Barrels", - "tag.minecraft.item.common.bookshelves": "Bookshelves", - "tag.minecraft.item.common.buckets.empty": "Empty Buckets", - "tag.minecraft.item.common.buckets.entity_water": "Entity Water Buckets", - "tag.minecraft.item.common.buckets.lava": "Lava Buckets", - "tag.minecraft.item.common.buckets.milk": "Milk Buckets", - "tag.minecraft.item.common.buckets.water": "Water Buckets", - "tag.minecraft.item.common.budding_blocks": "Budding Blocks", - "tag.minecraft.item.common.buds": "Buds", - "tag.minecraft.item.common.chests": "Chests", - "tag.minecraft.item.common.clusters": "Clusters", - "tag.minecraft.item.common.coal": "Coal", - "tag.minecraft.item.common.dusts": "Dusts", - "tag.minecraft.item.common.dusts.glowstone": "Glowstone Dusts", - "tag.minecraft.item.common.dusts.redstone": "Redstone Dusts", - "tag.minecraft.item.common.dyed_items": "Dyed Items", - "tag.minecraft.item.common.dyed_items.black": "Black Dyed Items", - "tag.minecraft.item.common.dyed_items.blue": "Blue Dyed Items", - "tag.minecraft.item.common.dyed_items.brown": "Brown Dyed Items", - "tag.minecraft.item.common.dyed_items.cyan": "Cyan Dyed Items", - "tag.minecraft.item.common.dyed_items.gray": "Gray Dyed Items", - "tag.minecraft.item.common.dyed_items.green": "Green Dyed Items", - "tag.minecraft.item.common.dyed_items.light_blue": "Light Blue Dyed Items", - "tag.minecraft.item.common.dyed_items.light_gray": "Light Gray Dyed Items", - "tag.minecraft.item.common.dyed_items.lime": "Lime Dyed Items", - "tag.minecraft.item.common.dyed_items.magenta": "Magenta Dyed Items", - "tag.minecraft.item.common.dyed_items.orange": "Orange Dyed Items", - "tag.minecraft.item.common.dyed_items.pink": "Pink Dyed Items", - "tag.minecraft.item.common.dyed_items.purple": "Purple Dyed Items", - "tag.minecraft.item.common.dyed_items.red": "Red Dyed Items", - "tag.minecraft.item.common.dyed_items.white": "White Dyed Items", - "tag.minecraft.item.common.dyed_items.yellow": "Yellow Dyed Items", - "tag.minecraft.item.common.dyes": "Dyes", - "tag.minecraft.item.common.dyes.black": "Black Dyes", - "tag.minecraft.item.common.dyes.blue": "Blue Dyes", - "tag.minecraft.item.common.dyes.brown": "Brown Dyes", - "tag.minecraft.item.common.dyes.cyan": "Cyan Dyes", - "tag.minecraft.item.common.dyes.gray": "Gray Dyes", - "tag.minecraft.item.common.dyes.green": "Green Dyes", - "tag.minecraft.item.common.dyes.light_blue": "Light Blue Dyes", - "tag.minecraft.item.common.dyes.light_gray": "Light Gray Dyes", - "tag.minecraft.item.common.dyes.lime": "Lime Dyes", - "tag.minecraft.item.common.dyes.magenta": "Magenta Dyes", - "tag.minecraft.item.common.dyes.orange": "Orange Dyes", - "tag.minecraft.item.common.dyes.pink": "Pink Dyes", - "tag.minecraft.item.common.dyes.purple": "Purple Dyes", - "tag.minecraft.item.common.dyes.red": "Red Dyes", - "tag.minecraft.item.common.dyes.white": "White Dyes", - "tag.minecraft.item.common.dyes.yellow": "Yellow Dyes", - "tag.minecraft.item.common.foods": "Foods", - "tag.minecraft.item.common.gems": "Gems", - "tag.minecraft.item.common.gems.amethyst": "Amethyst Gems", - "tag.minecraft.item.common.gems.diamond": "Diamond Gems", - "tag.minecraft.item.common.gems.emerald": "Emerald Gems", - "tag.minecraft.item.common.gems.lapis": "Lapis Gems", - "tag.minecraft.item.common.gems.prismarine": "Prismarine Gems", - "tag.minecraft.item.common.gems.quartz": "Quartz Gems", - "tag.minecraft.item.common.glass_blocks": "Glass Blocks", - "tag.minecraft.item.common.glass_panes": "Glass Panes", - "tag.minecraft.item.common.ingots": "Ingots", - "tag.minecraft.item.common.ingots.copper": "Ingots Copper", - "tag.minecraft.item.common.ingots.gold": "Ingots Gold", - "tag.minecraft.item.common.ingots.iron": "Ingots Iron", - "tag.minecraft.item.common.ingots.netherite": "Ingots Netherite", - "tag.minecraft.item.common.nuggets": "Nuggets", - "tag.minecraft.item.common.ores": "Ores", - "tag.minecraft.item.common.ores.netherite_scrap": "Netherite Scrap Ores", - "tag.minecraft.item.common.ores.quartz": "Quartz Ores", - "tag.minecraft.item.common.potions": "Potions", - "tag.minecraft.item.common.raw_blocks": "Raw Blocks", - "tag.minecraft.item.common.raw_blocks.copper": "Raw Copper Blocks", - "tag.minecraft.item.common.raw_blocks.gold": "Raw Gold Blocks", - "tag.minecraft.item.common.raw_blocks.iron": "Raw Iron Blocks", - "tag.minecraft.item.common.raw_materials": "Raw Materials", - "tag.minecraft.item.common.raw_materials.copper": "Raw Copper Materials", - "tag.minecraft.item.common.raw_materials.gold": "Raw Gold Materials", - "tag.minecraft.item.common.raw_materials.iron": "Raw Iron Materials", - "tag.minecraft.item.common.sandstone.blocks": "Sandstone Blocks", - "tag.minecraft.item.common.sandstone.red_blocks": "Red Sandstone Blocks", - "tag.minecraft.item.common.sandstone.red_slabs": "Red Sandstone Slabs", - "tag.minecraft.item.common.sandstone.red_stairs": "Red Sandstone Stairs", - "tag.minecraft.item.common.sandstone.slabs": "Sandstone Slabs", - "tag.minecraft.item.common.sandstone.stairs": "Sandstone Stairs", - "tag.minecraft.item.common.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", - "tag.minecraft.item.common.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", - "tag.minecraft.item.common.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", - "tag.minecraft.item.common.shulker_boxes": "Shulker Boxes", - "tag.minecraft.item.common.tools": "Tools", - "tag.minecraft.item.common.tools.bows": "Bows", - "tag.minecraft.item.common.tools.crossbows": "Crossbows", - "tag.minecraft.item.common.tools.fishing_rods": "Fishing Rods", - "tag.minecraft.item.common.tools.shears": "Shears", - "tag.minecraft.item.common.tools.shields": "Shields", - "tag.minecraft.item.common.tools.spears": "Spears", - "tag.minecraft.item.common.villager_job_sites": "Villager Job Sites", - "tag.minecraft.worldgen.biome.common.is_aquatic": "Aquatic", - "tag.minecraft.worldgen.biome.common.is_aquatic_icy": "Icy Aquatic", - "tag.minecraft.worldgen.biome.common.is_badlands": "Badlands", - "tag.minecraft.worldgen.biome.common.is_beach": "Beach", - "tag.minecraft.worldgen.biome.common.is_birch_forest": "Birch Forest", - "tag.minecraft.worldgen.biome.common.is_cave": "Cave", - "tag.minecraft.worldgen.biome.common.is_cold": "Cold", - "tag.minecraft.worldgen.biome.common.is_cold.overworld": "Cold Overworld", - "tag.minecraft.worldgen.biome.common.is_dead": "Dead", - "tag.minecraft.worldgen.biome.common.is_deep_ocean": "Deep Ocean", - "tag.minecraft.worldgen.biome.common.is_dense_vegetation": "Dense Vegetation", - "tag.minecraft.worldgen.biome.common.is_dense_vegetation.overworld": "Dense Overworld Vegetation", - "tag.minecraft.worldgen.biome.common.is_desert": "Desert", - "tag.minecraft.worldgen.biome.common.is_dry": "Dry", - "tag.minecraft.worldgen.biome.common.is_dry.overworld": "Dry Overworld", - "tag.minecraft.worldgen.biome.common.is_end_island": "End Island", - "tag.minecraft.worldgen.biome.common.is_extreme_hills": "Extreme Hills", - "tag.minecraft.worldgen.biome.common.is_floral": "Floral", - "tag.minecraft.worldgen.biome.common.is_flower_forest": "Flower Forest", - "tag.minecraft.worldgen.biome.common.is_forest": "Forest", - "tag.minecraft.worldgen.biome.common.is_hot": "Hot", - "tag.minecraft.worldgen.biome.common.is_hot.overworld": "Hot Overworld", - "tag.minecraft.worldgen.biome.common.is_icy": "Icy", - "tag.minecraft.worldgen.biome.common.is_jungle": "Jungle", - "tag.minecraft.worldgen.biome.common.is_mountain": "Mountain", - "tag.minecraft.worldgen.biome.common.is_mountain.peak": "Mountain Peak", - "tag.minecraft.worldgen.biome.common.is_mountain.slope": "Mountain Slope", - "tag.minecraft.worldgen.biome.common.is_mushroom": "Mushroom", - "tag.minecraft.worldgen.biome.common.is_nether": "Nether", - "tag.minecraft.worldgen.biome.common.is_nether_forest": "Nether Forest", - "tag.minecraft.worldgen.biome.common.is_ocean": "Ocean", - "tag.minecraft.worldgen.biome.common.is_overworld": "Overworld", - "tag.minecraft.worldgen.biome.common.is_plains": "Plains", - "tag.minecraft.worldgen.biome.common.is_river": "River", - "tag.minecraft.worldgen.biome.common.is_savanna": "Savanna", - "tag.minecraft.worldgen.biome.common.is_shallow_ocean": "Shallow Ocean", - "tag.minecraft.worldgen.biome.common.is_snowy": "Snowy", - "tag.minecraft.worldgen.biome.common.is_snowy_plains": "Snowy Plains", - "tag.minecraft.worldgen.biome.common.is_sparse_vegetation": "Sparse Vegetation", - "tag.minecraft.worldgen.biome.common.is_sparse_vegetation.overworld": "Sparse Overworld Vegetation", - "tag.minecraft.worldgen.biome.common.is_stony_shores": "Stony Shores", - "tag.minecraft.worldgen.biome.common.is_swamp": "Swamp", - "tag.minecraft.worldgen.biome.common.is_taiga": "Taiga", - "tag.minecraft.worldgen.biome.common.is_temperate": "Temperate", - "tag.minecraft.worldgen.biome.common.is_temperate.overworld": "Temperate Overworld", - "tag.minecraft.worldgen.biome.common.is_the_end": "The End", - "tag.minecraft.worldgen.biome.common.is_tree.coniferous": "Coniferous Tree", - "tag.minecraft.worldgen.biome.common.is_tree.deciduous": "Deciduous Tree", - "tag.minecraft.worldgen.biome.common.is_tree.jungle": "Jungle Tree", - "tag.minecraft.worldgen.biome.common.is_tree.savanna": "Savanna Tree", - "tag.minecraft.worldgen.biome.common.is_underground": "Underground", - "tag.minecraft.worldgen.biome.common.is_void": "Void", - "tag.minecraft.worldgen.biome.common.is_wasteland": "Wasteland", - "tag.minecraft.worldgen.biome.common.is_wet": "Wet", - "tag.minecraft.worldgen.biome.common.is_wet.overworld": "Wet Overworld", - "tag.minecraft.worldgen.biome.common.is_windswept": "Windswept" + "tag.block.common.barrels": "Barrels", + "tag.block.common.barrels.wooden": "Barrels Wooden", + "tag.block.common.bookshelves": "Bookshelves", + "tag.block.common.budding_blocks": "Budding Blocks", + "tag.block.common.buds": "Buds", + "tag.block.common.chests": "Chests", + "tag.block.common.clusters": "Clusters", + "tag.block.common.dyed_blocks": "Dyed Blocks", + "tag.block.common.dyed_blocks.black": "Black Dyed Blocks", + "tag.block.common.dyed_blocks.blue": "Blue Dyed Blocks", + "tag.block.common.dyed_blocks.brown": "Brown Dyed Blocks", + "tag.block.common.dyed_blocks.cyan": "Cyan Dyed Blocks", + "tag.block.common.dyed_blocks.gray": "Gray Dyed Blocks", + "tag.block.common.dyed_blocks.green": "Green Dyed Blocks", + "tag.block.common.dyed_blocks.light_blue": "Light Blue Dyed Blocks", + "tag.block.common.dyed_blocks.light_gray": "Light Gray Dyed Blocks", + "tag.block.common.dyed_blocks.lime": "Lime Dyed Blocks", + "tag.block.common.dyed_blocks.magenta": "Magenta Dyed Blocks", + "tag.block.common.dyed_blocks.orange": "Orange Dyed Blocks", + "tag.block.common.dyed_blocks.pink": "Pink Dyed Blocks", + "tag.block.common.dyed_blocks.purple": "Purple Dyed Blocks", + "tag.block.common.dyed_blocks.red": "Red Dyed Blocks", + "tag.block.common.dyed_blocks.white": "White Dyed Blocks", + "tag.block.common.dyed_blocks.yellow": "Yellow Dyed Blocks", + "tag.block.common.glass_blocks": "Glass Blocks", + "tag.block.common.glass_panes": "Glass Panes", + "tag.block.common.ores": "Ores", + "tag.block.common.ores.netherite_scrap": "Netherite Scrap Ores", + "tag.block.common.ores.quartz": "Quartz Ores", + "tag.block.common.relocation_not_supported": "Relocation Not Supported", + "tag.block.common.sandstone.blocks": "Sandstone Blocks", + "tag.block.common.sandstone.red_blocks": "Red Sandstone Blocks", + "tag.block.common.sandstone.red_slabs": "Red Sandstone Slabs", + "tag.block.common.sandstone.red_stairs": "Red Sandstone Stairs", + "tag.block.common.sandstone.slabs": "Sandstone Slabs", + "tag.block.common.sandstone.stairs": "Sandstone Stairs", + "tag.block.common.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", + "tag.block.common.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", + "tag.block.common.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", + "tag.block.common.shulker_boxes": "Shulker Boxes", + "tag.block.common.villager_job_sites": "Villager Job Sites", + "tag.block_entity_type.common.relocation_not_supported": "Relocation Not Supported", + "tag.enchantment.common.entity_defense_enhancement": "Entity Defense Enhancements", + "tag.enchantment.common.entity_movement_enhancement": "Entity Movement Enhancements", + "tag.enchantment.common.fortune": "Increases Block Drops", + "tag.enchantment.common.looting": "Increases Entity Drops", + "tag.enchantment.common.weapon_damage_enhancement": "Weapon Damage Enhancements", + "tag.entity_type.common.boats": "Boats", + "tag.entity_type.common.bosses": "Bosses", + "tag.entity_type.common.capturing_not_supported": "Capturing Not Supported", + "tag.entity_type.common.minecarts": "Minecarts", + "tag.fluid.common.honey": "Honey", + "tag.fluid.common.lava": "Lava", + "tag.fluid.common.milk": "Milk", + "tag.fluid.common.water": "Water", + "tag.item.common.barrels": "Barrels", + "tag.item.common.barrels.wooden": "Wooden Barrels", + "tag.item.common.bookshelves": "Bookshelves", + "tag.item.common.buckets.empty": "Empty Buckets", + "tag.item.common.buckets.entity_water": "Entity Water Buckets", + "tag.item.common.buckets.lava": "Lava Buckets", + "tag.item.common.buckets.milk": "Milk Buckets", + "tag.item.common.buckets.water": "Water Buckets", + "tag.item.common.budding_blocks": "Budding Blocks", + "tag.item.common.buds": "Buds", + "tag.item.common.chests": "Chests", + "tag.item.common.clusters": "Clusters", + "tag.item.common.coal": "Coal", + "tag.item.common.dusts": "Dusts", + "tag.item.common.dusts.glowstone": "Glowstone Dusts", + "tag.item.common.dusts.redstone": "Redstone Dusts", + "tag.item.common.dyed_items": "Dyed Items", + "tag.item.common.dyed_items.black": "Black Dyed Items", + "tag.item.common.dyed_items.blue": "Blue Dyed Items", + "tag.item.common.dyed_items.brown": "Brown Dyed Items", + "tag.item.common.dyed_items.cyan": "Cyan Dyed Items", + "tag.item.common.dyed_items.gray": "Gray Dyed Items", + "tag.item.common.dyed_items.green": "Green Dyed Items", + "tag.item.common.dyed_items.light_blue": "Light Blue Dyed Items", + "tag.item.common.dyed_items.light_gray": "Light Gray Dyed Items", + "tag.item.common.dyed_items.lime": "Lime Dyed Items", + "tag.item.common.dyed_items.magenta": "Magenta Dyed Items", + "tag.item.common.dyed_items.orange": "Orange Dyed Items", + "tag.item.common.dyed_items.pink": "Pink Dyed Items", + "tag.item.common.dyed_items.purple": "Purple Dyed Items", + "tag.item.common.dyed_items.red": "Red Dyed Items", + "tag.item.common.dyed_items.white": "White Dyed Items", + "tag.item.common.dyed_items.yellow": "Yellow Dyed Items", + "tag.item.common.dyes": "Dyes", + "tag.item.common.dyes.black": "Black Dyes", + "tag.item.common.dyes.blue": "Blue Dyes", + "tag.item.common.dyes.brown": "Brown Dyes", + "tag.item.common.dyes.cyan": "Cyan Dyes", + "tag.item.common.dyes.gray": "Gray Dyes", + "tag.item.common.dyes.green": "Green Dyes", + "tag.item.common.dyes.light_blue": "Light Blue Dyes", + "tag.item.common.dyes.light_gray": "Light Gray Dyes", + "tag.item.common.dyes.lime": "Lime Dyes", + "tag.item.common.dyes.magenta": "Magenta Dyes", + "tag.item.common.dyes.orange": "Orange Dyes", + "tag.item.common.dyes.pink": "Pink Dyes", + "tag.item.common.dyes.purple": "Purple Dyes", + "tag.item.common.dyes.red": "Red Dyes", + "tag.item.common.dyes.white": "White Dyes", + "tag.item.common.dyes.yellow": "Yellow Dyes", + "tag.item.common.foods": "Foods", + "tag.item.common.gems": "Gems", + "tag.item.common.gems.amethyst": "Amethyst Gems", + "tag.item.common.gems.diamond": "Diamond Gems", + "tag.item.common.gems.emerald": "Emerald Gems", + "tag.item.common.gems.lapis": "Lapis Gems", + "tag.item.common.gems.prismarine": "Prismarine Gems", + "tag.item.common.gems.quartz": "Quartz Gems", + "tag.item.common.glass_blocks": "Glass Blocks", + "tag.item.common.glass_panes": "Glass Panes", + "tag.item.common.ingots": "Ingots", + "tag.item.common.ingots.copper": "Ingots Copper", + "tag.item.common.ingots.gold": "Ingots Gold", + "tag.item.common.ingots.iron": "Ingots Iron", + "tag.item.common.ingots.netherite": "Ingots Netherite", + "tag.item.common.nuggets": "Nuggets", + "tag.item.common.ores": "Ores", + "tag.item.common.ores.netherite_scrap": "Netherite Scrap Ores", + "tag.item.common.ores.quartz": "Quartz Ores", + "tag.item.common.potions": "Potions", + "tag.item.common.raw_blocks": "Raw Blocks", + "tag.item.common.raw_blocks.copper": "Raw Copper Blocks", + "tag.item.common.raw_blocks.gold": "Raw Gold Blocks", + "tag.item.common.raw_blocks.iron": "Raw Iron Blocks", + "tag.item.common.raw_materials": "Raw Materials", + "tag.item.common.raw_materials.copper": "Raw Copper Materials", + "tag.item.common.raw_materials.gold": "Raw Gold Materials", + "tag.item.common.raw_materials.iron": "Raw Iron Materials", + "tag.item.common.sandstone.blocks": "Sandstone Blocks", + "tag.item.common.sandstone.red_blocks": "Red Sandstone Blocks", + "tag.item.common.sandstone.red_slabs": "Red Sandstone Slabs", + "tag.item.common.sandstone.red_stairs": "Red Sandstone Stairs", + "tag.item.common.sandstone.slabs": "Sandstone Slabs", + "tag.item.common.sandstone.stairs": "Sandstone Stairs", + "tag.item.common.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", + "tag.item.common.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", + "tag.item.common.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", + "tag.item.common.shulker_boxes": "Shulker Boxes", + "tag.item.common.tools": "Tools", + "tag.item.common.tools.bows": "Bows", + "tag.item.common.tools.crossbows": "Crossbows", + "tag.item.common.tools.fishing_rods": "Fishing Rods", + "tag.item.common.tools.shears": "Shears", + "tag.item.common.tools.shields": "Shields", + "tag.item.common.tools.spears": "Spears", + "tag.item.common.villager_job_sites": "Villager Job Sites", + "tag.worldgen.biome.common.is_aquatic": "Aquatic", + "tag.worldgen.biome.common.is_aquatic_icy": "Icy Aquatic", + "tag.worldgen.biome.common.is_badlands": "Badlands", + "tag.worldgen.biome.common.is_beach": "Beach", + "tag.worldgen.biome.common.is_birch_forest": "Birch Forest", + "tag.worldgen.biome.common.is_cave": "Cave", + "tag.worldgen.biome.common.is_cold": "Cold", + "tag.worldgen.biome.common.is_cold.overworld": "Cold Overworld", + "tag.worldgen.biome.common.is_dead": "Dead", + "tag.worldgen.biome.common.is_deep_ocean": "Deep Ocean", + "tag.worldgen.biome.common.is_dense_vegetation": "Dense Vegetation", + "tag.worldgen.biome.common.is_dense_vegetation.overworld": "Dense Overworld Vegetation", + "tag.worldgen.biome.common.is_desert": "Desert", + "tag.worldgen.biome.common.is_dry": "Dry", + "tag.worldgen.biome.common.is_dry.overworld": "Dry Overworld", + "tag.worldgen.biome.common.is_end_island": "End Island", + "tag.worldgen.biome.common.is_extreme_hills": "Extreme Hills", + "tag.worldgen.biome.common.is_floral": "Floral", + "tag.worldgen.biome.common.is_flower_forest": "Flower Forest", + "tag.worldgen.biome.common.is_forest": "Forest", + "tag.worldgen.biome.common.is_hot": "Hot", + "tag.worldgen.biome.common.is_hot.overworld": "Hot Overworld", + "tag.worldgen.biome.common.is_icy": "Icy", + "tag.worldgen.biome.common.is_jungle": "Jungle", + "tag.worldgen.biome.common.is_mountain": "Mountain", + "tag.worldgen.biome.common.is_mountain.peak": "Mountain Peak", + "tag.worldgen.biome.common.is_mountain.slope": "Mountain Slope", + "tag.worldgen.biome.common.is_mushroom": "Mushroom", + "tag.worldgen.biome.common.is_nether": "Nether", + "tag.worldgen.biome.common.is_nether_forest": "Nether Forest", + "tag.worldgen.biome.common.is_ocean": "Ocean", + "tag.worldgen.biome.common.is_overworld": "Overworld", + "tag.worldgen.biome.common.is_plains": "Plains", + "tag.worldgen.biome.common.is_river": "River", + "tag.worldgen.biome.common.is_savanna": "Savanna", + "tag.worldgen.biome.common.is_shallow_ocean": "Shallow Ocean", + "tag.worldgen.biome.common.is_snowy": "Snowy", + "tag.worldgen.biome.common.is_snowy_plains": "Snowy Plains", + "tag.worldgen.biome.common.is_sparse_vegetation": "Sparse Vegetation", + "tag.worldgen.biome.common.is_sparse_vegetation.overworld": "Sparse Overworld Vegetation", + "tag.worldgen.biome.common.is_stony_shores": "Stony Shores", + "tag.worldgen.biome.common.is_swamp": "Swamp", + "tag.worldgen.biome.common.is_taiga": "Taiga", + "tag.worldgen.biome.common.is_temperate": "Temperate", + "tag.worldgen.biome.common.is_temperate.overworld": "Temperate Overworld", + "tag.worldgen.biome.common.is_the_end": "The End", + "tag.worldgen.biome.common.is_tree.coniferous": "Coniferous Tree", + "tag.worldgen.biome.common.is_tree.deciduous": "Deciduous Tree", + "tag.worldgen.biome.common.is_tree.jungle": "Jungle Tree", + "tag.worldgen.biome.common.is_tree.savanna": "Savanna Tree", + "tag.worldgen.biome.common.is_underground": "Underground", + "tag.worldgen.biome.common.is_void": "Void", + "tag.worldgen.biome.common.is_wasteland": "Wasteland", + "tag.worldgen.biome.common.is_wet": "Wet", + "tag.worldgen.biome.common.is_wet.overworld": "Wet Overworld", + "tag.worldgen.biome.common.is_windswept": "Windswept" } \ No newline at end of file From 2b7e73db94468688c423b2574e836e2a17627821 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 13 Sep 2023 20:28:53 -0400 Subject: [PATCH 023/123] fixed package names --- .../impl/tag/convention/client/ConventionLogWarningsClient.java | 1 - .../{TagKeyExtension => convention}/TagKeyExtensionMixin.java | 2 +- .../main/resources/fabric-convention-tags-api-v2.mixins.json | 2 +- .../fabric/api/datagen/v1/provider/FabricLanguageProvider.java | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) rename fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/{TagKeyExtension => convention}/TagKeyExtensionMixin.java (94%) diff --git a/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java b/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java index 890a05bdbc..5e171eef52 100644 --- a/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java +++ b/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java @@ -34,7 +34,6 @@ import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; -import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; import net.fabricmc.loader.api.FabricLoader; public class ConventionLogWarningsClient implements ClientModInitializer { diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/TagKeyExtension/TagKeyExtensionMixin.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/convention/TagKeyExtensionMixin.java similarity index 94% rename from fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/TagKeyExtension/TagKeyExtensionMixin.java rename to fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/convention/TagKeyExtensionMixin.java index 844a25fe33..738c55115d 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/TagKeyExtension/TagKeyExtensionMixin.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/convention/TagKeyExtensionMixin.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.fabricmc.fabric.mixin.TagKeyExtension; +package net.fabricmc.fabric.mixin.convention; import org.spongepowered.asm.mixin.Mixin; diff --git a/fabric-convention-tags-v2/src/main/resources/fabric-convention-tags-api-v2.mixins.json b/fabric-convention-tags-v2/src/main/resources/fabric-convention-tags-api-v2.mixins.json index 986c35c3e5..d203263ffc 100644 --- a/fabric-convention-tags-v2/src/main/resources/fabric-convention-tags-api-v2.mixins.json +++ b/fabric-convention-tags-v2/src/main/resources/fabric-convention-tags-api-v2.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "net.fabricmc.fabric.mixin.TagKeyExtension", + "package": "net.fabricmc.fabric.mixin.convention", "compatibilityLevel": "JAVA_17", "mixins": [ "TagKeyExtensionMixin" diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java index 044f1ce062..4a06a88ae1 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java @@ -49,7 +49,6 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; /** * Extend this class and implement {@link FabricLanguageProvider#generateTranslations(TranslationBuilder)}. From 685e96021d155383d17dece267a87b5548cc0783 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 13 Sep 2023 20:58:42 -0400 Subject: [PATCH 024/123] Fixed tag test package still using v1 --- .../fabric/test/tag/convention/{v1 => v2}/TagUtilTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename fabric-convention-tags-v2/src/testmod/java/net/fabricmc/fabric/test/tag/convention/{v1 => v2}/TagUtilTest.java (92%) diff --git a/fabric-convention-tags-v2/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v1/TagUtilTest.java b/fabric-convention-tags-v2/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v2/TagUtilTest.java similarity index 92% rename from fabric-convention-tags-v2/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v1/TagUtilTest.java rename to fabric-convention-tags-v2/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v2/TagUtilTest.java index f5833c0442..7fd4c91650 100644 --- a/fabric-convention-tags-v2/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v1/TagUtilTest.java +++ b/fabric-convention-tags-v2/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v2/TagUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.fabricmc.fabric.test.tag.convention.v1; +package net.fabricmc.fabric.test.tag.convention.v2; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,11 +47,11 @@ public void onInitialize() { // If this fails, the tag is missing a biome or the util is broken if (!TagUtil.isIn(server.getRegistryManager(), ConventionalBiomeTags.IS_OVERWORLD, server.getRegistryManager().get(RegistryKeys.BIOME).get(BiomeKeys.BADLANDS))) { - throw new AssertionError("Failed to find an overworld biome (%s) in c:in_overworld!".formatted(BiomeKeys.BADLANDS)); + throw new AssertionError("Failed to find an overworld biome (%s) in common:in_overworld!".formatted(BiomeKeys.BADLANDS)); } if (!TagUtil.isIn(server.getRegistryManager(), ConventionalBlockTags.ORES, Blocks.DIAMOND_ORE)) { - throw new AssertionError("Failed to find diamond ore in c:ores!"); + throw new AssertionError("Failed to find diamond ore in common:ores!"); } //Success! From 14fb3f36908ab4ecd3b940ad16395f2036b5b670 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 08:10:28 -0400 Subject: [PATCH 025/123] Switch to c tag namespace with folder kept --- .../lang/en_us.json | 414 +++++++++--------- .../relocation_not_supported.json | 0 .../{common => c}/tags/blocks/barrels.json | 2 +- .../tags/blocks/barrels/wooden.json | 0 .../tags/blocks/bookshelves.json | 0 .../tags/blocks/budding_blocks.json | 0 .../data/{common => c}/tags/blocks/buds.json | 0 .../{common => c}/tags/blocks/chests.json | 0 .../{common => c}/tags/blocks/clusters.json | 0 .../data/c/tags/blocks/dyed_blocks.json | 21 + .../tags/blocks/dyed_blocks/black.json | 0 .../tags/blocks/dyed_blocks/blue.json | 0 .../tags/blocks/dyed_blocks/brown.json | 0 .../tags/blocks/dyed_blocks/cyan.json | 0 .../tags/blocks/dyed_blocks/gray.json | 0 .../tags/blocks/dyed_blocks/green.json | 0 .../tags/blocks/dyed_blocks/light_blue.json | 0 .../tags/blocks/dyed_blocks/light_gray.json | 0 .../tags/blocks/dyed_blocks/lime.json | 0 .../tags/blocks/dyed_blocks/magenta.json | 0 .../tags/blocks/dyed_blocks/orange.json | 0 .../tags/blocks/dyed_blocks/pink.json | 0 .../tags/blocks/dyed_blocks/purple.json | 0 .../tags/blocks/dyed_blocks/red.json | 0 .../tags/blocks/dyed_blocks/white.json | 0 .../tags/blocks/dyed_blocks/yellow.json | 0 .../tags/blocks/glass_blocks.json | 0 .../tags/blocks/glass_panes.json | 0 .../data/{common => c}/tags/blocks/ores.json | 4 +- .../tags/blocks/ores/netherite_scrap.json | 0 .../tags/blocks/ores/quartz.json | 0 .../tags/blocks/relocation_not_supported.json | 0 .../tags/blocks}/sandstone/blocks.json | 4 +- .../tags/blocks/sandstone/red_blocks.json | 0 .../tags/blocks/sandstone/red_slabs.json | 0 .../tags/blocks/sandstone/red_stairs.json | 0 .../tags/blocks/sandstone/slabs.json | 4 +- .../tags/blocks/sandstone/stairs.json | 4 +- .../blocks/sandstone/uncolored_blocks.json | 0 .../blocks/sandstone/uncolored_slabs.json | 0 .../blocks/sandstone/uncolored_stairs.json | 0 .../tags/blocks/shulker_boxes.json | 0 .../tags/blocks/villager_job_sites.json | 0 .../entity_defense_enhancement.json | 0 .../entity_movement_enhancement.json | 0 .../tags/enchantment/fortune.json | 0 .../tags/enchantment/looting.json | 0 .../weapon_damage_enhancement.json | 0 .../tags/entity_types/boats.json | 0 .../tags/entity_types/bosses.json | 0 .../entity_types/capturing_not_supported.json | 0 .../tags/entity_types/minecarts.json | 0 .../data/{common => c}/tags/fluids/honey.json | 0 .../data/{common => c}/tags/fluids/lava.json | 0 .../data/{common => c}/tags/fluids/milk.json | 0 .../data/{common => c}/tags/fluids/water.json | 0 .../{common => c}/tags/items/barrels.json | 2 +- .../tags/items/barrels/wooden.json | 0 .../{common => c}/tags/items/bookshelves.json | 0 .../tags/items/buckets/empty.json | 0 .../tags/items/buckets/entity_water.json | 0 .../tags/items/buckets/lava.json | 0 .../tags/items/buckets/milk.json | 0 .../tags/items/buckets/water.json | 0 .../tags/items/budding_blocks.json | 0 .../data/{common => c}/tags/items/buds.json | 0 .../data/{common => c}/tags/items/chests.json | 0 .../{common => c}/tags/items/clusters.json | 0 .../data/{common => c}/tags/items/coal.json | 0 .../data/{common => c}/tags/items/dusts.json | 0 .../tags/items/dusts/glowstone.json | 0 .../tags/items/dusts/redstone.json | 0 .../data/c/tags/items/dyed_items.json | 21 + .../tags/items/dyed_items/black.json | 0 .../tags/items/dyed_items/blue.json | 0 .../tags/items/dyed_items/brown.json | 0 .../tags/items/dyed_items/cyan.json | 0 .../tags/items/dyed_items/gray.json | 0 .../tags/items/dyed_items/green.json | 0 .../tags/items/dyed_items/light_blue.json | 0 .../tags/items/dyed_items/light_gray.json | 0 .../tags/items/dyed_items/lime.json | 0 .../tags/items/dyed_items/magenta.json | 0 .../tags/items/dyed_items/orange.json | 0 .../tags/items/dyed_items/pink.json | 0 .../tags/items/dyed_items/purple.json | 0 .../tags/items/dyed_items/red.json | 0 .../tags/items/dyed_items/white.json | 0 .../tags/items/dyed_items/yellow.json | 0 .../data/{common => c}/tags/items/dyes.json | 32 +- .../{common => c}/tags/items/dyes/black.json | 0 .../{common => c}/tags/items/dyes/blue.json | 0 .../{common => c}/tags/items/dyes/brown.json | 0 .../{common => c}/tags/items/dyes/cyan.json | 0 .../{common => c}/tags/items/dyes/gray.json | 0 .../{common => c}/tags/items/dyes/green.json | 0 .../tags/items/dyes/light_blue.json | 0 .../tags/items/dyes/light_gray.json | 0 .../{common => c}/tags/items/dyes/lime.json | 0 .../tags/items/dyes/magenta.json | 0 .../{common => c}/tags/items/dyes/orange.json | 0 .../{common => c}/tags/items/dyes/pink.json | 0 .../{common => c}/tags/items/dyes/purple.json | 0 .../{common => c}/tags/items/dyes/red.json | 0 .../{common => c}/tags/items/dyes/white.json | 0 .../{common => c}/tags/items/dyes/yellow.json | 0 .../data/{common => c}/tags/items/foods.json | 0 .../data/{common => c}/tags/items/gems.json | 0 .../tags/items/gems/amethyst.json | 0 .../tags/items/gems/diamond.json | 0 .../tags/items/gems/emerald.json | 0 .../{common => c}/tags/items/gems/lapis.json | 0 .../tags/items/gems/prismarine.json | 0 .../{common => c}/tags/items/gems/quartz.json | 0 .../tags/items/glass_blocks.json | 0 .../{common => c}/tags/items/glass_panes.json | 0 .../data/{common => c}/tags/items/ingots.json | 0 .../tags/items/ingots/copper.json | 0 .../{common => c}/tags/items/ingots/gold.json | 0 .../{common => c}/tags/items/ingots/iron.json | 0 .../tags/items/ingots/netherite.json | 0 .../{common => c}/tags/items/nuggets.json | 0 .../data/{common => c}/tags/items/ores.json | 8 +- .../tags/items/ores/netherite_scrap.json | 0 .../{common => c}/tags/items/ores/quartz.json | 0 .../{common => c}/tags/items/potions.json | 0 .../{common => c}/tags/items/raw_blocks.json | 0 .../tags/items/raw_blocks/copper.json | 0 .../tags/items/raw_blocks/gold.json | 0 .../tags/items/raw_blocks/iron.json | 0 .../tags/items/raw_materials.json | 6 +- .../tags/items/raw_materials/copper.json | 0 .../tags/items/raw_materials/gold.json | 0 .../tags/items/raw_materials/iron.json | 0 .../tags/items}/sandstone/blocks.json | 4 +- .../tags/items/sandstone/red_blocks.json | 0 .../tags/items/sandstone/red_slabs.json | 0 .../tags/items/sandstone/red_stairs.json | 0 .../tags/items/sandstone/slabs.json | 4 +- .../tags/items/sandstone/stairs.json | 4 +- .../items/sandstone/uncolored_blocks.json | 0 .../tags/items/sandstone/uncolored_slabs.json | 0 .../items/sandstone/uncolored_stairs.json | 0 .../tags/items/shulker_boxes.json | 0 .../data/{common => c}/tags/items/tools.json | 12 +- .../{common => c}/tags/items/tools/bows.json | 0 .../tags/items/tools/crossbows.json | 0 .../tags/items/tools/fishing_rods.json | 0 .../tags/items/tools/shears.json | 0 .../tags/items/tools/shields.json | 0 .../tags/items/tools/spears.json | 0 .../tags/items/villager_job_sites.json | 0 .../tags/worldgen/biome/is_aquatic.json | 4 +- .../tags/worldgen/biome/is_aquatic_icy.json | 0 .../tags/worldgen/biome/is_badlands.json | 0 .../tags/worldgen/biome/is_beach.json | 0 .../tags/worldgen/biome/is_birch_forest.json | 0 .../tags/worldgen/biome/is_cave.json | 0 .../tags/worldgen/biome/is_cold.json | 2 +- .../worldgen/biome/is_cold/overworld.json | 2 +- .../tags/worldgen/biome/is_dead.json | 0 .../tags/worldgen/biome/is_deep_ocean.json | 0 .../worldgen/biome/is_dense_vegetation.json | 2 +- .../biome/is_dense_vegetation/overworld.json | 2 +- .../tags/worldgen/biome/is_desert.json | 0 .../tags/worldgen/biome/is_dry.json | 2 +- .../tags/worldgen/biome/is_dry/overworld.json | 8 +- .../tags/worldgen/biome/is_end_island.json | 0 .../tags/worldgen/biome/is_extreme_hills.json | 0 .../tags/worldgen/biome/is_floral.json | 2 +- .../tags/worldgen/biome/is_flower_forest.json | 0 .../tags/worldgen/biome/is_forest.json | 0 .../tags/worldgen/biome/is_hot.json | 2 +- .../tags/worldgen/biome/is_hot/overworld.json | 12 +- .../tags/worldgen/biome/is_icy.json | 0 .../tags/worldgen/biome/is_jungle.json | 0 .../tags/worldgen/biome/is_mountain.json | 0 .../tags/worldgen/biome/is_mountain/peak.json | 0 .../worldgen/biome/is_mountain/slope.json | 0 .../tags/worldgen/biome/is_mushroom.json | 0 .../tags/worldgen/biome/is_nether.json | 0 .../tags/worldgen/biome/is_nether_forest.json | 0 .../tags/worldgen/biome/is_ocean.json | 4 +- .../tags/worldgen/biome/is_overworld.json | 0 .../tags/worldgen/biome/is_plains.json | 0 .../tags/worldgen/biome/is_river.json | 0 .../tags/worldgen/biome/is_savanna.json | 0 .../tags/worldgen/biome/is_shallow_ocean.json | 0 .../tags/worldgen/biome/is_snowy.json | 0 .../tags/worldgen/biome/is_snowy_plains.json | 0 .../worldgen/biome/is_sparse_vegetation.json | 2 +- .../biome/is_sparse_vegetation/overworld.json | 8 +- .../tags/worldgen/biome/is_stony_shores.json | 0 .../tags/worldgen/biome/is_swamp.json | 0 .../tags/worldgen/biome/is_taiga.json | 0 .../c/tags/worldgen/biome/is_temperate.json | 6 + .../biome/is_temperate/overworld.json | 0 .../tags/worldgen/biome/is_the_end.json | 0 .../worldgen/biome/is_tree/coniferous.json | 2 +- .../worldgen/biome/is_tree/deciduous.json | 0 .../tags/worldgen/biome/is_tree/jungle.json | 2 +- .../tags/worldgen/biome/is_tree/savanna.json | 2 +- .../tags/worldgen/biome/is_underground.json | 2 +- .../tags/worldgen/biome/is_void.json | 0 .../tags/worldgen/biome/is_wasteland.json | 0 .../tags/worldgen/biome/is_wet.json | 2 +- .../tags/worldgen/biome/is_wet/overworld.json | 6 +- .../tags/worldgen/biome/is_windswept.json | 0 .../data/common/tags/blocks/dyed_blocks.json | 21 - .../data/common/tags/items/dyed_items.json | 21 - .../tags/worldgen/biome/is_temperate.json | 6 - .../convention/v2/ConventionalBiomeTags.java | 2 +- .../v2/ConventionalBlockEntityTypeTags.java | 2 +- .../convention/v2/ConventionalBlockTags.java | 2 +- .../v2/ConventionalEnchantmentTags.java | 2 +- .../v2/ConventionalEntityTypeTags.java | 2 +- .../convention/v2/ConventionalFluidTags.java | 2 +- .../convention/v2/ConventionalItemTags.java | 2 +- .../tag/convention/ConventionLogWarnings.java | 5 +- .../impl/tag/convention/TagRegistration.java | 4 +- 220 files changed, 346 insertions(+), 345 deletions(-) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/block_entity_type/relocation_not_supported.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/barrels.json (77%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/barrels/wooden.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/bookshelves.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/budding_blocks.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/buds.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/chests.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/clusters.json (100%) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks.json rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/dyed_blocks/black.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/dyed_blocks/blue.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/dyed_blocks/brown.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/dyed_blocks/cyan.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/dyed_blocks/gray.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/dyed_blocks/green.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/dyed_blocks/light_blue.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/dyed_blocks/light_gray.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/dyed_blocks/lime.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/dyed_blocks/magenta.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/dyed_blocks/orange.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/dyed_blocks/pink.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/dyed_blocks/purple.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/dyed_blocks/red.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/dyed_blocks/white.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/dyed_blocks/yellow.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/glass_blocks.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/glass_panes.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/ores.json (90%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/ores/netherite_scrap.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/ores/quartz.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/relocation_not_supported.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common/tags/items => c/tags/blocks}/sandstone/blocks.json (66%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/sandstone/red_blocks.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/sandstone/red_slabs.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/sandstone/red_stairs.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/sandstone/slabs.json (66%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/sandstone/stairs.json (66%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/sandstone/uncolored_blocks.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/sandstone/uncolored_slabs.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/sandstone/uncolored_stairs.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/shulker_boxes.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/blocks/villager_job_sites.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/enchantment/entity_defense_enhancement.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/enchantment/entity_movement_enhancement.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/enchantment/fortune.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/enchantment/looting.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/enchantment/weapon_damage_enhancement.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/entity_types/boats.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/entity_types/bosses.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/entity_types/capturing_not_supported.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/entity_types/minecarts.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/fluids/honey.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/fluids/lava.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/fluids/milk.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/fluids/water.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/barrels.json (77%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/barrels/wooden.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/bookshelves.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/buckets/empty.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/buckets/entity_water.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/buckets/lava.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/buckets/milk.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/buckets/water.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/budding_blocks.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/buds.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/chests.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/clusters.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/coal.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dusts.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dusts/glowstone.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dusts/redstone.json (100%) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items.json rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyed_items/black.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyed_items/blue.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyed_items/brown.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyed_items/cyan.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyed_items/gray.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyed_items/green.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyed_items/light_blue.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyed_items/light_gray.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyed_items/lime.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyed_items/magenta.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyed_items/orange.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyed_items/pink.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyed_items/purple.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyed_items/red.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyed_items/white.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyed_items/yellow.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyes.json (55%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyes/black.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyes/blue.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyes/brown.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyes/cyan.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyes/gray.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyes/green.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyes/light_blue.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyes/light_gray.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyes/lime.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyes/magenta.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyes/orange.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyes/pink.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyes/purple.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyes/red.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyes/white.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/dyes/yellow.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/foods.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/gems.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/gems/amethyst.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/gems/diamond.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/gems/emerald.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/gems/lapis.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/gems/prismarine.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/gems/quartz.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/glass_blocks.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/glass_panes.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/ingots.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/ingots/copper.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/ingots/gold.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/ingots/iron.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/ingots/netherite.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/nuggets.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/ores.json (84%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/ores/netherite_scrap.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/ores/quartz.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/potions.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/raw_blocks.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/raw_blocks/copper.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/raw_blocks/gold.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/raw_blocks/iron.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/raw_materials.json (73%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/raw_materials/copper.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/raw_materials/gold.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/raw_materials/iron.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common/tags/blocks => c/tags/items}/sandstone/blocks.json (66%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/sandstone/red_blocks.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/sandstone/red_slabs.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/sandstone/red_stairs.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/sandstone/slabs.json (66%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/sandstone/stairs.json (66%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/sandstone/uncolored_blocks.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/sandstone/uncolored_slabs.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/sandstone/uncolored_stairs.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/shulker_boxes.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/tools.json (53%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/tools/bows.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/tools/crossbows.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/tools/fishing_rods.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/tools/shears.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/tools/shields.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/tools/spears.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/items/villager_job_sites.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_aquatic.json (73%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_aquatic_icy.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_badlands.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_beach.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_birch_forest.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_cave.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_cold.json (56%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_cold/overworld.json (92%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_dead.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_deep_ocean.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_dense_vegetation.json (59%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_dense_vegetation/overworld.json (84%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_desert.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_dry.json (56%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_dry/overworld.json (65%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_end_island.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_extreme_hills.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_floral.json (85%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_flower_forest.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_forest.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_hot.json (56%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_hot/overworld.json (63%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_icy.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_jungle.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_mountain.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_mountain/peak.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_mountain/slope.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_mushroom.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_nether.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_nether_forest.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_ocean.json (76%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_overworld.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_plains.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_river.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_savanna.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_shallow_ocean.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_snowy.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_snowy_plains.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_sparse_vegetation.json (58%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_sparse_vegetation/overworld.json (66%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_stony_shores.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_swamp.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_taiga.json (100%) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate.json rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_temperate/overworld.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_the_end.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_tree/coniferous.json (84%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_tree/deciduous.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_tree/jungle.json (81%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_tree/savanna.json (81%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_underground.json (82%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_void.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_wasteland.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_wet.json (56%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_wet/overworld.json (71%) rename fabric-convention-tags-v2/src/generated/resources/data/{common => c}/tags/worldgen/biome/is_windswept.json (100%) delete mode 100644 fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks.json delete mode 100644 fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items.json delete mode 100644 fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_temperate.json diff --git a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json index 1840947b5d..96da38bca5 100644 --- a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json +++ b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json @@ -1,209 +1,209 @@ { - "tag.block.common.barrels": "Barrels", - "tag.block.common.barrels.wooden": "Barrels Wooden", - "tag.block.common.bookshelves": "Bookshelves", - "tag.block.common.budding_blocks": "Budding Blocks", - "tag.block.common.buds": "Buds", - "tag.block.common.chests": "Chests", - "tag.block.common.clusters": "Clusters", - "tag.block.common.dyed_blocks": "Dyed Blocks", - "tag.block.common.dyed_blocks.black": "Black Dyed Blocks", - "tag.block.common.dyed_blocks.blue": "Blue Dyed Blocks", - "tag.block.common.dyed_blocks.brown": "Brown Dyed Blocks", - "tag.block.common.dyed_blocks.cyan": "Cyan Dyed Blocks", - "tag.block.common.dyed_blocks.gray": "Gray Dyed Blocks", - "tag.block.common.dyed_blocks.green": "Green Dyed Blocks", - "tag.block.common.dyed_blocks.light_blue": "Light Blue Dyed Blocks", - "tag.block.common.dyed_blocks.light_gray": "Light Gray Dyed Blocks", - "tag.block.common.dyed_blocks.lime": "Lime Dyed Blocks", - "tag.block.common.dyed_blocks.magenta": "Magenta Dyed Blocks", - "tag.block.common.dyed_blocks.orange": "Orange Dyed Blocks", - "tag.block.common.dyed_blocks.pink": "Pink Dyed Blocks", - "tag.block.common.dyed_blocks.purple": "Purple Dyed Blocks", - "tag.block.common.dyed_blocks.red": "Red Dyed Blocks", - "tag.block.common.dyed_blocks.white": "White Dyed Blocks", - "tag.block.common.dyed_blocks.yellow": "Yellow Dyed Blocks", - "tag.block.common.glass_blocks": "Glass Blocks", - "tag.block.common.glass_panes": "Glass Panes", - "tag.block.common.ores": "Ores", - "tag.block.common.ores.netherite_scrap": "Netherite Scrap Ores", - "tag.block.common.ores.quartz": "Quartz Ores", - "tag.block.common.relocation_not_supported": "Relocation Not Supported", - "tag.block.common.sandstone.blocks": "Sandstone Blocks", - "tag.block.common.sandstone.red_blocks": "Red Sandstone Blocks", - "tag.block.common.sandstone.red_slabs": "Red Sandstone Slabs", - "tag.block.common.sandstone.red_stairs": "Red Sandstone Stairs", - "tag.block.common.sandstone.slabs": "Sandstone Slabs", - "tag.block.common.sandstone.stairs": "Sandstone Stairs", - "tag.block.common.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", - "tag.block.common.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", - "tag.block.common.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", - "tag.block.common.shulker_boxes": "Shulker Boxes", - "tag.block.common.villager_job_sites": "Villager Job Sites", - "tag.block_entity_type.common.relocation_not_supported": "Relocation Not Supported", - "tag.enchantment.common.entity_defense_enhancement": "Entity Defense Enhancements", - "tag.enchantment.common.entity_movement_enhancement": "Entity Movement Enhancements", - "tag.enchantment.common.fortune": "Increases Block Drops", - "tag.enchantment.common.looting": "Increases Entity Drops", - "tag.enchantment.common.weapon_damage_enhancement": "Weapon Damage Enhancements", - "tag.entity_type.common.boats": "Boats", - "tag.entity_type.common.bosses": "Bosses", - "tag.entity_type.common.capturing_not_supported": "Capturing Not Supported", - "tag.entity_type.common.minecarts": "Minecarts", - "tag.fluid.common.honey": "Honey", - "tag.fluid.common.lava": "Lava", - "tag.fluid.common.milk": "Milk", - "tag.fluid.common.water": "Water", - "tag.item.common.barrels": "Barrels", - "tag.item.common.barrels.wooden": "Wooden Barrels", - "tag.item.common.bookshelves": "Bookshelves", - "tag.item.common.buckets.empty": "Empty Buckets", - "tag.item.common.buckets.entity_water": "Entity Water Buckets", - "tag.item.common.buckets.lava": "Lava Buckets", - "tag.item.common.buckets.milk": "Milk Buckets", - "tag.item.common.buckets.water": "Water Buckets", - "tag.item.common.budding_blocks": "Budding Blocks", - "tag.item.common.buds": "Buds", - "tag.item.common.chests": "Chests", - "tag.item.common.clusters": "Clusters", - "tag.item.common.coal": "Coal", - "tag.item.common.dusts": "Dusts", - "tag.item.common.dusts.glowstone": "Glowstone Dusts", - "tag.item.common.dusts.redstone": "Redstone Dusts", - "tag.item.common.dyed_items": "Dyed Items", - "tag.item.common.dyed_items.black": "Black Dyed Items", - "tag.item.common.dyed_items.blue": "Blue Dyed Items", - "tag.item.common.dyed_items.brown": "Brown Dyed Items", - "tag.item.common.dyed_items.cyan": "Cyan Dyed Items", - "tag.item.common.dyed_items.gray": "Gray Dyed Items", - "tag.item.common.dyed_items.green": "Green Dyed Items", - "tag.item.common.dyed_items.light_blue": "Light Blue Dyed Items", - "tag.item.common.dyed_items.light_gray": "Light Gray Dyed Items", - "tag.item.common.dyed_items.lime": "Lime Dyed Items", - "tag.item.common.dyed_items.magenta": "Magenta Dyed Items", - "tag.item.common.dyed_items.orange": "Orange Dyed Items", - "tag.item.common.dyed_items.pink": "Pink Dyed Items", - "tag.item.common.dyed_items.purple": "Purple Dyed Items", - "tag.item.common.dyed_items.red": "Red Dyed Items", - "tag.item.common.dyed_items.white": "White Dyed Items", - "tag.item.common.dyed_items.yellow": "Yellow Dyed Items", - "tag.item.common.dyes": "Dyes", - "tag.item.common.dyes.black": "Black Dyes", - "tag.item.common.dyes.blue": "Blue Dyes", - "tag.item.common.dyes.brown": "Brown Dyes", - "tag.item.common.dyes.cyan": "Cyan Dyes", - "tag.item.common.dyes.gray": "Gray Dyes", - "tag.item.common.dyes.green": "Green Dyes", - "tag.item.common.dyes.light_blue": "Light Blue Dyes", - "tag.item.common.dyes.light_gray": "Light Gray Dyes", - "tag.item.common.dyes.lime": "Lime Dyes", - "tag.item.common.dyes.magenta": "Magenta Dyes", - "tag.item.common.dyes.orange": "Orange Dyes", - "tag.item.common.dyes.pink": "Pink Dyes", - "tag.item.common.dyes.purple": "Purple Dyes", - "tag.item.common.dyes.red": "Red Dyes", - "tag.item.common.dyes.white": "White Dyes", - "tag.item.common.dyes.yellow": "Yellow Dyes", - "tag.item.common.foods": "Foods", - "tag.item.common.gems": "Gems", - "tag.item.common.gems.amethyst": "Amethyst Gems", - "tag.item.common.gems.diamond": "Diamond Gems", - "tag.item.common.gems.emerald": "Emerald Gems", - "tag.item.common.gems.lapis": "Lapis Gems", - "tag.item.common.gems.prismarine": "Prismarine Gems", - "tag.item.common.gems.quartz": "Quartz Gems", - "tag.item.common.glass_blocks": "Glass Blocks", - "tag.item.common.glass_panes": "Glass Panes", - "tag.item.common.ingots": "Ingots", - "tag.item.common.ingots.copper": "Ingots Copper", - "tag.item.common.ingots.gold": "Ingots Gold", - "tag.item.common.ingots.iron": "Ingots Iron", - "tag.item.common.ingots.netherite": "Ingots Netherite", - "tag.item.common.nuggets": "Nuggets", - "tag.item.common.ores": "Ores", - "tag.item.common.ores.netherite_scrap": "Netherite Scrap Ores", - "tag.item.common.ores.quartz": "Quartz Ores", - "tag.item.common.potions": "Potions", - "tag.item.common.raw_blocks": "Raw Blocks", - "tag.item.common.raw_blocks.copper": "Raw Copper Blocks", - "tag.item.common.raw_blocks.gold": "Raw Gold Blocks", - "tag.item.common.raw_blocks.iron": "Raw Iron Blocks", - "tag.item.common.raw_materials": "Raw Materials", - "tag.item.common.raw_materials.copper": "Raw Copper Materials", - "tag.item.common.raw_materials.gold": "Raw Gold Materials", - "tag.item.common.raw_materials.iron": "Raw Iron Materials", - "tag.item.common.sandstone.blocks": "Sandstone Blocks", - "tag.item.common.sandstone.red_blocks": "Red Sandstone Blocks", - "tag.item.common.sandstone.red_slabs": "Red Sandstone Slabs", - "tag.item.common.sandstone.red_stairs": "Red Sandstone Stairs", - "tag.item.common.sandstone.slabs": "Sandstone Slabs", - "tag.item.common.sandstone.stairs": "Sandstone Stairs", - "tag.item.common.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", - "tag.item.common.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", - "tag.item.common.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", - "tag.item.common.shulker_boxes": "Shulker Boxes", - "tag.item.common.tools": "Tools", - "tag.item.common.tools.bows": "Bows", - "tag.item.common.tools.crossbows": "Crossbows", - "tag.item.common.tools.fishing_rods": "Fishing Rods", - "tag.item.common.tools.shears": "Shears", - "tag.item.common.tools.shields": "Shields", - "tag.item.common.tools.spears": "Spears", - "tag.item.common.villager_job_sites": "Villager Job Sites", - "tag.worldgen.biome.common.is_aquatic": "Aquatic", - "tag.worldgen.biome.common.is_aquatic_icy": "Icy Aquatic", - "tag.worldgen.biome.common.is_badlands": "Badlands", - "tag.worldgen.biome.common.is_beach": "Beach", - "tag.worldgen.biome.common.is_birch_forest": "Birch Forest", - "tag.worldgen.biome.common.is_cave": "Cave", - "tag.worldgen.biome.common.is_cold": "Cold", - "tag.worldgen.biome.common.is_cold.overworld": "Cold Overworld", - "tag.worldgen.biome.common.is_dead": "Dead", - "tag.worldgen.biome.common.is_deep_ocean": "Deep Ocean", - "tag.worldgen.biome.common.is_dense_vegetation": "Dense Vegetation", - "tag.worldgen.biome.common.is_dense_vegetation.overworld": "Dense Overworld Vegetation", - "tag.worldgen.biome.common.is_desert": "Desert", - "tag.worldgen.biome.common.is_dry": "Dry", - "tag.worldgen.biome.common.is_dry.overworld": "Dry Overworld", - "tag.worldgen.biome.common.is_end_island": "End Island", - "tag.worldgen.biome.common.is_extreme_hills": "Extreme Hills", - "tag.worldgen.biome.common.is_floral": "Floral", - "tag.worldgen.biome.common.is_flower_forest": "Flower Forest", - "tag.worldgen.biome.common.is_forest": "Forest", - "tag.worldgen.biome.common.is_hot": "Hot", - "tag.worldgen.biome.common.is_hot.overworld": "Hot Overworld", - "tag.worldgen.biome.common.is_icy": "Icy", - "tag.worldgen.biome.common.is_jungle": "Jungle", - "tag.worldgen.biome.common.is_mountain": "Mountain", - "tag.worldgen.biome.common.is_mountain.peak": "Mountain Peak", - "tag.worldgen.biome.common.is_mountain.slope": "Mountain Slope", - "tag.worldgen.biome.common.is_mushroom": "Mushroom", - "tag.worldgen.biome.common.is_nether": "Nether", - "tag.worldgen.biome.common.is_nether_forest": "Nether Forest", - "tag.worldgen.biome.common.is_ocean": "Ocean", - "tag.worldgen.biome.common.is_overworld": "Overworld", - "tag.worldgen.biome.common.is_plains": "Plains", - "tag.worldgen.biome.common.is_river": "River", - "tag.worldgen.biome.common.is_savanna": "Savanna", - "tag.worldgen.biome.common.is_shallow_ocean": "Shallow Ocean", - "tag.worldgen.biome.common.is_snowy": "Snowy", - "tag.worldgen.biome.common.is_snowy_plains": "Snowy Plains", - "tag.worldgen.biome.common.is_sparse_vegetation": "Sparse Vegetation", - "tag.worldgen.biome.common.is_sparse_vegetation.overworld": "Sparse Overworld Vegetation", - "tag.worldgen.biome.common.is_stony_shores": "Stony Shores", - "tag.worldgen.biome.common.is_swamp": "Swamp", - "tag.worldgen.biome.common.is_taiga": "Taiga", - "tag.worldgen.biome.common.is_temperate": "Temperate", - "tag.worldgen.biome.common.is_temperate.overworld": "Temperate Overworld", - "tag.worldgen.biome.common.is_the_end": "The End", - "tag.worldgen.biome.common.is_tree.coniferous": "Coniferous Tree", - "tag.worldgen.biome.common.is_tree.deciduous": "Deciduous Tree", - "tag.worldgen.biome.common.is_tree.jungle": "Jungle Tree", - "tag.worldgen.biome.common.is_tree.savanna": "Savanna Tree", - "tag.worldgen.biome.common.is_underground": "Underground", - "tag.worldgen.biome.common.is_void": "Void", - "tag.worldgen.biome.common.is_wasteland": "Wasteland", - "tag.worldgen.biome.common.is_wet": "Wet", - "tag.worldgen.biome.common.is_wet.overworld": "Wet Overworld", - "tag.worldgen.biome.common.is_windswept": "Windswept" + "tag.block.c.barrels": "Barrels", + "tag.block.c.barrels.wooden": "Barrels Wooden", + "tag.block.c.bookshelves": "Bookshelves", + "tag.block.c.budding_blocks": "Budding Blocks", + "tag.block.c.buds": "Buds", + "tag.block.c.chests": "Chests", + "tag.block.c.clusters": "Clusters", + "tag.block.c.dyed_blocks": "Dyed Blocks", + "tag.block.c.dyed_blocks.black": "Black Dyed Blocks", + "tag.block.c.dyed_blocks.blue": "Blue Dyed Blocks", + "tag.block.c.dyed_blocks.brown": "Brown Dyed Blocks", + "tag.block.c.dyed_blocks.cyan": "Cyan Dyed Blocks", + "tag.block.c.dyed_blocks.gray": "Gray Dyed Blocks", + "tag.block.c.dyed_blocks.green": "Green Dyed Blocks", + "tag.block.c.dyed_blocks.light_blue": "Light Blue Dyed Blocks", + "tag.block.c.dyed_blocks.light_gray": "Light Gray Dyed Blocks", + "tag.block.c.dyed_blocks.lime": "Lime Dyed Blocks", + "tag.block.c.dyed_blocks.magenta": "Magenta Dyed Blocks", + "tag.block.c.dyed_blocks.orange": "Orange Dyed Blocks", + "tag.block.c.dyed_blocks.pink": "Pink Dyed Blocks", + "tag.block.c.dyed_blocks.purple": "Purple Dyed Blocks", + "tag.block.c.dyed_blocks.red": "Red Dyed Blocks", + "tag.block.c.dyed_blocks.white": "White Dyed Blocks", + "tag.block.c.dyed_blocks.yellow": "Yellow Dyed Blocks", + "tag.block.c.glass_blocks": "Glass Blocks", + "tag.block.c.glass_panes": "Glass Panes", + "tag.block.c.ores": "Ores", + "tag.block.c.ores.netherite_scrap": "Netherite Scrap Ores", + "tag.block.c.ores.quartz": "Quartz Ores", + "tag.block.c.relocation_not_supported": "Relocation Not Supported", + "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", + "tag.block.c.sandstone.red_stairs": "Red Sandstone Stairs", + "tag.block.c.sandstone.slabs": "Sandstone Slabs", + "tag.block.c.sandstone.stairs": "Sandstone Stairs", + "tag.block.c.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", + "tag.block.c.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", + "tag.block.c.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", + "tag.block.c.shulker_boxes": "Shulker Boxes", + "tag.block.c.villager_job_sites": "Villager Job Sites", + "tag.block_entity_type.c.relocation_not_supported": "Relocation Not Supported", + "tag.enchantment.c.entity_defense_enhancement": "Entity Defense Enhancements", + "tag.enchantment.c.entity_movement_enhancement": "Entity Movement Enhancements", + "tag.enchantment.c.fortune": "Increases Block Drops", + "tag.enchantment.c.looting": "Increases Entity Drops", + "tag.enchantment.c.weapon_damage_enhancement": "Weapon Damage Enhancements", + "tag.entity_type.c.boats": "Boats", + "tag.entity_type.c.bosses": "Bosses", + "tag.entity_type.c.capturing_not_supported": "Capturing Not Supported", + "tag.entity_type.c.minecarts": "Minecarts", + "tag.fluid.c.honey": "Honey", + "tag.fluid.c.lava": "Lava", + "tag.fluid.c.milk": "Milk", + "tag.fluid.c.water": "Water", + "tag.item.c.barrels": "Barrels", + "tag.item.c.barrels.wooden": "Wooden Barrels", + "tag.item.c.bookshelves": "Bookshelves", + "tag.item.c.buckets.empty": "Empty Buckets", + "tag.item.c.buckets.entity_water": "Entity Water Buckets", + "tag.item.c.buckets.lava": "Lava Buckets", + "tag.item.c.buckets.milk": "Milk Buckets", + "tag.item.c.buckets.water": "Water Buckets", + "tag.item.c.budding_blocks": "Budding Blocks", + "tag.item.c.buds": "Buds", + "tag.item.c.chests": "Chests", + "tag.item.c.clusters": "Clusters", + "tag.item.c.coal": "Coal", + "tag.item.c.dusts": "Dusts", + "tag.item.c.dusts.glowstone": "Glowstone Dusts", + "tag.item.c.dusts.redstone": "Redstone Dusts", + "tag.item.c.dyed_items": "Dyed Items", + "tag.item.c.dyed_items.black": "Black Dyed Items", + "tag.item.c.dyed_items.blue": "Blue Dyed Items", + "tag.item.c.dyed_items.brown": "Brown Dyed Items", + "tag.item.c.dyed_items.cyan": "Cyan Dyed Items", + "tag.item.c.dyed_items.gray": "Gray Dyed Items", + "tag.item.c.dyed_items.green": "Green Dyed Items", + "tag.item.c.dyed_items.light_blue": "Light Blue Dyed Items", + "tag.item.c.dyed_items.light_gray": "Light Gray Dyed Items", + "tag.item.c.dyed_items.lime": "Lime Dyed Items", + "tag.item.c.dyed_items.magenta": "Magenta Dyed Items", + "tag.item.c.dyed_items.orange": "Orange Dyed Items", + "tag.item.c.dyed_items.pink": "Pink Dyed Items", + "tag.item.c.dyed_items.purple": "Purple Dyed Items", + "tag.item.c.dyed_items.red": "Red Dyed Items", + "tag.item.c.dyed_items.white": "White Dyed Items", + "tag.item.c.dyed_items.yellow": "Yellow Dyed Items", + "tag.item.c.dyes": "Dyes", + "tag.item.c.dyes.black": "Black Dyes", + "tag.item.c.dyes.blue": "Blue Dyes", + "tag.item.c.dyes.brown": "Brown Dyes", + "tag.item.c.dyes.cyan": "Cyan Dyes", + "tag.item.c.dyes.gray": "Gray Dyes", + "tag.item.c.dyes.green": "Green Dyes", + "tag.item.c.dyes.light_blue": "Light Blue Dyes", + "tag.item.c.dyes.light_gray": "Light Gray Dyes", + "tag.item.c.dyes.lime": "Lime Dyes", + "tag.item.c.dyes.magenta": "Magenta Dyes", + "tag.item.c.dyes.orange": "Orange Dyes", + "tag.item.c.dyes.pink": "Pink Dyes", + "tag.item.c.dyes.purple": "Purple Dyes", + "tag.item.c.dyes.red": "Red Dyes", + "tag.item.c.dyes.white": "White Dyes", + "tag.item.c.dyes.yellow": "Yellow Dyes", + "tag.item.c.foods": "Foods", + "tag.item.c.gems": "Gems", + "tag.item.c.gems.amethyst": "Amethyst Gems", + "tag.item.c.gems.diamond": "Diamond Gems", + "tag.item.c.gems.emerald": "Emerald Gems", + "tag.item.c.gems.lapis": "Lapis Gems", + "tag.item.c.gems.prismarine": "Prismarine Gems", + "tag.item.c.gems.quartz": "Quartz Gems", + "tag.item.c.glass_blocks": "Glass Blocks", + "tag.item.c.glass_panes": "Glass Panes", + "tag.item.c.ingots": "Ingots", + "tag.item.c.ingots.copper": "Ingots Copper", + "tag.item.c.ingots.gold": "Ingots Gold", + "tag.item.c.ingots.iron": "Ingots Iron", + "tag.item.c.ingots.netherite": "Ingots Netherite", + "tag.item.c.nuggets": "Nuggets", + "tag.item.c.ores": "Ores", + "tag.item.c.ores.netherite_scrap": "Netherite Scrap Ores", + "tag.item.c.ores.quartz": "Quartz Ores", + "tag.item.c.potions": "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", + "tag.item.c.raw_blocks.iron": "Raw Iron Blocks", + "tag.item.c.raw_materials": "Raw Materials", + "tag.item.c.raw_materials.copper": "Raw Copper Materials", + "tag.item.c.raw_materials.gold": "Raw Gold Materials", + "tag.item.c.raw_materials.iron": "Raw Iron Materials", + "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", + "tag.item.c.sandstone.red_stairs": "Red Sandstone Stairs", + "tag.item.c.sandstone.slabs": "Sandstone Slabs", + "tag.item.c.sandstone.stairs": "Sandstone Stairs", + "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.shulker_boxes": "Shulker Boxes", + "tag.item.c.tools": "Tools", + "tag.item.c.tools.bows": "Bows", + "tag.item.c.tools.crossbows": "Crossbows", + "tag.item.c.tools.fishing_rods": "Fishing Rods", + "tag.item.c.tools.shears": "Shears", + "tag.item.c.tools.shields": "Shields", + "tag.item.c.tools.spears": "Spears", + "tag.item.c.villager_job_sites": "Villager Job Sites", + "tag.worldgen.biome.c.is_aquatic": "Aquatic", + "tag.worldgen.biome.c.is_aquatic_icy": "Icy Aquatic", + "tag.worldgen.biome.c.is_badlands": "Badlands", + "tag.worldgen.biome.c.is_beach": "Beach", + "tag.worldgen.biome.c.is_birch_forest": "Birch Forest", + "tag.worldgen.biome.c.is_cave": "Cave", + "tag.worldgen.biome.c.is_cold": "Cold", + "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.overworld": "Dense Overworld Vegetation", + "tag.worldgen.biome.c.is_desert": "Desert", + "tag.worldgen.biome.c.is_dry": "Dry", + "tag.worldgen.biome.c.is_dry.overworld": "Dry Overworld", + "tag.worldgen.biome.c.is_end_island": "End Island", + "tag.worldgen.biome.c.is_extreme_hills": "Extreme Hills", + "tag.worldgen.biome.c.is_floral": "Floral", + "tag.worldgen.biome.c.is_flower_forest": "Flower Forest", + "tag.worldgen.biome.c.is_forest": "Forest", + "tag.worldgen.biome.c.is_hot": "Hot", + "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_mountain": "Mountain", + "tag.worldgen.biome.c.is_mountain.peak": "Mountain Peak", + "tag.worldgen.biome.c.is_mountain.slope": "Mountain Slope", + "tag.worldgen.biome.c.is_mushroom": "Mushroom", + "tag.worldgen.biome.c.is_nether": "Nether", + "tag.worldgen.biome.c.is_nether_forest": "Nether Forest", + "tag.worldgen.biome.c.is_ocean": "Ocean", + "tag.worldgen.biome.c.is_overworld": "Overworld", + "tag.worldgen.biome.c.is_plains": "Plains", + "tag.worldgen.biome.c.is_river": "River", + "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.overworld": "Sparse Overworld Vegetation", + "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.overworld": "Temperate Overworld", + "tag.worldgen.biome.c.is_the_end": "The End", + "tag.worldgen.biome.c.is_tree.coniferous": "Coniferous Tree", + "tag.worldgen.biome.c.is_tree.deciduous": "Deciduous Tree", + "tag.worldgen.biome.c.is_tree.jungle": "Jungle Tree", + "tag.worldgen.biome.c.is_tree.savanna": "Savanna Tree", + "tag.worldgen.biome.c.is_underground": "Underground", + "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.overworld": "Wet Overworld", + "tag.worldgen.biome.c.is_windswept": "Windswept" } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/block_entity_type/relocation_not_supported.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block_entity_type/relocation_not_supported.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/block_entity_type/relocation_not_supported.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/block_entity_type/relocation_not_supported.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/barrels.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/barrels.json similarity index 77% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/barrels.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/barrels.json index 41ceb0e0d3..8d3a2bb09b 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/barrels.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/barrels.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "#common:barrels/wooden", + "#c:barrels/wooden", { "id": "#c:barrels", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/barrels/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/barrels/wooden.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/barrels/wooden.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/barrels/wooden.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/bookshelves.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/bookshelves.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/bookshelves.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/bookshelves.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/budding_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/budding_blocks.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/budding_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/budding_blocks.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/buds.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/buds.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/buds.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/buds.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/chests.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/chests.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/clusters.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/clusters.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/clusters.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/clusters.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks.json new file mode 100644 index 0000000000..0f32bfac56 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "#c:dyed_blocks/black", + "#c:dyed_blocks/blue", + "#c:dyed_blocks/brown", + "#c:dyed_blocks/cyan", + "#c:dyed_blocks/gray", + "#c:dyed_blocks/green", + "#c:dyed_blocks/light_blue", + "#c:dyed_blocks/light_gray", + "#c:dyed_blocks/lime", + "#c:dyed_blocks/magenta", + "#c:dyed_blocks/orange", + "#c:dyed_blocks/pink", + "#c:dyed_blocks/purple", + "#c:dyed_blocks/red", + "#c:dyed_blocks/white", + "#c:dyed_blocks/yellow" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/black.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/black.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/black.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/black.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/blue.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/blue.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/blue.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/blue.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/brown.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/brown.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/brown.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/brown.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/cyan.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/cyan.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/cyan.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/cyan.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/gray.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/gray.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/gray.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/gray.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/green.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/green.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/green.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/green.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_blue.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/light_blue.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_blue.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/light_blue.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_gray.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/light_gray.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/light_gray.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/light_gray.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/lime.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/lime.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/lime.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/lime.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/magenta.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/magenta.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/magenta.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/magenta.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/orange.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/orange.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/orange.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/orange.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/pink.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/pink.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/pink.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/pink.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/purple.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/purple.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/purple.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/purple.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/red.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/red.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/red.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/red.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/white.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/white.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/white.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/white.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/yellow.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/yellow.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks/yellow.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/yellow.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/glass_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/glass_blocks.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/glass_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/glass_blocks.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/glass_panes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/glass_panes.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/glass_panes.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/glass_panes.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/ores.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores.json similarity index 90% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/ores.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores.json index e41d456f25..c52789559e 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/ores.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores.json @@ -34,11 +34,11 @@ "required": false }, { - "id": "#common:ores/quartz", + "id": "#c:ores/quartz", "required": false }, { - "id": "#common:ores/netherite_scrap", + "id": "#c:ores/netherite_scrap", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/ores/netherite_scrap.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores/netherite_scrap.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/ores/netherite_scrap.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores/netherite_scrap.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/ores/quartz.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores/quartz.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/ores/quartz.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores/quartz.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/relocation_not_supported.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/relocation_not_supported.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/relocation_not_supported.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/relocation_not_supported.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/blocks.json similarity index 66% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/blocks.json index 3c7666272a..23a686229b 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/blocks.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/blocks.json @@ -2,11 +2,11 @@ "replace": false, "values": [ { - "id": "#common:sandstone/uncolored_blocks", + "id": "#c:sandstone/uncolored_blocks", "required": false }, { - "id": "#common:sandstone/red_blocks", + "id": "#c:sandstone/red_blocks", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/red_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/red_blocks.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/red_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/red_blocks.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/red_slabs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/red_slabs.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/red_slabs.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/red_slabs.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/red_stairs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/red_stairs.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/red_stairs.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/red_stairs.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/slabs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/slabs.json similarity index 66% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/slabs.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/slabs.json index 6d75e8f765..8d6c86218a 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/slabs.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/slabs.json @@ -2,11 +2,11 @@ "replace": false, "values": [ { - "id": "#common:sandstone/uncolored_slabs", + "id": "#c:sandstone/uncolored_slabs", "required": false }, { - "id": "#common:sandstone/red_slabs", + "id": "#c:sandstone/red_slabs", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/stairs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/stairs.json similarity index 66% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/stairs.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/stairs.json index c6eca053fd..c9f3632241 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/stairs.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/stairs.json @@ -2,11 +2,11 @@ "replace": false, "values": [ { - "id": "#common:sandstone/uncolored_stairs", + "id": "#c:sandstone/uncolored_stairs", "required": false }, { - "id": "#common:sandstone/red_stairs", + "id": "#c:sandstone/red_stairs", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/uncolored_blocks.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/uncolored_blocks.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_slabs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/uncolored_slabs.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_slabs.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/uncolored_slabs.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_stairs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/uncolored_stairs.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/uncolored_stairs.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/uncolored_stairs.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/shulker_boxes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/shulker_boxes.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/shulker_boxes.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/shulker_boxes.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/villager_job_sites.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/villager_job_sites.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/villager_job_sites.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/villager_job_sites.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/enchantment/entity_defense_enhancement.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_defense_enhancement.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/enchantment/entity_defense_enhancement.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_defense_enhancement.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/enchantment/entity_movement_enhancement.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_movement_enhancement.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/enchantment/entity_movement_enhancement.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_movement_enhancement.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/enchantment/fortune.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/fortune.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/enchantment/fortune.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/fortune.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/enchantment/looting.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/looting.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/enchantment/looting.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/looting.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/enchantment/weapon_damage_enhancement.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/weapon_damage_enhancement.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/enchantment/weapon_damage_enhancement.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/weapon_damage_enhancement.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/entity_types/boats.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/boats.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/entity_types/boats.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/boats.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/entity_types/bosses.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/bosses.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/entity_types/bosses.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/bosses.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/entity_types/capturing_not_supported.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/capturing_not_supported.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/entity_types/capturing_not_supported.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/capturing_not_supported.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/entity_types/minecarts.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/minecarts.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/entity_types/minecarts.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/minecarts.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/fluids/honey.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/honey.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/fluids/honey.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/honey.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/fluids/lava.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/lava.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/fluids/lava.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/lava.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/fluids/milk.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/milk.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/fluids/milk.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/milk.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/fluids/water.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/water.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/fluids/water.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/water.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/barrels.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels.json similarity index 77% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/barrels.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels.json index 41ceb0e0d3..8d3a2bb09b 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/barrels.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "#common:barrels/wooden", + "#c:barrels/wooden", { "id": "#c:barrels", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/barrels/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels/wooden.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/barrels/wooden.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels/wooden.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/bookshelves.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bookshelves.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/bookshelves.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bookshelves.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buckets/empty.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/empty.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buckets/empty.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/empty.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buckets/entity_water.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/entity_water.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buckets/entity_water.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/entity_water.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buckets/lava.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/lava.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buckets/lava.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/lava.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buckets/milk.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/milk.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buckets/milk.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/milk.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buckets/water.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/water.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buckets/water.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/water.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/budding_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/budding_blocks.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/budding_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/budding_blocks.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buds.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buds.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/buds.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buds.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/chests.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/chests.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/clusters.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/clusters.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/clusters.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/clusters.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/coal.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/coal.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/coal.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/coal.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dusts.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dusts.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dusts/glowstone.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/glowstone.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dusts/glowstone.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/glowstone.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dusts/redstone.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/redstone.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dusts/redstone.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/redstone.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items.json new file mode 100644 index 0000000000..e67d2c17b8 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "#c:dyed_items/black", + "#c:dyed_items/blue", + "#c:dyed_items/brown", + "#c:dyed_items/cyan", + "#c:dyed_items/gray", + "#c:dyed_items/green", + "#c:dyed_items/light_blue", + "#c:dyed_items/light_gray", + "#c:dyed_items/lime", + "#c:dyed_items/magenta", + "#c:dyed_items/orange", + "#c:dyed_items/pink", + "#c:dyed_items/purple", + "#c:dyed_items/red", + "#c:dyed_items/white", + "#c:dyed_items/yellow" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/black.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/black.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/black.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/black.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/blue.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/blue.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/blue.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/blue.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/brown.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/brown.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/brown.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/brown.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/cyan.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/cyan.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/cyan.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/cyan.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/gray.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/gray.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/gray.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/gray.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/green.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/green.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/green.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/green.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/light_blue.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/light_blue.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/light_blue.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/light_blue.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/light_gray.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/light_gray.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/light_gray.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/light_gray.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/lime.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/lime.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/lime.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/lime.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/magenta.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/magenta.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/magenta.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/magenta.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/orange.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/orange.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/orange.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/orange.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/pink.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/pink.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/pink.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/pink.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/purple.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/purple.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/purple.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/purple.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/red.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/red.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/red.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/red.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/white.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/white.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/white.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/white.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/yellow.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/yellow.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items/yellow.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/yellow.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes.json similarity index 55% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes.json index a782789083..1284fbf28f 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes.json @@ -2,67 +2,67 @@ "replace": false, "values": [ { - "id": "#common:dyes/black", + "id": "#c:dyes/black", "required": false }, { - "id": "#common:dyes/blue", + "id": "#c:dyes/blue", "required": false }, { - "id": "#common:dyes/brown", + "id": "#c:dyes/brown", "required": false }, { - "id": "#common:dyes/green", + "id": "#c:dyes/green", "required": false }, { - "id": "#common:dyes/red", + "id": "#c:dyes/red", "required": false }, { - "id": "#common:dyes/white", + "id": "#c:dyes/white", "required": false }, { - "id": "#common:dyes/yellow", + "id": "#c:dyes/yellow", "required": false }, { - "id": "#common:dyes/light_gray", + "id": "#c:dyes/light_gray", "required": false }, { - "id": "#common:dyes/light_blue", + "id": "#c:dyes/light_blue", "required": false }, { - "id": "#common:dyes/lime", + "id": "#c:dyes/lime", "required": false }, { - "id": "#common:dyes/magenta", + "id": "#c:dyes/magenta", "required": false }, { - "id": "#common:dyes/orange", + "id": "#c:dyes/orange", "required": false }, { - "id": "#common:dyes/pink", + "id": "#c:dyes/pink", "required": false }, { - "id": "#common:dyes/cyan", + "id": "#c:dyes/cyan", "required": false }, { - "id": "#common:dyes/gray", + "id": "#c:dyes/gray", "required": false }, { - "id": "#common:dyes/purple", + "id": "#c:dyes/purple", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/black.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/black.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/black.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/black.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/blue.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/blue.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/blue.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/blue.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/brown.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/brown.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/brown.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/brown.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/cyan.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/cyan.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/cyan.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/cyan.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/gray.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/gray.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/gray.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/gray.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/green.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/green.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/green.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/green.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/light_blue.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/light_blue.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/light_blue.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/light_blue.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/light_gray.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/light_gray.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/light_gray.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/light_gray.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/lime.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/lime.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/lime.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/lime.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/magenta.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/magenta.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/magenta.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/magenta.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/orange.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/orange.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/orange.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/orange.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/pink.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/pink.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/pink.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/pink.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/purple.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/purple.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/purple.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/purple.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/red.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/red.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/red.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/red.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/white.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/white.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/white.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/white.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/yellow.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/yellow.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyes/yellow.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/yellow.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/foods.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/foods.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/amethyst.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/amethyst.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/amethyst.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/amethyst.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/diamond.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/diamond.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/diamond.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/diamond.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/emerald.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/emerald.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/emerald.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/emerald.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/lapis.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/lapis.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/lapis.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/lapis.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/prismarine.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/prismarine.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/prismarine.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/prismarine.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/quartz.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/quartz.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/gems/quartz.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/quartz.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/glass_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/glass_blocks.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/glass_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/glass_blocks.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/glass_panes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/glass_panes.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/glass_panes.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/glass_panes.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ingots.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ingots.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ingots/copper.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/copper.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ingots/copper.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/copper.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ingots/gold.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/gold.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ingots/gold.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/gold.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ingots/iron.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/iron.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ingots/iron.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/iron.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ingots/netherite.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/netherite.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ingots/netherite.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/netherite.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/nuggets.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/nuggets.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/nuggets.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/nuggets.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ores.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores.json similarity index 84% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ores.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores.json index 52cd44b8f2..56510a67ff 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ores.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores.json @@ -34,11 +34,11 @@ "required": false }, { - "id": "#common:ores/quartz", + "id": "#c:ores/quartz", "required": false }, { - "id": "#common:ores/netherite_scrap", + "id": "#c:ores/netherite_scrap", "required": false }, { @@ -46,11 +46,11 @@ "required": false }, { - "id": "#common:ores/quartz", + "id": "#c:ores/quartz", "required": false }, { - "id": "#common:ores/netherite_scrap", + "id": "#c:ores/netherite_scrap", "required": false } ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ores/netherite_scrap.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores/netherite_scrap.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ores/netherite_scrap.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores/netherite_scrap.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ores/quartz.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores/quartz.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/ores/quartz.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores/quartz.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/potions.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/potions.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/potions.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/potions.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_blocks/copper.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/copper.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_blocks/copper.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/copper.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_blocks/gold.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/gold.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_blocks/gold.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/gold.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_blocks/iron.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/iron.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_blocks/iron.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/iron.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_materials.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials.json similarity index 73% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_materials.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials.json index 9fee8832e9..6c72ea4ef2 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_materials.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials.json @@ -2,15 +2,15 @@ "replace": false, "values": [ { - "id": "#common:raw_materials/iron", + "id": "#c:raw_materials/iron", "required": false }, { - "id": "#common:raw_materials/copper", + "id": "#c:raw_materials/copper", "required": false }, { - "id": "#common:raw_materials/gold", + "id": "#c:raw_materials/gold", "required": false }, "minecraft:raw_iron", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_materials/copper.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/copper.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_materials/copper.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/copper.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_materials/gold.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/gold.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_materials/gold.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/gold.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_materials/iron.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/iron.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/raw_materials/iron.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/iron.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/blocks.json similarity index 66% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/blocks.json index 3c7666272a..23a686229b 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/sandstone/blocks.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/blocks.json @@ -2,11 +2,11 @@ "replace": false, "values": [ { - "id": "#common:sandstone/uncolored_blocks", + "id": "#c:sandstone/uncolored_blocks", "required": false }, { - "id": "#common:sandstone/red_blocks", + "id": "#c:sandstone/red_blocks", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/red_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/red_blocks.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/red_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/red_blocks.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/red_slabs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/red_slabs.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/red_slabs.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/red_slabs.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/red_stairs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/red_stairs.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/red_stairs.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/red_stairs.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/slabs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/slabs.json similarity index 66% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/slabs.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/slabs.json index 6d75e8f765..8d6c86218a 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/slabs.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/slabs.json @@ -2,11 +2,11 @@ "replace": false, "values": [ { - "id": "#common:sandstone/uncolored_slabs", + "id": "#c:sandstone/uncolored_slabs", "required": false }, { - "id": "#common:sandstone/red_slabs", + "id": "#c:sandstone/red_slabs", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/stairs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/stairs.json similarity index 66% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/stairs.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/stairs.json index c6eca053fd..c9f3632241 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/stairs.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/stairs.json @@ -2,11 +2,11 @@ "replace": false, "values": [ { - "id": "#common:sandstone/uncolored_stairs", + "id": "#c:sandstone/uncolored_stairs", "required": false }, { - "id": "#common:sandstone/red_stairs", + "id": "#c:sandstone/red_stairs", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/uncolored_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/uncolored_blocks.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/uncolored_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/uncolored_blocks.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/uncolored_slabs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/uncolored_slabs.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/uncolored_slabs.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/uncolored_slabs.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/uncolored_stairs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/uncolored_stairs.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/sandstone/uncolored_stairs.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/uncolored_stairs.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/shulker_boxes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/shulker_boxes.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/shulker_boxes.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/shulker_boxes.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools.json similarity index 53% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools.json index f261dd63c6..c01e050594 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools.json @@ -2,27 +2,27 @@ "replace": false, "values": [ { - "id": "#common:tools/bows", + "id": "#c:tools/bows", "required": false }, { - "id": "#common:tools/crossbows", + "id": "#c:tools/crossbows", "required": false }, { - "id": "#common:tools/shears", + "id": "#c:tools/shears", "required": false }, { - "id": "#common:tools/shields", + "id": "#c:tools/shields", "required": false }, { - "id": "#common:tools/spears", + "id": "#c:tools/spears", "required": false }, { - "id": "#common:tools/fishing_rods", + "id": "#c:tools/fishing_rods", "required": false } ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/bows.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/bows.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/bows.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/bows.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/crossbows.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/crossbows.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/crossbows.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/crossbows.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/fishing_rods.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/fishing_rods.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/fishing_rods.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/fishing_rods.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/shears.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shears.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/shears.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shears.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/shields.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shields.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/shields.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shields.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/spears.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/spears.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/tools/spears.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/spears.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/villager_job_sites.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/villager_job_sites.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/villager_job_sites.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/villager_job_sites.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_aquatic.json similarity index 73% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_aquatic.json index c174dbcb57..a5dba0d3e6 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_aquatic.json @@ -2,11 +2,11 @@ "replace": false, "values": [ { - "id": "#common:is_ocean", + "id": "#c:is_ocean", "required": false }, { - "id": "#common:is_river", + "id": "#c:is_river", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic_icy.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_aquatic_icy.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_aquatic_icy.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_aquatic_icy.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_badlands.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_badlands.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_badlands.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_badlands.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_beach.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_beach.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_beach.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_beach.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_birch_forest.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_birch_forest.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_birch_forest.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_birch_forest.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_cave.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cave.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_cave.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cave.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_cold.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold.json similarity index 56% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_cold.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold.json index 58da1ef4db..a6c4a7fc48 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_cold.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#common:is_cold/overworld" + "#c:is_cold/overworld" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_cold/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold/overworld.json similarity index 92% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_cold/overworld.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold/overworld.json index 4be60a03b4..2506ed2948 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_cold/overworld.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold/overworld.json @@ -10,7 +10,7 @@ "minecraft:old_growth_spruce_taiga", "minecraft:old_growth_pine_taiga", { - "id": "#common:is_icy", + "id": "#c:is_icy", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dead.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dead.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dead.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dead.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_deep_ocean.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_deep_ocean.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_deep_ocean.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_deep_ocean.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation.json similarity index 59% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation.json index 76e00fdc7c..ad91f62afa 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation.json @@ -2,7 +2,7 @@ "replace": false, "values": [ { - "id": "#common:is_dense_vegetation/overworld", + "id": "#c:is_dense_vegetation/overworld", "required": false } ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation/overworld.json similarity index 84% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation/overworld.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation/overworld.json index cd5b17208c..ac61d85e30 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dense_vegetation/overworld.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation/overworld.json @@ -2,7 +2,7 @@ "replace": false, "values": [ { - "id": "#common:is_jungle", + "id": "#c:is_jungle", "required": false }, "minecraft:dark_forest", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_desert.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_desert.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_desert.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_desert.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dry.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry.json similarity index 56% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dry.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry.json index e80800099e..e1fa873301 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dry.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#common:is_dry/overworld" + "#c:is_dry/overworld" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dry/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/overworld.json similarity index 65% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dry/overworld.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/overworld.json index 8303ef4ddb..2c70684dd3 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_dry/overworld.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/overworld.json @@ -2,19 +2,19 @@ "replace": false, "values": [ { - "id": "#common:is_nether", + "id": "#c:is_nether", "required": false }, { - "id": "#common:is_badlands", + "id": "#c:is_badlands", "required": false }, { - "id": "#common:is_desert", + "id": "#c:is_desert", "required": false }, { - "id": "#common:is_savanna", + "id": "#c:is_savanna", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_end_island.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_end_island.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_end_island.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_end_island.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_extreme_hills.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_extreme_hills.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_extreme_hills.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_extreme_hills.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_floral.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_floral.json similarity index 85% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_floral.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_floral.json index 3a7819a147..cdc4061d1b 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_floral.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_floral.json @@ -5,7 +5,7 @@ "minecraft:meadow", "minecraft:cherry_grove", { - "id": "#common:is_flower_forest", + "id": "#c:is_flower_forest", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_flower_forest.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_flower_forest.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_flower_forest.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_flower_forest.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_forest.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_forest.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_forest.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_forest.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_hot.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot.json similarity index 56% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_hot.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot.json index 51920e2162..1dc6cf299b 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/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,6 @@ { "replace": false, "values": [ - "#common:is_hot/overworld" + "#c:is_hot/overworld" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_hot/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json similarity index 63% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_hot/overworld.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json index 405ea29417..700a2d20a7 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_hot/overworld.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json @@ -2,28 +2,28 @@ "replace": false, "values": [ { - "id": "#common:is_jungle", + "id": "#c:is_jungle", "required": false }, { - "id": "#common:is_savanna", + "id": "#c:is_savanna", "required": false }, { - "id": "#common:is_desert", + "id": "#c:is_desert", "required": false }, { - "id": "#common:is_badlands", + "id": "#c:is_badlands", "required": false }, "minecraft:stony_peaks", { - "id": "#common:is_mushroom", + "id": "#c:is_mushroom", "required": false }, { - "id": "#common:is_nether", + "id": "#c:is_nether", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_icy.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_icy.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_icy.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_icy.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_jungle.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_jungle.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_jungle.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_jungle.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_mountain.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_mountain.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/peak.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain/peak.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/peak.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain/peak.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/slope.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain/slope.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_mountain/slope.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain/slope.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_mushroom.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mushroom.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_mushroom.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mushroom.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_nether.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_nether.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_nether.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_nether.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_nether_forest.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_nether_forest.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_nether_forest.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_nether_forest.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_ocean.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_ocean.json similarity index 76% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_ocean.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_ocean.json index a1c90f1b27..253f8bcf47 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_ocean.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_ocean.json @@ -2,11 +2,11 @@ "replace": false, "values": [ { - "id": "#common:is_deep_ocean", + "id": "#c:is_deep_ocean", "required": false }, { - "id": "#common:is_shallow_ocean", + "id": "#c:is_shallow_ocean", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_overworld.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_overworld.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_overworld.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_plains.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_plains.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_plains.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_plains.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_river.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_river.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_river.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_river.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_savanna.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_savanna.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_savanna.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_savanna.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_shallow_ocean.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_shallow_ocean.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_shallow_ocean.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_shallow_ocean.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_snowy.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_snowy.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_snowy_plains.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy_plains.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_snowy_plains.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy_plains.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation.json similarity index 58% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation.json index 14b88f5868..179cf8231d 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation.json @@ -2,7 +2,7 @@ "replace": false, "values": [ { - "id": "#common:is_sparse_vegetation/overworld", + "id": "#c:is_sparse_vegetation/overworld", "required": false } ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json similarity index 66% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation/overworld.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json index 659f7e308f..6d9f976a8c 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_sparse_vegetation/overworld.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json @@ -2,19 +2,19 @@ "replace": false, "values": [ { - "id": "#common:is_savanna", + "id": "#c:is_savanna", "required": false }, { - "id": "#common:is_desert", + "id": "#c:is_desert", "required": false }, { - "id": "#common:is_dead", + "id": "#c:is_dead", "required": false }, { - "id": "#common:is_wasteland", + "id": "#c:is_wasteland", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_stony_shores.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_stony_shores.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_stony_shores.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_stony_shores.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_swamp.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_swamp.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_swamp.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_swamp.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_taiga.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_taiga.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_taiga.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_taiga.json 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 new file mode 100644 index 0000000000..b547f21eaf --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:is_temperate/overworld" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_temperate/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_temperate/overworld.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_the_end.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_the_end.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_the_end.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_the_end.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_tree/coniferous.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/coniferous.json similarity index 84% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_tree/coniferous.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/coniferous.json index 5d2d0459d8..42eb66f68e 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_tree/coniferous.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/coniferous.json @@ -3,7 +3,7 @@ "values": [ "minecraft:grove", { - "id": "#common:is_taiga", + "id": "#c:is_taiga", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_tree/deciduous.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/deciduous.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_tree/deciduous.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/deciduous.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_tree/jungle.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/jungle.json similarity index 81% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_tree/jungle.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/jungle.json index 6fed2b2e7f..dd4f2939ee 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_tree/jungle.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/jungle.json @@ -2,7 +2,7 @@ "replace": false, "values": [ { - "id": "#common:is_jungle", + "id": "#c:is_jungle", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_tree/savanna.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/savanna.json similarity index 81% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_tree/savanna.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/savanna.json index b904991e53..8fc5031370 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_tree/savanna.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/savanna.json @@ -2,7 +2,7 @@ "replace": false, "values": [ { - "id": "#common:is_savanna", + "id": "#c:is_savanna", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_underground.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_underground.json similarity index 82% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_underground.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_underground.json index 6ac0097e7f..25defeebaa 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_underground.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_underground.json @@ -2,7 +2,7 @@ "replace": false, "values": [ { - "id": "#common:is_cave", + "id": "#c:is_cave", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_void.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_void.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_void.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_void.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_wasteland.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wasteland.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_wasteland.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wasteland.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_wet.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet.json similarity index 56% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_wet.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet.json index 208f5207a2..9501d65260 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_wet.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#common:is_wet/overworld" + "#c:is_wet/overworld" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_wet/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet/overworld.json similarity index 71% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_wet/overworld.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet/overworld.json index df1ab678f0..17272a8cf4 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_wet/overworld.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet/overworld.json @@ -2,16 +2,16 @@ "replace": false, "values": [ { - "id": "#common:is_aquatic", + "id": "#c:is_aquatic", "required": false }, { - "id": "#common:is_swamp", + "id": "#c:is_swamp", "required": false }, "minecraft:lush_caves", { - "id": "#common:is_jungle", + "id": "#c:is_jungle", "required": false }, { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_windswept.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_windswept.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_windswept.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_windswept.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks.json deleted file mode 100644 index fe6fad2b72..0000000000 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/blocks/dyed_blocks.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "replace": false, - "values": [ - "#common:dyed_blocks/black", - "#common:dyed_blocks/blue", - "#common:dyed_blocks/brown", - "#common:dyed_blocks/cyan", - "#common:dyed_blocks/gray", - "#common:dyed_blocks/green", - "#common:dyed_blocks/light_blue", - "#common:dyed_blocks/light_gray", - "#common:dyed_blocks/lime", - "#common:dyed_blocks/magenta", - "#common:dyed_blocks/orange", - "#common:dyed_blocks/pink", - "#common:dyed_blocks/purple", - "#common:dyed_blocks/red", - "#common:dyed_blocks/white", - "#common:dyed_blocks/yellow" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items.json deleted file mode 100644 index 1b50b8b3af..0000000000 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/items/dyed_items.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "replace": false, - "values": [ - "#common:dyed_items/black", - "#common:dyed_items/blue", - "#common:dyed_items/brown", - "#common:dyed_items/cyan", - "#common:dyed_items/gray", - "#common:dyed_items/green", - "#common:dyed_items/light_blue", - "#common:dyed_items/light_gray", - "#common:dyed_items/lime", - "#common:dyed_items/magenta", - "#common:dyed_items/orange", - "#common:dyed_items/pink", - "#common:dyed_items/purple", - "#common:dyed_items/red", - "#common:dyed_items/white", - "#common:dyed_items/yellow" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_temperate.json b/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_temperate.json deleted file mode 100644 index 06faeda1a3..0000000000 --- a/fabric-convention-tags-v2/src/generated/resources/data/common/tags/worldgen/biome/is_temperate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#common:is_temperate/overworld" - ] -} \ No newline at end of file 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 5f3a0bbab5..02bf504a8d 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 @@ -150,6 +150,6 @@ private ConventionalBiomeTags() { public static final TagKey IS_SHALLOW_OCEAN = register("is_shallow_ocean"); private static TagKey register(String tagID) { - return TagRegistration.BIOME_TAG_REGISTRATION.registerCommon(tagID); + return TagRegistration.BIOME_TAG_REGISTRATION.registerC(tagID); } } diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java index e8f9e5237f..f4f9a06687 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java @@ -32,6 +32,6 @@ private ConventionalBlockEntityTypeTags() { public static final TagKey> RELOCATION_NOT_SUPPORTED = register("relocation_not_supported"); private static TagKey> register(String tagID) { - return TagRegistration.BLOCK_ENTITY_TYPE_TAG_REGISTRATION.registerCommon(tagID); + return TagRegistration.BLOCK_ENTITY_TYPE_TAG_REGISTRATION.registerC(tagID); } } 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 d454e8dbf2..e2cc253cae 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 @@ -90,6 +90,6 @@ private ConventionalBlockTags() { public static final TagKey RELOCATION_NOT_SUPPORTED = register("relocation_not_supported"); private static TagKey register(String tagID) { - return TagRegistration.BLOCK_TAG_REGISTRATION.registerCommon(tagID); + return TagRegistration.BLOCK_TAG_REGISTRATION.registerC(tagID); } } diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java index 9baef41bc5..0effbc030e 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java @@ -49,6 +49,6 @@ private ConventionalEnchantmentTags() { public static final TagKey ENTITY_DEFENSE_ENHANCEMENT = register("entity_defense_enhancement"); private static TagKey register(String tagID) { - return TagRegistration.ENCHANTMENT_TAG_REGISTRATION.registerCommon(tagID); + return TagRegistration.ENCHANTMENT_TAG_REGISTRATION.registerC(tagID); } } diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java index 51b6dcf22a..b88d5f9d3d 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java @@ -38,6 +38,6 @@ private ConventionalEntityTypeTags() { public static final TagKey> CAPTURING_NOT_SUPPORTED = register("capturing_not_supported"); private static TagKey> register(String tagID) { - return TagRegistration.ENTITY_TYPE_TAG_REGISTRATION.registerCommon(tagID); + return TagRegistration.ENTITY_TYPE_TAG_REGISTRATION.registerC(tagID); } } diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalFluidTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalFluidTags.java index e6fdb7a266..9f9b3950b6 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalFluidTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalFluidTags.java @@ -35,6 +35,6 @@ private ConventionalFluidTags() { public static final TagKey HONEY = register("honey"); private static TagKey register(String tagID) { - return TagRegistration.FLUID_TAG_REGISTRATION.registerCommon(tagID); + return TagRegistration.FLUID_TAG_REGISTRATION.registerC(tagID); } } 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 24e9b2a05f..56375d4764 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 @@ -159,6 +159,6 @@ private ConventionalItemTags() { public static final TagKey YELLOW_DYED_ITEMS = register("dyed_items/yellow"); private static TagKey register(String tagID) { - return TagRegistration.ITEM_TAG_REGISTRATION.registerCommon(tagID); + return TagRegistration.ITEM_TAG_REGISTRATION.registerC(tagID); } } diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index a48acbe0f1..06307f205c 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -68,8 +68,9 @@ private static void setupLegacyTagWarning() { if (!legacyTags.isEmpty()) { StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append(""" - \n Dev warning - Legacy Tags detected. Please migrate your 'c' namespace tags to 'common' namespace! See classes under net.fabricmc.fabric.api.tag.convention.v1 package for all tags. - NOTE: Many tags have been moved around or renamed. Some new ones were added so please review the new tags. And make sure you follow tag conventions for new tags! + \n Dev warning - Legacy Tags detected. Please migrate your old `c` tags to our new `c` tags that follows better conventions! See classes under net.fabricmc.fabric.api.tag.convention.v1 package for all tags. + NOTE: Many tags have been moved around or renamed. Some new ones were added so please review the new tags. + And make sure you follow tag conventions for new tags! The convention is `c` with generally plural named folders and tag files. (Adjective folder names tend to be singular) You can disable this message in Fabric API's properties config file by setting log-legacy-tag-warnings to "SILENCED" or see individual tags with "DEV_VERBOSE". """); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java index 4e8b72ec58..66e9287e4f 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java @@ -47,7 +47,7 @@ public TagKey registerFabric(String tagId) { return TagKey.of(registryKey, new Identifier("fabric", tagId)); } - public TagKey registerCommon(String tagId) { - return TagKey.of(registryKey, new Identifier("common", tagId)); + public TagKey registerC(String tagId) { + return TagKey.of(registryKey, new Identifier("c", tagId)); } } From 1fb65cfbc63134e9c1f9a4891b571f6933f4385f Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 08:11:22 -0400 Subject: [PATCH 026/123] Switch some spaces for tabs again --- .../fabric/impl/tag/convention/ConventionLogWarnings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 06307f205c..6469ae8dc1 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -70,7 +70,7 @@ private static void setupLegacyTagWarning() { stringBuilder.append(""" \n Dev warning - Legacy Tags detected. Please migrate your old `c` tags to our new `c` tags that follows better conventions! See classes under net.fabricmc.fabric.api.tag.convention.v1 package for all tags. NOTE: Many tags have been moved around or renamed. Some new ones were added so please review the new tags. - And make sure you follow tag conventions for new tags! The convention is `c` with generally plural named folders and tag files. (Adjective folder names tend to be singular) + And make sure you follow tag conventions for new tags! The convention is `c` with generally plural named folders and tag files. (Adjective folder names tend to be singular) You can disable this message in Fabric API's properties config file by setting log-legacy-tag-warnings to "SILENCED" or see individual tags with "DEV_VERBOSE". """); From 635e3d97eff4885adafec84c148afd6e2e859660 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 08:30:04 -0400 Subject: [PATCH 027/123] link the two relocation not supported tags together --- .../tag/convention/v2/ConventionalBlockEntityTypeTags.java | 2 ++ .../fabric/api/tag/convention/v2/ConventionalBlockTags.java | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java index f4f9a06687..dff43da7f4 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java @@ -28,6 +28,8 @@ private ConventionalBlockEntityTypeTags() { /** * Blocks should be included in this tag if their movement can cause serious issues such as world corruption * upon being moved, such as chunk loaders or pipes, for mods that move block entities. + *

+ * See also the equivalent block tag: {@link ConventionalBlockTags#RELOCATION_NOT_SUPPORTED} */ public static final TagKey> RELOCATION_NOT_SUPPORTED = register("relocation_not_supported"); 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 e2cc253cae..d4a406a532 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 @@ -84,8 +84,10 @@ private ConventionalBlockTags() { /** * Blocks should be included in this tag if their movement can cause serious issues such as world corruption - * upon being moved, such as chunk loaders or pipes, - * for mods that move blocks but do not respect {@link AbstractBlock.AbstractBlockState#getPistonBehavior}. + * upon being moved, such as chunk loaders or pipes, for mods that move blocks but do not respect + * {@link AbstractBlock.AbstractBlockState#getPistonBehavior}. + *

+ * See also the equivalent block entity type tag: {@link ConventionalBlockEntityTypeTags#RELOCATION_NOT_SUPPORTED} */ public static final TagKey RELOCATION_NOT_SUPPORTED = register("relocation_not_supported"); From 5246c6a2651502c2638fff2b5519deac1a25e0ba Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 08:34:24 -0400 Subject: [PATCH 028/123] Added javadoc for capturing not supported --- .../api/tag/convention/v2/ConventionalEntityTypeTags.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java index b88d5f9d3d..b03cfa371e 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java @@ -35,6 +35,12 @@ private ConventionalEntityTypeTags() { public static final TagKey> BOSSES = register("bosses"); public static final TagKey> MINECARTS = register("minecarts"); public static final TagKey> BOATS = register("boats"); + + /** + * Entities should be included in this tag if they are not allowed to be picked up by items or grabbed in a way + * that a player can easily move the entity to anywhere they want. Ideal for special entities that should not + * be able to be put into a mob jar for example. + */ public static final TagKey> CAPTURING_NOT_SUPPORTED = register("capturing_not_supported"); private static TagKey> register(String tagID) { From 1b92682a5f2d0b43aa8fcb238ab6eb3b1eb49e19 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 08:35:51 -0400 Subject: [PATCH 029/123] adjusted log warning message --- .../fabric/impl/tag/convention/ConventionLogWarnings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 6469ae8dc1..386c976f76 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -70,7 +70,7 @@ private static void setupLegacyTagWarning() { stringBuilder.append(""" \n Dev warning - Legacy Tags detected. Please migrate your old `c` tags to our new `c` tags that follows better conventions! See classes under net.fabricmc.fabric.api.tag.convention.v1 package for all tags. NOTE: Many tags have been moved around or renamed. Some new ones were added so please review the new tags. - And make sure you follow tag conventions for new tags! The convention is `c` with generally plural named folders and tag files. (Adjective folder names tend to be singular) + And make sure you follow tag conventions for new tags! The convention is `c` with nouns generally being plural and adjectives being singular. You can disable this message in Fabric API's properties config file by setting log-legacy-tag-warnings to "SILENCED" or see individual tags with "DEV_VERBOSE". """); From f898443cf50dee44fd7f607438e921d8e9c5fafd Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 08:41:13 -0400 Subject: [PATCH 030/123] Added budding javadocs --- .../api/tag/convention/v2/ConventionalBlockTags.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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 d4a406a532..1f6af6b3b0 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 @@ -46,8 +46,17 @@ private ConventionalBlockTags() { public static final TagKey SHULKER_BOXES = register("shulker_boxes"); // Related to budding mechanics + /** + * For blocks that are similar to amethyst where their budding block produces buds and cluster blocks + */ public static final TagKey BUDDING_BLOCKS = register("budding_blocks"); + /** + * For blocks that are similar to amethyst where they have buddings forming from budding blocks + */ public static final TagKey BUDS = register("buds"); + /** + * For blocks that are similar to amethyst where they have clusters forming from budding blocks + */ public static final TagKey CLUSTERS = register("clusters"); public static final TagKey VILLAGER_JOB_SITES = register("villager_job_sites"); From 7f6ed65759e2877ce92e11a55d8e4019e8fe449e Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 10:24:44 -0400 Subject: [PATCH 031/123] tag renames and some javadoc --- .../datagen/generators/BlockTagGenerator.java | 66 +++++++++--------- .../generators/EnglishTagLangGenerator.java | 68 +++++++++---------- .../datagen/generators/ItemTagGenerator.java | 66 +++++++++--------- .../lang/en_us.json | 68 +++++++++---------- .../resources/data/c/tags/blocks/dyed.json | 21 ++++++ .../blocks/{dyed_blocks => dyed}/black.json | 0 .../blocks/{dyed_blocks => dyed}/blue.json | 0 .../blocks/{dyed_blocks => dyed}/brown.json | 0 .../blocks/{dyed_blocks => dyed}/cyan.json | 0 .../blocks/{dyed_blocks => dyed}/gray.json | 0 .../blocks/{dyed_blocks => dyed}/green.json | 0 .../{dyed_blocks => dyed}/light_blue.json | 0 .../{dyed_blocks => dyed}/light_gray.json | 0 .../blocks/{dyed_blocks => dyed}/lime.json | 0 .../blocks/{dyed_blocks => dyed}/magenta.json | 0 .../blocks/{dyed_blocks => dyed}/orange.json | 0 .../blocks/{dyed_blocks => dyed}/pink.json | 0 .../blocks/{dyed_blocks => dyed}/purple.json | 0 .../blocks/{dyed_blocks => dyed}/red.json | 0 .../blocks/{dyed_blocks => dyed}/white.json | 0 .../blocks/{dyed_blocks => dyed}/yellow.json | 0 .../data/c/tags/blocks/dyed_blocks.json | 21 ------ .../resources/data/c/tags/items/dyed.json | 21 ++++++ .../items/{dyed_items => dyed}/black.json | 0 .../tags/items/{dyed_items => dyed}/blue.json | 0 .../items/{dyed_items => dyed}/brown.json | 0 .../tags/items/{dyed_items => dyed}/cyan.json | 0 .../tags/items/{dyed_items => dyed}/gray.json | 0 .../items/{dyed_items => dyed}/green.json | 0 .../{dyed_items => dyed}/light_blue.json | 0 .../{dyed_items => dyed}/light_gray.json | 0 .../tags/items/{dyed_items => dyed}/lime.json | 0 .../items/{dyed_items => dyed}/magenta.json | 0 .../items/{dyed_items => dyed}/orange.json | 0 .../tags/items/{dyed_items => dyed}/pink.json | 0 .../items/{dyed_items => dyed}/purple.json | 0 .../tags/items/{dyed_items => dyed}/red.json | 0 .../items/{dyed_items => dyed}/white.json | 0 .../items/{dyed_items => dyed}/yellow.json | 0 .../data/c/tags/items/dyed_items.json | 21 ------ .../convention/v2/ConventionalBlockTags.java | 34 +++++----- .../convention/v2/ConventionalItemTags.java | 37 +++++----- 42 files changed, 212 insertions(+), 211 deletions(-) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed.json rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/{dyed_blocks => dyed}/black.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/{dyed_blocks => dyed}/blue.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/{dyed_blocks => dyed}/brown.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/{dyed_blocks => dyed}/cyan.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/{dyed_blocks => dyed}/gray.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/{dyed_blocks => dyed}/green.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/{dyed_blocks => dyed}/light_blue.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/{dyed_blocks => dyed}/light_gray.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/{dyed_blocks => dyed}/lime.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/{dyed_blocks => dyed}/magenta.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/{dyed_blocks => dyed}/orange.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/{dyed_blocks => dyed}/pink.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/{dyed_blocks => dyed}/purple.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/{dyed_blocks => dyed}/red.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/{dyed_blocks => dyed}/white.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/{dyed_blocks => dyed}/yellow.json (100%) delete mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed.json rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{dyed_items => dyed}/black.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{dyed_items => dyed}/blue.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{dyed_items => dyed}/brown.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{dyed_items => dyed}/cyan.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{dyed_items => dyed}/gray.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{dyed_items => dyed}/green.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{dyed_items => dyed}/light_blue.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{dyed_items => dyed}/light_gray.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{dyed_items => dyed}/lime.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{dyed_items => dyed}/magenta.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{dyed_items => dyed}/orange.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{dyed_items => dyed}/pink.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{dyed_items => dyed}/purple.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{dyed_items => dyed}/red.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{dyed_items => dyed}/white.json (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{dyed_items => dyed}/yellow.json (100%) delete mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items.json 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 c8b75a17de..40be167910 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 @@ -208,119 +208,119 @@ private void generateGlassTags() { } private void generateDyedTags() { - getOrCreateTagBuilder(ConventionalBlockTags.BLACK_DYED_BLOCKS) + getOrCreateTagBuilder(ConventionalBlockTags.BLACK_DYED) .add(Blocks.BLACK_BANNER).add(Blocks.BLACK_BED).add(Blocks.BLACK_CANDLE).add(Blocks.BLACK_CARPET) .add(Blocks.BLACK_CONCRETE).add(Blocks.BLACK_CONCRETE_POWDER).add(Blocks.BLACK_GLAZED_TERRACOTTA) .add(Blocks.BLACK_SHULKER_BOX).add(Blocks.BLACK_STAINED_GLASS).add(Blocks.BLACK_STAINED_GLASS_PANE) .add(Blocks.BLACK_TERRACOTTA).add(Blocks.BLACK_WALL_BANNER).add(Blocks.BLACK_WOOL); - getOrCreateTagBuilder(ConventionalBlockTags.BLUE_DYED_BLOCKS) + getOrCreateTagBuilder(ConventionalBlockTags.BLUE_DYED) .add(Blocks.BLUE_BANNER).add(Blocks.BLUE_BED).add(Blocks.BLUE_CANDLE).add(Blocks.BLUE_CARPET) .add(Blocks.BLUE_CONCRETE).add(Blocks.BLUE_CONCRETE_POWDER).add(Blocks.BLUE_GLAZED_TERRACOTTA) .add(Blocks.BLUE_SHULKER_BOX).add(Blocks.BLUE_STAINED_GLASS).add(Blocks.BLUE_STAINED_GLASS_PANE) .add(Blocks.BLUE_TERRACOTTA).add(Blocks.BLUE_WALL_BANNER).add(Blocks.BLUE_WOOL); - getOrCreateTagBuilder(ConventionalBlockTags.BROWN_DYED_BLOCKS) + getOrCreateTagBuilder(ConventionalBlockTags.BROWN_DYED) .add(Blocks.BROWN_BANNER).add(Blocks.BROWN_BED).add(Blocks.BROWN_CANDLE).add(Blocks.BROWN_CARPET) .add(Blocks.BROWN_CONCRETE).add(Blocks.BROWN_CONCRETE_POWDER).add(Blocks.BROWN_GLAZED_TERRACOTTA) .add(Blocks.BROWN_SHULKER_BOX).add(Blocks.BROWN_STAINED_GLASS).add(Blocks.BROWN_STAINED_GLASS_PANE) .add(Blocks.BROWN_TERRACOTTA).add(Blocks.BROWN_WALL_BANNER).add(Blocks.BROWN_WOOL); - getOrCreateTagBuilder(ConventionalBlockTags.CYAN_DYED_BLOCKS) + getOrCreateTagBuilder(ConventionalBlockTags.CYAN_DYED) .add(Blocks.CYAN_BANNER).add(Blocks.CYAN_BED).add(Blocks.CYAN_CANDLE).add(Blocks.CYAN_CARPET) .add(Blocks.CYAN_CONCRETE).add(Blocks.CYAN_CONCRETE_POWDER).add(Blocks.CYAN_GLAZED_TERRACOTTA) .add(Blocks.CYAN_SHULKER_BOX).add(Blocks.CYAN_STAINED_GLASS).add(Blocks.CYAN_STAINED_GLASS_PANE) .add(Blocks.CYAN_TERRACOTTA).add(Blocks.CYAN_WALL_BANNER).add(Blocks.CYAN_WOOL); - getOrCreateTagBuilder(ConventionalBlockTags.GRAY_DYED_BLOCKS) + getOrCreateTagBuilder(ConventionalBlockTags.GRAY_DYED) .add(Blocks.GRAY_BANNER).add(Blocks.GRAY_BED).add(Blocks.GRAY_CANDLE).add(Blocks.GRAY_CARPET) .add(Blocks.GRAY_CONCRETE).add(Blocks.GRAY_CONCRETE_POWDER).add(Blocks.GRAY_GLAZED_TERRACOTTA) .add(Blocks.GRAY_SHULKER_BOX).add(Blocks.GRAY_STAINED_GLASS).add(Blocks.GRAY_STAINED_GLASS_PANE) .add(Blocks.GRAY_TERRACOTTA).add(Blocks.GRAY_WALL_BANNER).add(Blocks.GRAY_WOOL); - getOrCreateTagBuilder(ConventionalBlockTags.GREEN_DYED_BLOCKS) + getOrCreateTagBuilder(ConventionalBlockTags.GREEN_DYED) .add(Blocks.GREEN_BANNER).add(Blocks.GREEN_BED).add(Blocks.GREEN_CANDLE).add(Blocks.GREEN_CARPET) .add(Blocks.GREEN_CONCRETE).add(Blocks.GREEN_CONCRETE_POWDER).add(Blocks.GREEN_GLAZED_TERRACOTTA) .add(Blocks.GREEN_SHULKER_BOX).add(Blocks.GREEN_STAINED_GLASS).add(Blocks.GREEN_STAINED_GLASS_PANE) .add(Blocks.GREEN_TERRACOTTA).add(Blocks.GREEN_WALL_BANNER).add(Blocks.GREEN_WOOL); - getOrCreateTagBuilder(ConventionalBlockTags.LIGHT_BLUE_DYED_BLOCKS) + getOrCreateTagBuilder(ConventionalBlockTags.LIGHT_BLUE_DYED) .add(Blocks.LIGHT_BLUE_BANNER).add(Blocks.LIGHT_BLUE_BED).add(Blocks.LIGHT_BLUE_CANDLE).add(Blocks.LIGHT_BLUE_CARPET) .add(Blocks.LIGHT_BLUE_CONCRETE).add(Blocks.LIGHT_BLUE_CONCRETE_POWDER).add(Blocks.LIGHT_BLUE_GLAZED_TERRACOTTA) .add(Blocks.LIGHT_BLUE_SHULKER_BOX).add(Blocks.LIGHT_BLUE_STAINED_GLASS).add(Blocks.LIGHT_BLUE_STAINED_GLASS_PANE) .add(Blocks.LIGHT_BLUE_TERRACOTTA).add(Blocks.LIGHT_BLUE_WALL_BANNER).add(Blocks.LIGHT_BLUE_WOOL); - getOrCreateTagBuilder(ConventionalBlockTags.LIGHT_GRAY_DYED_BLOCKS) + getOrCreateTagBuilder(ConventionalBlockTags.LIGHT_GRAY_DYED) .add(Blocks.LIGHT_GRAY_BANNER).add(Blocks.LIGHT_GRAY_BED).add(Blocks.LIGHT_GRAY_CANDLE).add(Blocks.LIGHT_GRAY_CARPET) .add(Blocks.LIGHT_GRAY_CONCRETE).add(Blocks.LIGHT_GRAY_CONCRETE_POWDER).add(Blocks.LIGHT_GRAY_GLAZED_TERRACOTTA) .add(Blocks.LIGHT_GRAY_SHULKER_BOX).add(Blocks.LIGHT_GRAY_STAINED_GLASS).add(Blocks.LIGHT_GRAY_STAINED_GLASS_PANE) .add(Blocks.LIGHT_GRAY_TERRACOTTA).add(Blocks.LIGHT_GRAY_WALL_BANNER).add(Blocks.LIGHT_GRAY_WOOL); - getOrCreateTagBuilder(ConventionalBlockTags.LIME_DYED_BLOCKS) + getOrCreateTagBuilder(ConventionalBlockTags.LIME_DYED) .add(Blocks.LIME_BANNER).add(Blocks.LIME_BED).add(Blocks.LIME_CANDLE).add(Blocks.LIME_CARPET) .add(Blocks.LIME_CONCRETE).add(Blocks.LIME_CONCRETE_POWDER).add(Blocks.LIME_GLAZED_TERRACOTTA) .add(Blocks.LIME_SHULKER_BOX).add(Blocks.LIME_STAINED_GLASS).add(Blocks.LIME_STAINED_GLASS_PANE) .add(Blocks.LIME_TERRACOTTA).add(Blocks.LIME_WALL_BANNER).add(Blocks.LIME_WOOL); - getOrCreateTagBuilder(ConventionalBlockTags.MAGENTA_DYED_BLOCKS) + getOrCreateTagBuilder(ConventionalBlockTags.MAGENTA_DYED) .add(Blocks.MAGENTA_BANNER).add(Blocks.MAGENTA_BED).add(Blocks.MAGENTA_CANDLE).add(Blocks.MAGENTA_CARPET) .add(Blocks.MAGENTA_CONCRETE).add(Blocks.MAGENTA_CONCRETE_POWDER).add(Blocks.MAGENTA_GLAZED_TERRACOTTA) .add(Blocks.MAGENTA_SHULKER_BOX).add(Blocks.MAGENTA_STAINED_GLASS).add(Blocks.MAGENTA_STAINED_GLASS_PANE) .add(Blocks.MAGENTA_TERRACOTTA).add(Blocks.MAGENTA_WALL_BANNER).add(Blocks.MAGENTA_WOOL); - getOrCreateTagBuilder(ConventionalBlockTags.ORANGE_DYED_BLOCKS) + getOrCreateTagBuilder(ConventionalBlockTags.ORANGE_DYED) .add(Blocks.ORANGE_BANNER).add(Blocks.ORANGE_BED).add(Blocks.ORANGE_CANDLE).add(Blocks.ORANGE_CARPET) .add(Blocks.ORANGE_CONCRETE).add(Blocks.ORANGE_CONCRETE_POWDER).add(Blocks.ORANGE_GLAZED_TERRACOTTA) .add(Blocks.ORANGE_SHULKER_BOX).add(Blocks.ORANGE_STAINED_GLASS).add(Blocks.ORANGE_STAINED_GLASS_PANE) .add(Blocks.ORANGE_TERRACOTTA).add(Blocks.ORANGE_WALL_BANNER).add(Blocks.ORANGE_WOOL); - getOrCreateTagBuilder(ConventionalBlockTags.PINK_DYED_BLOCKS) + getOrCreateTagBuilder(ConventionalBlockTags.PINK_DYED) .add(Blocks.PINK_BANNER).add(Blocks.PINK_BED).add(Blocks.PINK_CANDLE).add(Blocks.PINK_CARPET) .add(Blocks.PINK_CONCRETE).add(Blocks.PINK_CONCRETE_POWDER).add(Blocks.PINK_GLAZED_TERRACOTTA) .add(Blocks.PINK_SHULKER_BOX).add(Blocks.PINK_STAINED_GLASS).add(Blocks.PINK_STAINED_GLASS_PANE) .add(Blocks.PINK_TERRACOTTA).add(Blocks.PINK_WALL_BANNER).add(Blocks.PINK_WOOL); - getOrCreateTagBuilder(ConventionalBlockTags.PURPLE_DYED_BLOCKS) + getOrCreateTagBuilder(ConventionalBlockTags.PURPLE_DYED) .add(Blocks.PURPLE_BANNER).add(Blocks.PURPLE_BED).add(Blocks.PURPLE_CANDLE).add(Blocks.PURPLE_CARPET) .add(Blocks.PURPLE_CONCRETE).add(Blocks.PURPLE_CONCRETE_POWDER).add(Blocks.PURPLE_GLAZED_TERRACOTTA) .add(Blocks.PURPLE_SHULKER_BOX).add(Blocks.PURPLE_STAINED_GLASS).add(Blocks.PURPLE_STAINED_GLASS_PANE) .add(Blocks.PURPLE_TERRACOTTA).add(Blocks.PURPLE_WALL_BANNER).add(Blocks.PURPLE_WOOL); - getOrCreateTagBuilder(ConventionalBlockTags.RED_DYED_BLOCKS) + getOrCreateTagBuilder(ConventionalBlockTags.RED_DYED) .add(Blocks.RED_BANNER).add(Blocks.RED_BED).add(Blocks.RED_CANDLE).add(Blocks.RED_CARPET) .add(Blocks.RED_CONCRETE).add(Blocks.RED_CONCRETE_POWDER).add(Blocks.RED_GLAZED_TERRACOTTA) .add(Blocks.RED_SHULKER_BOX).add(Blocks.RED_STAINED_GLASS).add(Blocks.RED_STAINED_GLASS_PANE) .add(Blocks.RED_TERRACOTTA).add(Blocks.RED_WALL_BANNER).add(Blocks.RED_WOOL); - getOrCreateTagBuilder(ConventionalBlockTags.WHITE_DYED_BLOCKS) + getOrCreateTagBuilder(ConventionalBlockTags.WHITE_DYED) .add(Blocks.WHITE_BANNER).add(Blocks.WHITE_BED).add(Blocks.WHITE_CANDLE).add(Blocks.WHITE_CARPET) .add(Blocks.WHITE_CONCRETE).add(Blocks.WHITE_CONCRETE_POWDER).add(Blocks.WHITE_GLAZED_TERRACOTTA) .add(Blocks.WHITE_SHULKER_BOX).add(Blocks.WHITE_STAINED_GLASS).add(Blocks.WHITE_STAINED_GLASS_PANE) .add(Blocks.WHITE_TERRACOTTA).add(Blocks.WHITE_WALL_BANNER).add(Blocks.WHITE_WOOL); - getOrCreateTagBuilder(ConventionalBlockTags.YELLOW_DYED_BLOCKS) + getOrCreateTagBuilder(ConventionalBlockTags.YELLOW_DYED) .add(Blocks.YELLOW_BANNER).add(Blocks.YELLOW_BED).add(Blocks.YELLOW_CANDLE).add(Blocks.YELLOW_CARPET) .add(Blocks.YELLOW_CONCRETE).add(Blocks.YELLOW_CONCRETE_POWDER).add(Blocks.YELLOW_GLAZED_TERRACOTTA) .add(Blocks.YELLOW_SHULKER_BOX).add(Blocks.YELLOW_STAINED_GLASS).add(Blocks.YELLOW_STAINED_GLASS_PANE) .add(Blocks.YELLOW_TERRACOTTA).add(Blocks.YELLOW_WALL_BANNER).add(Blocks.YELLOW_WOOL); - getOrCreateTagBuilder(ConventionalBlockTags.DYED_BLOCKS) - .addTag(ConventionalBlockTags.BLACK_DYED_BLOCKS) - .addTag(ConventionalBlockTags.BLUE_DYED_BLOCKS) - .addTag(ConventionalBlockTags.BROWN_DYED_BLOCKS) - .addTag(ConventionalBlockTags.CYAN_DYED_BLOCKS) - .addTag(ConventionalBlockTags.GRAY_DYED_BLOCKS) - .addTag(ConventionalBlockTags.GREEN_DYED_BLOCKS) - .addTag(ConventionalBlockTags.LIGHT_BLUE_DYED_BLOCKS) - .addTag(ConventionalBlockTags.LIGHT_GRAY_DYED_BLOCKS) - .addTag(ConventionalBlockTags.LIME_DYED_BLOCKS) - .addTag(ConventionalBlockTags.MAGENTA_DYED_BLOCKS) - .addTag(ConventionalBlockTags.ORANGE_DYED_BLOCKS) - .addTag(ConventionalBlockTags.PINK_DYED_BLOCKS) - .addTag(ConventionalBlockTags.PURPLE_DYED_BLOCKS) - .addTag(ConventionalBlockTags.RED_DYED_BLOCKS) - .addTag(ConventionalBlockTags.WHITE_DYED_BLOCKS) - .addTag(ConventionalBlockTags.YELLOW_DYED_BLOCKS); + getOrCreateTagBuilder(ConventionalBlockTags.DYED) + .addTag(ConventionalBlockTags.BLACK_DYED) + .addTag(ConventionalBlockTags.BLUE_DYED) + .addTag(ConventionalBlockTags.BROWN_DYED) + .addTag(ConventionalBlockTags.CYAN_DYED) + .addTag(ConventionalBlockTags.GRAY_DYED) + .addTag(ConventionalBlockTags.GREEN_DYED) + .addTag(ConventionalBlockTags.LIGHT_BLUE_DYED) + .addTag(ConventionalBlockTags.LIGHT_GRAY_DYED) + .addTag(ConventionalBlockTags.LIME_DYED) + .addTag(ConventionalBlockTags.MAGENTA_DYED) + .addTag(ConventionalBlockTags.ORANGE_DYED) + .addTag(ConventionalBlockTags.PINK_DYED) + .addTag(ConventionalBlockTags.PURPLE_DYED) + .addTag(ConventionalBlockTags.RED_DYED) + .addTag(ConventionalBlockTags.WHITE_DYED) + .addTag(ConventionalBlockTags.YELLOW_DYED); } private void generateBackwardsCompatTags() { 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 d1a9a62906..10a2c9bdcb 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 @@ -57,23 +57,23 @@ public void generateTranslations(FabricLanguageProvider.TranslationBuilder trans translationBuilder.add(ConventionalBlockTags.UNCOLORED_BLOCKS_SANDSTONE, "Uncolored Sandstone Blocks"); translationBuilder.add(ConventionalBlockTags.UNCOLORED_SLABS_SANDSTONE, "Uncolored Sandstone Slabs"); translationBuilder.add(ConventionalBlockTags.UNCOLORED_STAIRS_SANDSTONE, "Uncolored Sandstone Stairs"); - translationBuilder.add(ConventionalBlockTags.DYED_BLOCKS, "Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.BLACK_DYED_BLOCKS, "Black Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.BLUE_DYED_BLOCKS, "Blue Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.BROWN_DYED_BLOCKS, "Brown Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.CYAN_DYED_BLOCKS, "Cyan Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.GRAY_DYED_BLOCKS, "Gray Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.GREEN_DYED_BLOCKS, "Green Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.LIGHT_BLUE_DYED_BLOCKS, "Light Blue Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.LIGHT_GRAY_DYED_BLOCKS, "Light Gray Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.LIME_DYED_BLOCKS, "Lime Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.MAGENTA_DYED_BLOCKS, "Magenta Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.ORANGE_DYED_BLOCKS, "Orange Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.PINK_DYED_BLOCKS, "Pink Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.PURPLE_DYED_BLOCKS, "Purple Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.RED_DYED_BLOCKS, "Red Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.WHITE_DYED_BLOCKS, "White Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.YELLOW_DYED_BLOCKS, "Yellow Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.DYED, "Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.BLACK_DYED, "Black Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.BLUE_DYED, "Blue Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.BROWN_DYED, "Brown Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.CYAN_DYED, "Cyan Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.GRAY_DYED, "Gray Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.GREEN_DYED, "Green Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.LIGHT_BLUE_DYED, "Light Blue Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.LIGHT_GRAY_DYED, "Light Gray Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.LIME_DYED, "Lime Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.MAGENTA_DYED, "Magenta Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.ORANGE_DYED, "Orange Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.PINK_DYED, "Pink Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.PURPLE_DYED, "Purple Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.RED_DYED, "Red Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.WHITE_DYED, "White Dyed Blocks"); + translationBuilder.add(ConventionalBlockTags.YELLOW_DYED, "Yellow Dyed Blocks"); translationBuilder.add(ConventionalBlockTags.RELOCATION_NOT_SUPPORTED, "Relocation Not Supported"); // Block Entity Types @@ -159,23 +159,23 @@ public void generateTranslations(FabricLanguageProvider.TranslationBuilder trans translationBuilder.add(ConventionalItemTags.RED_DYES, "Red Dyes"); translationBuilder.add(ConventionalItemTags.WHITE_DYES, "White Dyes"); translationBuilder.add(ConventionalItemTags.YELLOW_DYES, "Yellow Dyes"); - translationBuilder.add(ConventionalItemTags.DYED_ITEMS, "Dyed Items"); - translationBuilder.add(ConventionalItemTags.BLACK_DYED_ITEMS, "Black Dyed Items"); - translationBuilder.add(ConventionalItemTags.BLUE_DYED_ITEMS, "Blue Dyed Items"); - translationBuilder.add(ConventionalItemTags.BROWN_DYED_ITEMS, "Brown Dyed Items"); - translationBuilder.add(ConventionalItemTags.CYAN_DYED_ITEMS, "Cyan Dyed Items"); - translationBuilder.add(ConventionalItemTags.GRAY_DYED_ITEMS, "Gray Dyed Items"); - translationBuilder.add(ConventionalItemTags.GREEN_DYED_ITEMS, "Green Dyed Items"); - translationBuilder.add(ConventionalItemTags.LIGHT_BLUE_DYED_ITEMS, "Light Blue Dyed Items"); - translationBuilder.add(ConventionalItemTags.LIGHT_GRAY_DYED_ITEMS, "Light Gray Dyed Items"); - translationBuilder.add(ConventionalItemTags.LIME_DYED_ITEMS, "Lime Dyed Items"); - translationBuilder.add(ConventionalItemTags.MAGENTA_DYED_ITEMS, "Magenta Dyed Items"); - translationBuilder.add(ConventionalItemTags.ORANGE_DYED_ITEMS, "Orange Dyed Items"); - translationBuilder.add(ConventionalItemTags.PINK_DYED_ITEMS, "Pink Dyed Items"); - translationBuilder.add(ConventionalItemTags.PURPLE_DYED_ITEMS, "Purple Dyed Items"); - translationBuilder.add(ConventionalItemTags.RED_DYED_ITEMS, "Red Dyed Items"); - translationBuilder.add(ConventionalItemTags.WHITE_DYED_ITEMS, "White Dyed Items"); - translationBuilder.add(ConventionalItemTags.YELLOW_DYED_ITEMS, "Yellow Dyed Items"); + translationBuilder.add(ConventionalItemTags.DYED, "Dyed Items"); + translationBuilder.add(ConventionalItemTags.BLACK_DYED, "Black Dyed Items"); + translationBuilder.add(ConventionalItemTags.BLUE_DYED, "Blue Dyed Items"); + translationBuilder.add(ConventionalItemTags.BROWN_DYED, "Brown Dyed Items"); + translationBuilder.add(ConventionalItemTags.CYAN_DYED, "Cyan Dyed Items"); + translationBuilder.add(ConventionalItemTags.GRAY_DYED, "Gray Dyed Items"); + translationBuilder.add(ConventionalItemTags.GREEN_DYED, "Green Dyed Items"); + translationBuilder.add(ConventionalItemTags.LIGHT_BLUE_DYED, "Light Blue Dyed Items"); + translationBuilder.add(ConventionalItemTags.LIGHT_GRAY_DYED, "Light Gray Dyed Items"); + translationBuilder.add(ConventionalItemTags.LIME_DYED, "Lime Dyed Items"); + translationBuilder.add(ConventionalItemTags.MAGENTA_DYED, "Magenta Dyed Items"); + translationBuilder.add(ConventionalItemTags.ORANGE_DYED, "Orange Dyed Items"); + translationBuilder.add(ConventionalItemTags.PINK_DYED, "Pink Dyed Items"); + translationBuilder.add(ConventionalItemTags.PURPLE_DYED, "Purple Dyed Items"); + translationBuilder.add(ConventionalItemTags.RED_DYED, "Red Dyed Items"); + translationBuilder.add(ConventionalItemTags.WHITE_DYED, "White Dyed Items"); + translationBuilder.add(ConventionalItemTags.YELLOW_DYED, "Yellow Dyed Items"); // Enchantments translationBuilder.add(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS, "Increases Block Drops"); 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 c5cef46653..2e4d0c3b43 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 @@ -262,119 +262,119 @@ private void generateVillagerJobSites() { private void generateDyedTags() { // Cannot pull entries from block tag because Wall Banners do not have an item form - getOrCreateTagBuilder(ConventionalItemTags.BLACK_DYED_ITEMS) + getOrCreateTagBuilder(ConventionalItemTags.BLACK_DYED) .add(Items.BLACK_BANNER).add(Items.BLACK_BED).add(Items.BLACK_CANDLE).add(Items.BLACK_CARPET) .add(Items.BLACK_CONCRETE).add(Items.BLACK_CONCRETE_POWDER).add(Items.BLACK_GLAZED_TERRACOTTA) .add(Items.BLACK_SHULKER_BOX).add(Items.BLACK_STAINED_GLASS).add(Items.BLACK_STAINED_GLASS_PANE) .add(Items.BLACK_TERRACOTTA).add(Items.BLACK_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.BLUE_DYED_ITEMS) + getOrCreateTagBuilder(ConventionalItemTags.BLUE_DYED) .add(Items.BLUE_BANNER).add(Items.BLUE_BED).add(Items.BLUE_CANDLE).add(Items.BLUE_CARPET) .add(Items.BLUE_CONCRETE).add(Items.BLUE_CONCRETE_POWDER).add(Items.BLUE_GLAZED_TERRACOTTA) .add(Items.BLUE_SHULKER_BOX).add(Items.BLUE_STAINED_GLASS).add(Items.BLUE_STAINED_GLASS_PANE) .add(Items.BLUE_TERRACOTTA).add(Items.BLUE_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.BROWN_DYED_ITEMS) + getOrCreateTagBuilder(ConventionalItemTags.BROWN_DYED) .add(Items.BROWN_BANNER).add(Items.BROWN_BED).add(Items.BROWN_CANDLE).add(Items.BROWN_CARPET) .add(Items.BROWN_CONCRETE).add(Items.BROWN_CONCRETE_POWDER).add(Items.BROWN_GLAZED_TERRACOTTA) .add(Items.BROWN_SHULKER_BOX).add(Items.BROWN_STAINED_GLASS).add(Items.BROWN_STAINED_GLASS_PANE) .add(Items.BROWN_TERRACOTTA).add(Items.BROWN_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.CYAN_DYED_ITEMS) + getOrCreateTagBuilder(ConventionalItemTags.CYAN_DYED) .add(Items.CYAN_BANNER).add(Items.CYAN_BED).add(Items.CYAN_CANDLE).add(Items.CYAN_CARPET) .add(Items.CYAN_CONCRETE).add(Items.CYAN_CONCRETE_POWDER).add(Items.CYAN_GLAZED_TERRACOTTA) .add(Items.CYAN_SHULKER_BOX).add(Items.CYAN_STAINED_GLASS).add(Items.CYAN_STAINED_GLASS_PANE) .add(Items.CYAN_TERRACOTTA).add(Items.CYAN_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.GRAY_DYED_ITEMS) + getOrCreateTagBuilder(ConventionalItemTags.GRAY_DYED) .add(Items.GRAY_BANNER).add(Items.GRAY_BED).add(Items.GRAY_CANDLE).add(Items.GRAY_CARPET) .add(Items.GRAY_CONCRETE).add(Items.GRAY_CONCRETE_POWDER).add(Items.GRAY_GLAZED_TERRACOTTA) .add(Items.GRAY_SHULKER_BOX).add(Items.GRAY_STAINED_GLASS).add(Items.GRAY_STAINED_GLASS_PANE) .add(Items.GRAY_TERRACOTTA).add(Items.GRAY_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.GREEN_DYED_ITEMS) + getOrCreateTagBuilder(ConventionalItemTags.GREEN_DYED) .add(Items.GREEN_BANNER).add(Items.GREEN_BED).add(Items.GREEN_CANDLE).add(Items.GREEN_CARPET) .add(Items.GREEN_CONCRETE).add(Items.GREEN_CONCRETE_POWDER).add(Items.GREEN_GLAZED_TERRACOTTA) .add(Items.GREEN_SHULKER_BOX).add(Items.GREEN_STAINED_GLASS).add(Items.GREEN_STAINED_GLASS_PANE) .add(Items.GREEN_TERRACOTTA).add(Items.GREEN_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.LIGHT_BLUE_DYED_ITEMS) + getOrCreateTagBuilder(ConventionalItemTags.LIGHT_BLUE_DYED) .add(Items.LIGHT_BLUE_BANNER).add(Items.LIGHT_BLUE_BED).add(Items.LIGHT_BLUE_CANDLE).add(Items.LIGHT_BLUE_CARPET) .add(Items.LIGHT_BLUE_CONCRETE).add(Items.LIGHT_BLUE_CONCRETE_POWDER).add(Items.LIGHT_BLUE_GLAZED_TERRACOTTA) .add(Items.LIGHT_BLUE_SHULKER_BOX).add(Items.LIGHT_BLUE_STAINED_GLASS).add(Items.LIGHT_BLUE_STAINED_GLASS_PANE) .add(Items.LIGHT_BLUE_TERRACOTTA).add(Items.LIGHT_BLUE_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.LIGHT_GRAY_DYED_ITEMS) + getOrCreateTagBuilder(ConventionalItemTags.LIGHT_GRAY_DYED) .add(Items.LIGHT_GRAY_BANNER).add(Items.LIGHT_GRAY_BED).add(Items.LIGHT_GRAY_CANDLE).add(Items.LIGHT_GRAY_CARPET) .add(Items.LIGHT_GRAY_CONCRETE).add(Items.LIGHT_GRAY_CONCRETE_POWDER).add(Items.LIGHT_GRAY_GLAZED_TERRACOTTA) .add(Items.LIGHT_GRAY_SHULKER_BOX).add(Items.LIGHT_GRAY_STAINED_GLASS).add(Items.LIGHT_GRAY_STAINED_GLASS_PANE) .add(Items.LIGHT_GRAY_TERRACOTTA).add(Items.LIGHT_GRAY_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.LIME_DYED_ITEMS) + getOrCreateTagBuilder(ConventionalItemTags.LIME_DYED) .add(Items.LIME_BANNER).add(Items.LIME_BED).add(Items.LIME_CANDLE).add(Items.LIME_CARPET) .add(Items.LIME_CONCRETE).add(Items.LIME_CONCRETE_POWDER).add(Items.LIME_GLAZED_TERRACOTTA) .add(Items.LIME_SHULKER_BOX).add(Items.LIME_STAINED_GLASS).add(Items.LIME_STAINED_GLASS_PANE) .add(Items.LIME_TERRACOTTA).add(Items.LIME_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.MAGENTA_DYED_ITEMS) + getOrCreateTagBuilder(ConventionalItemTags.MAGENTA_DYED) .add(Items.MAGENTA_BANNER).add(Items.MAGENTA_BED).add(Items.MAGENTA_CANDLE).add(Items.MAGENTA_CARPET) .add(Items.MAGENTA_CONCRETE).add(Items.MAGENTA_CONCRETE_POWDER).add(Items.MAGENTA_GLAZED_TERRACOTTA) .add(Items.MAGENTA_SHULKER_BOX).add(Items.MAGENTA_STAINED_GLASS).add(Items.MAGENTA_STAINED_GLASS_PANE) .add(Items.MAGENTA_TERRACOTTA).add(Items.MAGENTA_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.ORANGE_DYED_ITEMS) + getOrCreateTagBuilder(ConventionalItemTags.ORANGE_DYED) .add(Items.ORANGE_BANNER).add(Items.ORANGE_BED).add(Items.ORANGE_CANDLE).add(Items.ORANGE_CARPET) .add(Items.ORANGE_CONCRETE).add(Items.ORANGE_CONCRETE_POWDER).add(Items.ORANGE_GLAZED_TERRACOTTA) .add(Items.ORANGE_SHULKER_BOX).add(Items.ORANGE_STAINED_GLASS).add(Items.ORANGE_STAINED_GLASS_PANE) .add(Items.ORANGE_TERRACOTTA).add(Items.ORANGE_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.PINK_DYED_ITEMS) + getOrCreateTagBuilder(ConventionalItemTags.PINK_DYED) .add(Items.PINK_BANNER).add(Items.PINK_BED).add(Items.PINK_CANDLE).add(Items.PINK_CARPET) .add(Items.PINK_CONCRETE).add(Items.PINK_CONCRETE_POWDER).add(Items.PINK_GLAZED_TERRACOTTA) .add(Items.PINK_SHULKER_BOX).add(Items.PINK_STAINED_GLASS).add(Items.PINK_STAINED_GLASS_PANE) .add(Items.PINK_TERRACOTTA).add(Items.PINK_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.PURPLE_DYED_ITEMS) + getOrCreateTagBuilder(ConventionalItemTags.PURPLE_DYED) .add(Items.PURPLE_BANNER).add(Items.PURPLE_BED).add(Items.PURPLE_CANDLE).add(Items.PURPLE_CARPET) .add(Items.PURPLE_CONCRETE).add(Items.PURPLE_CONCRETE_POWDER).add(Items.PURPLE_GLAZED_TERRACOTTA) .add(Items.PURPLE_SHULKER_BOX).add(Items.PURPLE_STAINED_GLASS).add(Items.PURPLE_STAINED_GLASS_PANE) .add(Items.PURPLE_TERRACOTTA).add(Items.PURPLE_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.RED_DYED_ITEMS) + getOrCreateTagBuilder(ConventionalItemTags.RED_DYED) .add(Items.RED_BANNER).add(Items.RED_BED).add(Items.RED_CANDLE).add(Items.RED_CARPET) .add(Items.RED_CONCRETE).add(Items.RED_CONCRETE_POWDER).add(Items.RED_GLAZED_TERRACOTTA) .add(Items.RED_SHULKER_BOX).add(Items.RED_STAINED_GLASS).add(Items.RED_STAINED_GLASS_PANE) .add(Items.RED_TERRACOTTA).add(Items.RED_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.WHITE_DYED_ITEMS) + getOrCreateTagBuilder(ConventionalItemTags.WHITE_DYED) .add(Items.WHITE_BANNER).add(Items.WHITE_BED).add(Items.WHITE_CANDLE).add(Items.WHITE_CARPET) .add(Items.WHITE_CONCRETE).add(Items.WHITE_CONCRETE_POWDER).add(Items.WHITE_GLAZED_TERRACOTTA) .add(Items.WHITE_SHULKER_BOX).add(Items.WHITE_STAINED_GLASS).add(Items.WHITE_STAINED_GLASS_PANE) .add(Items.WHITE_TERRACOTTA).add(Items.WHITE_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.YELLOW_DYED_ITEMS) + getOrCreateTagBuilder(ConventionalItemTags.YELLOW_DYED) .add(Items.YELLOW_BANNER).add(Items.YELLOW_BED).add(Items.YELLOW_CANDLE).add(Items.YELLOW_CARPET) .add(Items.YELLOW_CONCRETE).add(Items.YELLOW_CONCRETE_POWDER).add(Items.YELLOW_GLAZED_TERRACOTTA) .add(Items.YELLOW_SHULKER_BOX).add(Items.YELLOW_STAINED_GLASS).add(Items.YELLOW_STAINED_GLASS_PANE) .add(Items.YELLOW_TERRACOTTA).add(Items.YELLOW_WOOL); - getOrCreateTagBuilder(ConventionalItemTags.DYED_ITEMS) - .addTag(ConventionalItemTags.BLACK_DYED_ITEMS) - .addTag(ConventionalItemTags.BLUE_DYED_ITEMS) - .addTag(ConventionalItemTags.BROWN_DYED_ITEMS) - .addTag(ConventionalItemTags.CYAN_DYED_ITEMS) - .addTag(ConventionalItemTags.GRAY_DYED_ITEMS) - .addTag(ConventionalItemTags.GREEN_DYED_ITEMS) - .addTag(ConventionalItemTags.LIGHT_BLUE_DYED_ITEMS) - .addTag(ConventionalItemTags.LIGHT_GRAY_DYED_ITEMS) - .addTag(ConventionalItemTags.LIME_DYED_ITEMS) - .addTag(ConventionalItemTags.MAGENTA_DYED_ITEMS) - .addTag(ConventionalItemTags.ORANGE_DYED_ITEMS) - .addTag(ConventionalItemTags.PINK_DYED_ITEMS) - .addTag(ConventionalItemTags.PURPLE_DYED_ITEMS) - .addTag(ConventionalItemTags.RED_DYED_ITEMS) - .addTag(ConventionalItemTags.WHITE_DYED_ITEMS) - .addTag(ConventionalItemTags.YELLOW_DYED_ITEMS); + getOrCreateTagBuilder(ConventionalItemTags.DYED) + .addTag(ConventionalItemTags.BLACK_DYED) + .addTag(ConventionalItemTags.BLUE_DYED) + .addTag(ConventionalItemTags.BROWN_DYED) + .addTag(ConventionalItemTags.CYAN_DYED) + .addTag(ConventionalItemTags.GRAY_DYED) + .addTag(ConventionalItemTags.GREEN_DYED) + .addTag(ConventionalItemTags.LIGHT_BLUE_DYED) + .addTag(ConventionalItemTags.LIGHT_GRAY_DYED) + .addTag(ConventionalItemTags.LIME_DYED) + .addTag(ConventionalItemTags.MAGENTA_DYED) + .addTag(ConventionalItemTags.ORANGE_DYED) + .addTag(ConventionalItemTags.PINK_DYED) + .addTag(ConventionalItemTags.PURPLE_DYED) + .addTag(ConventionalItemTags.RED_DYED) + .addTag(ConventionalItemTags.WHITE_DYED) + .addTag(ConventionalItemTags.YELLOW_DYED); } private void generateBackwardsCompatTags() { diff --git a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json index 96da38bca5..97223767c0 100644 --- a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json +++ b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json @@ -6,23 +6,23 @@ "tag.block.c.buds": "Buds", "tag.block.c.chests": "Chests", "tag.block.c.clusters": "Clusters", - "tag.block.c.dyed_blocks": "Dyed Blocks", - "tag.block.c.dyed_blocks.black": "Black Dyed Blocks", - "tag.block.c.dyed_blocks.blue": "Blue Dyed Blocks", - "tag.block.c.dyed_blocks.brown": "Brown Dyed Blocks", - "tag.block.c.dyed_blocks.cyan": "Cyan Dyed Blocks", - "tag.block.c.dyed_blocks.gray": "Gray Dyed Blocks", - "tag.block.c.dyed_blocks.green": "Green Dyed Blocks", - "tag.block.c.dyed_blocks.light_blue": "Light Blue Dyed Blocks", - "tag.block.c.dyed_blocks.light_gray": "Light Gray Dyed Blocks", - "tag.block.c.dyed_blocks.lime": "Lime Dyed Blocks", - "tag.block.c.dyed_blocks.magenta": "Magenta Dyed Blocks", - "tag.block.c.dyed_blocks.orange": "Orange Dyed Blocks", - "tag.block.c.dyed_blocks.pink": "Pink Dyed Blocks", - "tag.block.c.dyed_blocks.purple": "Purple Dyed Blocks", - "tag.block.c.dyed_blocks.red": "Red Dyed Blocks", - "tag.block.c.dyed_blocks.white": "White Dyed Blocks", - "tag.block.c.dyed_blocks.yellow": "Yellow Dyed Blocks", + "tag.block.c.dyed": "Dyed Blocks", + "tag.block.c.dyed.black": "Black Dyed Blocks", + "tag.block.c.dyed.blue": "Blue Dyed Blocks", + "tag.block.c.dyed.brown": "Brown Dyed Blocks", + "tag.block.c.dyed.cyan": "Cyan Dyed Blocks", + "tag.block.c.dyed.gray": "Gray Dyed Blocks", + "tag.block.c.dyed.green": "Green Dyed Blocks", + "tag.block.c.dyed.light_blue": "Light Blue Dyed Blocks", + "tag.block.c.dyed.light_gray": "Light Gray Dyed Blocks", + "tag.block.c.dyed.lime": "Lime Dyed Blocks", + "tag.block.c.dyed.magenta": "Magenta Dyed Blocks", + "tag.block.c.dyed.orange": "Orange Dyed Blocks", + "tag.block.c.dyed.pink": "Pink Dyed Blocks", + "tag.block.c.dyed.purple": "Purple Dyed Blocks", + "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.glass_blocks": "Glass Blocks", "tag.block.c.glass_panes": "Glass Panes", "tag.block.c.ores": "Ores", @@ -70,23 +70,23 @@ "tag.item.c.dusts": "Dusts", "tag.item.c.dusts.glowstone": "Glowstone Dusts", "tag.item.c.dusts.redstone": "Redstone Dusts", - "tag.item.c.dyed_items": "Dyed Items", - "tag.item.c.dyed_items.black": "Black Dyed Items", - "tag.item.c.dyed_items.blue": "Blue Dyed Items", - "tag.item.c.dyed_items.brown": "Brown Dyed Items", - "tag.item.c.dyed_items.cyan": "Cyan Dyed Items", - "tag.item.c.dyed_items.gray": "Gray Dyed Items", - "tag.item.c.dyed_items.green": "Green Dyed Items", - "tag.item.c.dyed_items.light_blue": "Light Blue Dyed Items", - "tag.item.c.dyed_items.light_gray": "Light Gray Dyed Items", - "tag.item.c.dyed_items.lime": "Lime Dyed Items", - "tag.item.c.dyed_items.magenta": "Magenta Dyed Items", - "tag.item.c.dyed_items.orange": "Orange Dyed Items", - "tag.item.c.dyed_items.pink": "Pink Dyed Items", - "tag.item.c.dyed_items.purple": "Purple Dyed Items", - "tag.item.c.dyed_items.red": "Red Dyed Items", - "tag.item.c.dyed_items.white": "White Dyed Items", - "tag.item.c.dyed_items.yellow": "Yellow Dyed Items", + "tag.item.c.dyed": "Dyed Items", + "tag.item.c.dyed.black": "Black Dyed Items", + "tag.item.c.dyed.blue": "Blue Dyed Items", + "tag.item.c.dyed.brown": "Brown Dyed Items", + "tag.item.c.dyed.cyan": "Cyan Dyed Items", + "tag.item.c.dyed.gray": "Gray Dyed Items", + "tag.item.c.dyed.green": "Green Dyed Items", + "tag.item.c.dyed.light_blue": "Light Blue Dyed Items", + "tag.item.c.dyed.light_gray": "Light Gray Dyed Items", + "tag.item.c.dyed.lime": "Lime Dyed Items", + "tag.item.c.dyed.magenta": "Magenta Dyed Items", + "tag.item.c.dyed.orange": "Orange Dyed Items", + "tag.item.c.dyed.pink": "Pink Dyed Items", + "tag.item.c.dyed.purple": "Purple Dyed Items", + "tag.item.c.dyed.red": "Red Dyed Items", + "tag.item.c.dyed.white": "White Dyed Items", + "tag.item.c.dyed.yellow": "Yellow Dyed Items", "tag.item.c.dyes": "Dyes", "tag.item.c.dyes.black": "Black Dyes", "tag.item.c.dyes.blue": "Blue Dyes", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed.json new file mode 100644 index 0000000000..357d1e4a57 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "#c:dyed/black", + "#c:dyed/blue", + "#c:dyed/brown", + "#c:dyed/cyan", + "#c:dyed/gray", + "#c:dyed/green", + "#c:dyed/light_blue", + "#c:dyed/light_gray", + "#c:dyed/lime", + "#c:dyed/magenta", + "#c:dyed/orange", + "#c:dyed/pink", + "#c:dyed/purple", + "#c:dyed/red", + "#c:dyed/white", + "#c:dyed/yellow" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/black.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/black.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/black.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/black.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/blue.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/blue.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/blue.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/blue.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/brown.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/brown.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/brown.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/brown.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/cyan.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/cyan.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/cyan.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/cyan.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/gray.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/gray.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/gray.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/gray.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/green.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/green.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/green.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/green.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/light_blue.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/light_blue.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/light_blue.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/light_blue.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/light_gray.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/light_gray.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/light_gray.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/light_gray.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/lime.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/lime.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/lime.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/lime.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/magenta.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/magenta.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/magenta.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/magenta.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/orange.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/orange.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/orange.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/orange.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/pink.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/pink.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/pink.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/pink.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/purple.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/purple.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/purple.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/purple.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/red.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/red.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/red.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/red.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/white.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/white.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/white.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/white.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/yellow.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/yellow.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks/yellow.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/yellow.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks.json deleted file mode 100644 index 0f32bfac56..0000000000 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed_blocks.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "replace": false, - "values": [ - "#c:dyed_blocks/black", - "#c:dyed_blocks/blue", - "#c:dyed_blocks/brown", - "#c:dyed_blocks/cyan", - "#c:dyed_blocks/gray", - "#c:dyed_blocks/green", - "#c:dyed_blocks/light_blue", - "#c:dyed_blocks/light_gray", - "#c:dyed_blocks/lime", - "#c:dyed_blocks/magenta", - "#c:dyed_blocks/orange", - "#c:dyed_blocks/pink", - "#c:dyed_blocks/purple", - "#c:dyed_blocks/red", - "#c:dyed_blocks/white", - "#c:dyed_blocks/yellow" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed.json new file mode 100644 index 0000000000..357d1e4a57 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "#c:dyed/black", + "#c:dyed/blue", + "#c:dyed/brown", + "#c:dyed/cyan", + "#c:dyed/gray", + "#c:dyed/green", + "#c:dyed/light_blue", + "#c:dyed/light_gray", + "#c:dyed/lime", + "#c:dyed/magenta", + "#c:dyed/orange", + "#c:dyed/pink", + "#c:dyed/purple", + "#c:dyed/red", + "#c:dyed/white", + "#c:dyed/yellow" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/black.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/black.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/black.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/black.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/blue.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/blue.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/blue.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/blue.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/brown.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/brown.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/brown.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/brown.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/cyan.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/cyan.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/cyan.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/cyan.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/gray.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/gray.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/gray.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/gray.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/green.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/green.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/green.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/green.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/light_blue.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/light_blue.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/light_blue.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/light_blue.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/light_gray.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/light_gray.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/light_gray.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/light_gray.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/lime.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/lime.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/lime.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/lime.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/magenta.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/magenta.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/magenta.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/magenta.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/orange.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/orange.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/orange.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/orange.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/pink.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/pink.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/pink.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/pink.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/purple.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/purple.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/purple.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/purple.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/red.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/red.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/red.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/red.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/white.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/white.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/white.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/white.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/yellow.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/yellow.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items/yellow.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/yellow.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items.json deleted file mode 100644 index e67d2c17b8..0000000000 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed_items.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "replace": false, - "values": [ - "#c:dyed_items/black", - "#c:dyed_items/blue", - "#c:dyed_items/brown", - "#c:dyed_items/cyan", - "#c:dyed_items/gray", - "#c:dyed_items/green", - "#c:dyed_items/light_blue", - "#c:dyed_items/light_gray", - "#c:dyed_items/lime", - "#c:dyed_items/magenta", - "#c:dyed_items/orange", - "#c:dyed_items/pink", - "#c:dyed_items/purple", - "#c:dyed_items/red", - "#c:dyed_items/white", - "#c:dyed_items/yellow" - ] -} \ No newline at end of file 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 1f6af6b3b0..d051f5aaa9 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 @@ -73,23 +73,23 @@ private ConventionalBlockTags() { public static final TagKey UNCOLORED_STAIRS_SANDSTONE = register("sandstone/uncolored_stairs"); // Blocks created with dyes - public static final TagKey DYED_BLOCKS = register("dyed_blocks"); - public static final TagKey BLACK_DYED_BLOCKS = register("dyed_blocks/black"); - public static final TagKey BLUE_DYED_BLOCKS = register("dyed_blocks/blue"); - public static final TagKey BROWN_DYED_BLOCKS = register("dyed_blocks/brown"); - public static final TagKey CYAN_DYED_BLOCKS = register("dyed_blocks/cyan"); - public static final TagKey GRAY_DYED_BLOCKS = register("dyed_blocks/gray"); - public static final TagKey GREEN_DYED_BLOCKS = register("dyed_blocks/green"); - public static final TagKey LIGHT_BLUE_DYED_BLOCKS = register("dyed_blocks/light_blue"); - public static final TagKey LIGHT_GRAY_DYED_BLOCKS = register("dyed_blocks/light_gray"); - public static final TagKey LIME_DYED_BLOCKS = register("dyed_blocks/lime"); - public static final TagKey MAGENTA_DYED_BLOCKS = register("dyed_blocks/magenta"); - public static final TagKey ORANGE_DYED_BLOCKS = register("dyed_blocks/orange"); - public static final TagKey PINK_DYED_BLOCKS = register("dyed_blocks/pink"); - public static final TagKey PURPLE_DYED_BLOCKS = register("dyed_blocks/purple"); - public static final TagKey RED_DYED_BLOCKS = register("dyed_blocks/red"); - public static final TagKey WHITE_DYED_BLOCKS = register("dyed_blocks/white"); - public static final TagKey YELLOW_DYED_BLOCKS = register("dyed_blocks/yellow"); + public static final TagKey DYED = register("dyed"); + public static final TagKey BLACK_DYED = register("dyed/black"); + public static final TagKey BLUE_DYED = register("dyed/blue"); + public static final TagKey BROWN_DYED = register("dyed/brown"); + public static final TagKey CYAN_DYED = register("dyed/cyan"); + public static final TagKey GRAY_DYED = register("dyed/gray"); + public static final TagKey GREEN_DYED = register("dyed/green"); + public static final TagKey LIGHT_BLUE_DYED = register("dyed/light_blue"); + public static final TagKey LIGHT_GRAY_DYED = register("dyed/light_gray"); + public static final TagKey LIME_DYED = register("dyed/lime"); + public static final TagKey MAGENTA_DYED = register("dyed/magenta"); + public static final TagKey ORANGE_DYED = register("dyed/orange"); + public static final TagKey PINK_DYED = register("dyed/pink"); + public static final TagKey PURPLE_DYED = register("dyed/purple"); + public static final TagKey RED_DYED = register("dyed/red"); + public static final TagKey WHITE_DYED = register("dyed/white"); + public static final TagKey YELLOW_DYED = register("dyed/yellow"); /** * Blocks should be included in this tag if their movement can cause serious issues such as world corruption 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 56375d4764..63e2039c84 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 @@ -33,7 +33,8 @@ private ConventionalItemTags() { public static final TagKey TOOLS = register("tools"); public static final TagKey SHEARS_TOOLS = register("tools/shears"); /** - * For throwable weapons, like Minecraft tridents. + * For throwable spear weapons, like Minecraft's tridents. + * Note, other throwable weapons like boomerangs and throwing knives are best put into their own tools tag. */ public static final TagKey SPEARS_TOOLS = register("tools/spears"); public static final TagKey BOWS_TOOLS = register("tools/bows"); @@ -140,23 +141,23 @@ private ConventionalItemTags() { public static final TagKey YELLOW_DYES = register("dyes/yellow"); // Items created with dyes - public static final TagKey DYED_ITEMS = register("dyed_items"); - public static final TagKey BLACK_DYED_ITEMS = register("dyed_items/black"); - public static final TagKey BLUE_DYED_ITEMS = register("dyed_items/blue"); - public static final TagKey BROWN_DYED_ITEMS = register("dyed_items/brown"); - public static final TagKey CYAN_DYED_ITEMS = register("dyed_items/cyan"); - public static final TagKey GRAY_DYED_ITEMS = register("dyed_items/gray"); - public static final TagKey GREEN_DYED_ITEMS = register("dyed_items/green"); - public static final TagKey LIGHT_BLUE_DYED_ITEMS = register("dyed_items/light_blue"); - public static final TagKey LIGHT_GRAY_DYED_ITEMS = register("dyed_items/light_gray"); - public static final TagKey LIME_DYED_ITEMS = register("dyed_items/lime"); - public static final TagKey MAGENTA_DYED_ITEMS = register("dyed_items/magenta"); - public static final TagKey ORANGE_DYED_ITEMS = register("dyed_items/orange"); - public static final TagKey PINK_DYED_ITEMS = register("dyed_items/pink"); - public static final TagKey PURPLE_DYED_ITEMS = register("dyed_items/purple"); - public static final TagKey RED_DYED_ITEMS = register("dyed_items/red"); - public static final TagKey WHITE_DYED_ITEMS = register("dyed_items/white"); - public static final TagKey YELLOW_DYED_ITEMS = register("dyed_items/yellow"); + public static final TagKey DYED = register("dyed"); + public static final TagKey BLACK_DYED = register("dyed/black"); + public static final TagKey BLUE_DYED = register("dyed/blue"); + public static final TagKey BROWN_DYED = register("dyed/brown"); + public static final TagKey CYAN_DYED = register("dyed/cyan"); + public static final TagKey GRAY_DYED = register("dyed/gray"); + public static final TagKey GREEN_DYED = register("dyed/green"); + public static final TagKey LIGHT_BLUE_DYED = register("dyed/light_blue"); + public static final TagKey LIGHT_GRAY_DYED = register("dyed/light_gray"); + public static final TagKey LIME_DYED = register("dyed/lime"); + public static final TagKey MAGENTA_DYED = register("dyed/magenta"); + public static final TagKey ORANGE_DYED = register("dyed/orange"); + public static final TagKey PINK_DYED = register("dyed/pink"); + public static final TagKey PURPLE_DYED = register("dyed/purple"); + public static final TagKey RED_DYED = register("dyed/red"); + public static final TagKey WHITE_DYED = register("dyed/white"); + public static final TagKey YELLOW_DYED = register("dyed/yellow"); private static TagKey register(String tagID) { return TagRegistration.ITEM_TAG_REGISTRATION.registerC(tagID); From 0d598d94abe8cc1bceff10267dcfcfb216db9a95 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 10:45:54 -0400 Subject: [PATCH 032/123] Pulled out tag translation for future PR --- .../client/ConventionLogWarningsClient.java | 96 ------- .../convention/datagen/DatagenEntrypoint.java | 2 - .../generators/EnglishTagLangGenerator.java | 257 ------------------ .../lang/en_us.json | 209 -------------- .../convention/v2/FabricTagKeyExtension.java | 78 ------ .../ConventionLogWarningConfigs.java | 17 +- .../convention/TagKeyExtensionMixin.java | 27 -- .../icon.png | Bin .../fabric-convention-tags-api-v2.mixins.json | 11 - .../src/main/resources/fabric.mod.json | 16 +- .../src/testmod/resources/fabric.mod.json | 2 +- .../v1/provider/FabricLanguageProvider.java | 11 - 12 files changed, 9 insertions(+), 717 deletions(-) delete mode 100644 fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java delete mode 100644 fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java delete mode 100644 fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json delete mode 100644 fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/FabricTagKeyExtension.java delete mode 100644 fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/convention/TagKeyExtensionMixin.java rename fabric-convention-tags-v2/src/main/resources/assets/{fabric-convention-tags-v1 => fabric-convention-tags-v2}/icon.png (100%) delete mode 100644 fabric-convention-tags-v2/src/main/resources/fabric-convention-tags-api-v2.mixins.json diff --git a/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java b/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java deleted file mode 100644 index 5e171eef52..0000000000 --- a/fabric-convention-tags-v2/src/client/java/net/fabricmc/fabric/impl/tag/convention/client/ConventionLogWarningsClient.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.fabricmc.fabric.impl.tag.convention.client; - -import static net.fabricmc.fabric.impl.tag.convention.ConventionLogWarningConfigs.LOG_WARNING_MODES; -import static net.fabricmc.fabric.impl.tag.convention.ConventionLogWarningConfigs.LOG_UNTRANSLATED_WARNING_MODE; - -import java.util.List; - -import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import net.minecraft.client.resource.language.I18n; -import net.minecraft.item.Item; -import net.minecraft.registry.Registry; -import net.minecraft.registry.RegistryKeys; -import net.minecraft.registry.tag.TagKey; -import net.minecraft.util.Identifier; - -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; -import net.fabricmc.loader.api.FabricLoader; - -public class ConventionLogWarningsClient implements ClientModInitializer { - public static final Logger LOGGER = LoggerFactory.getLogger(ConventionLogWarningsClient.class); - - @Override - public void onInitializeClient() { - if (LOG_UNTRANSLATED_WARNING_MODE != LOG_WARNING_MODES.SILENCED) setupUntranslatedItemTagWarning(); - } - - private static void setupUntranslatedItemTagWarning() { - // Log missing item tag translations only in development environment and not running dedicated server. - ServerLifecycleEvents.SERVER_STARTED.register(server -> { - boolean isConfigSetToDev = - LOG_UNTRANSLATED_WARNING_MODE == LOG_WARNING_MODES.DEV_SHORT - || LOG_UNTRANSLATED_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE; - - if (FabricLoader.getInstance().isDevelopmentEnvironment() == isConfigSetToDev) { - Registry itemRegistry = server.getRegistryManager().get(RegistryKeys.ITEM); - List> untranslatedItemTags = new ObjectArrayList<>(); - itemRegistry.streamTags().forEach(itemTagKey -> { - // We do not translate vanilla's tags at this moment. - if (itemTagKey.id().getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) { - return; - } - - String translationKey = itemTagKey.getTagTranslationKey(); - - if (!I18n.hasTranslation(translationKey)) { - untranslatedItemTags.add(itemTagKey); - } - }); - - if (!untranslatedItemTags.isEmpty()) { - StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append(""" - \n Dev warning - Untranslated Item Tags detected. Please translate your item tags so other mods such as recipe viewers can properly display your tag's name. - The format desired is tag.item.. for the translation key with slashes in path turned into periods. - You can disable this dev message in Fabric API's properties config file by setting log-untranslated-item-tag-warning to "SILENCED" or see individual tags with "DEV_VERBOSE". - """); - - // Print out all untranslated tags when desired. - boolean isConfigSetToVerbose = - LOG_UNTRANSLATED_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE - || LOG_UNTRANSLATED_WARNING_MODE == LOG_WARNING_MODES.PROD_VERBOSE; - - if (isConfigSetToVerbose) { - stringBuilder.append("\nUntranslated item tags:"); - - for (TagKey tagKey : untranslatedItemTags) { - stringBuilder.append("\n ").append(tagKey.id()); - } - } - - LOGGER.warn(stringBuilder.toString()); - } - } - }); - } -} diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java index 487c63485a..54efc3041d 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java @@ -22,7 +22,6 @@ import net.fabricmc.fabric.impl.tag.convention.datagen.generators.BlockEntityTypeTagGenerator; import net.fabricmc.fabric.impl.tag.convention.datagen.generators.BlockTagGenerator; import net.fabricmc.fabric.impl.tag.convention.datagen.generators.EnchantmentTagGenerator; -import net.fabricmc.fabric.impl.tag.convention.datagen.generators.EnglishTagLangGenerator; import net.fabricmc.fabric.impl.tag.convention.datagen.generators.EntityTypeTagGenerator; import net.fabricmc.fabric.impl.tag.convention.datagen.generators.FluidTagGenerator; import net.fabricmc.fabric.impl.tag.convention.datagen.generators.ItemTagGenerator; @@ -39,6 +38,5 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { pack.addProvider(BiomeTagGenerator::new); pack.addProvider(EntityTypeTagGenerator::new); pack.addProvider(BlockEntityTypeTagGenerator::new); - pack.addProvider(EnglishTagLangGenerator::new); } } 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 deleted file mode 100644 index 10a2c9bdcb..0000000000 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ /dev/null @@ -1,257 +0,0 @@ -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.fabricmc.fabric.impl.tag.convention.datagen.generators; - -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider; -import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags; -import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockEntityTypeTags; -import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags; -import net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags; -import net.fabricmc.fabric.api.tag.convention.v2.ConventionalEntityTypeTags; -import net.fabricmc.fabric.api.tag.convention.v2.ConventionalFluidTags; -import net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags; - -public class EnglishTagLangGenerator extends FabricLanguageProvider { - public EnglishTagLangGenerator(FabricDataOutput output) { - super(output); - } - - @Override - public void generateTranslations(FabricLanguageProvider.TranslationBuilder translationBuilder) { - // Blocks - translationBuilder.add(ConventionalBlockTags.ORES, "Ores"); - translationBuilder.add(ConventionalBlockTags.QUARTZ_ORES, "Quartz Ores"); - translationBuilder.add(ConventionalBlockTags.NETHERITE_SCRAP_ORES, "Netherite Scrap Ores"); - translationBuilder.add(ConventionalBlockTags.BARRELS, "Barrels"); - translationBuilder.add(ConventionalBlockTags.WOODEN_BARRELS, "Barrels Wooden"); - translationBuilder.add(ConventionalBlockTags.BOOKSHELVES, "Bookshelves"); - translationBuilder.add(ConventionalBlockTags.CHESTS, "Chests"); - translationBuilder.add(ConventionalBlockTags.GLASS_BLOCKS, "Glass Blocks"); - translationBuilder.add(ConventionalBlockTags.GLASS_PANES, "Glass Panes"); - translationBuilder.add(ConventionalBlockTags.SHULKER_BOXES, "Shulker Boxes"); - translationBuilder.add(ConventionalBlockTags.BUDDING_BLOCKS, "Budding Blocks"); - translationBuilder.add(ConventionalBlockTags.BUDS, "Buds"); - translationBuilder.add(ConventionalBlockTags.CLUSTERS, "Clusters"); - translationBuilder.add(ConventionalBlockTags.VILLAGER_JOB_SITES, "Villager Job Sites"); - translationBuilder.add(ConventionalBlockTags.BLOCKS_SANDSTONE, "Sandstone Blocks"); - translationBuilder.add(ConventionalBlockTags.SLABS_SANDSTONE, "Sandstone Slabs"); - translationBuilder.add(ConventionalBlockTags.STAIRS_SANDSTONE, "Sandstone Stairs"); - translationBuilder.add(ConventionalBlockTags.RED_BLOCKS_SANDSTONE, "Red Sandstone Blocks"); - translationBuilder.add(ConventionalBlockTags.RED_SLABS_SANDSTONE, "Red Sandstone Slabs"); - translationBuilder.add(ConventionalBlockTags.RED_STAIRS_SANDSTONE, "Red Sandstone Stairs"); - translationBuilder.add(ConventionalBlockTags.UNCOLORED_BLOCKS_SANDSTONE, "Uncolored Sandstone Blocks"); - translationBuilder.add(ConventionalBlockTags.UNCOLORED_SLABS_SANDSTONE, "Uncolored Sandstone Slabs"); - translationBuilder.add(ConventionalBlockTags.UNCOLORED_STAIRS_SANDSTONE, "Uncolored Sandstone Stairs"); - translationBuilder.add(ConventionalBlockTags.DYED, "Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.BLACK_DYED, "Black Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.BLUE_DYED, "Blue Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.BROWN_DYED, "Brown Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.CYAN_DYED, "Cyan Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.GRAY_DYED, "Gray Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.GREEN_DYED, "Green Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.LIGHT_BLUE_DYED, "Light Blue Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.LIGHT_GRAY_DYED, "Light Gray Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.LIME_DYED, "Lime Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.MAGENTA_DYED, "Magenta Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.ORANGE_DYED, "Orange Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.PINK_DYED, "Pink Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.PURPLE_DYED, "Purple Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.RED_DYED, "Red Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.WHITE_DYED, "White Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.YELLOW_DYED, "Yellow Dyed Blocks"); - translationBuilder.add(ConventionalBlockTags.RELOCATION_NOT_SUPPORTED, "Relocation Not Supported"); - - // Block Entity Types - translationBuilder.add(ConventionalBlockEntityTypeTags.RELOCATION_NOT_SUPPORTED, "Relocation Not Supported"); - - // Items - translationBuilder.add(ConventionalItemTags.TOOLS, "Tools"); - translationBuilder.add(ConventionalItemTags.SHEARS_TOOLS, "Shears"); - translationBuilder.add(ConventionalItemTags.SPEARS_TOOLS, "Spears"); - translationBuilder.add(ConventionalItemTags.BOWS_TOOLS, "Bows"); - translationBuilder.add(ConventionalItemTags.CROSSBOWS_TOOLS, "Crossbows"); - translationBuilder.add(ConventionalItemTags.SHIELDS_TOOLS, "Shields"); - translationBuilder.add(ConventionalItemTags.FISHING_RODS_TOOLS, "Fishing Rods"); - translationBuilder.add(ConventionalItemTags.DUSTS, "Dusts"); - translationBuilder.add(ConventionalItemTags.GEMS, "Gems"); - translationBuilder.add(ConventionalItemTags.INGOTS, "Ingots"); - translationBuilder.add(ConventionalItemTags.NUGGETS, "Nuggets"); - translationBuilder.add(ConventionalItemTags.ORES, "Ores"); - translationBuilder.add(ConventionalItemTags.RAW_MATERIALS, "Raw Materials"); - translationBuilder.add(ConventionalItemTags.RAW_BLOCKS, "Raw Blocks"); - translationBuilder.add(ConventionalItemTags.IRON_RAW_MATERIALS, "Raw Iron Materials"); - translationBuilder.add(ConventionalItemTags.GOLD_RAW_MATERIALS, "Raw Gold Materials"); - translationBuilder.add(ConventionalItemTags.COPPER_RAW_MATERIALS, "Raw Copper Materials"); - translationBuilder.add(ConventionalItemTags.IRON_RAW_BLOCKS, "Raw Iron Blocks"); - translationBuilder.add(ConventionalItemTags.GOLD_RAW_BLOCKS, "Raw Gold Blocks"); - translationBuilder.add(ConventionalItemTags.COPPER_RAW_BLOCKS, "Raw Copper Blocks"); - translationBuilder.add(ConventionalItemTags.IRON_INGOTS, "Ingots Iron"); - translationBuilder.add(ConventionalItemTags.GOLD_INGOTS, "Ingots Gold"); - translationBuilder.add(ConventionalItemTags.COPPER_INGOTS, "Ingots Copper"); - translationBuilder.add(ConventionalItemTags.NETHERITE_INGOTS, "Ingots Netherite"); - translationBuilder.add(ConventionalItemTags.NETHERITE_SCRAP_ORES, "Netherite Scrap Ores"); - translationBuilder.add(ConventionalItemTags.QUARTZ_ORES, "Quartz Ores"); - translationBuilder.add(ConventionalItemTags.QUARTZ_GEMS, "Quartz Gems"); - translationBuilder.add(ConventionalItemTags.LAPIS_GEMS, "Lapis Gems"); - translationBuilder.add(ConventionalItemTags.DIAMOND_GEMS, "Diamond Gems"); - translationBuilder.add(ConventionalItemTags.AMETHYST_GEMS, "Amethyst Gems"); - translationBuilder.add(ConventionalItemTags.EMERALD_GEMS, "Emerald Gems"); - translationBuilder.add(ConventionalItemTags.PRISMARINE_GEMS, "Prismarine Gems"); - translationBuilder.add(ConventionalItemTags.REDSTONE_DUSTS, "Redstone Dusts"); - translationBuilder.add(ConventionalItemTags.GLOWSTONE_DUSTS, "Glowstone Dusts"); - translationBuilder.add(ConventionalItemTags.COAL, "Coal"); - translationBuilder.add(ConventionalItemTags.FOODS, "Foods"); - translationBuilder.add(ConventionalItemTags.POTIONS, "Potions"); - translationBuilder.add(ConventionalItemTags.WATER_BUCKETS, "Water Buckets"); - translationBuilder.add(ConventionalItemTags.ENTITY_WATER_BUCKETS, "Entity Water Buckets"); - translationBuilder.add(ConventionalItemTags.LAVA_BUCKETS, "Lava Buckets"); - translationBuilder.add(ConventionalItemTags.MILK_BUCKETS, "Milk Buckets"); - translationBuilder.add(ConventionalItemTags.EMPTY_BUCKETS, "Empty Buckets"); - translationBuilder.add(ConventionalItemTags.BARRELS, "Barrels"); - translationBuilder.add(ConventionalItemTags.WOODEN_BARRELS, "Wooden Barrels"); - translationBuilder.add(ConventionalItemTags.BOOKSHELVES, "Bookshelves"); - translationBuilder.add(ConventionalItemTags.CHESTS, "Chests"); - translationBuilder.add(ConventionalItemTags.GLASS_BLOCKS, "Glass Blocks"); - translationBuilder.add(ConventionalItemTags.GLASS_PANES, "Glass Panes"); - translationBuilder.add(ConventionalItemTags.SHULKER_BOXES, "Shulker Boxes"); - translationBuilder.add(ConventionalItemTags.BUDDING_BLOCKS, "Budding Blocks"); - translationBuilder.add(ConventionalItemTags.BUDS, "Buds"); - translationBuilder.add(ConventionalItemTags.CLUSTERS, "Clusters"); - translationBuilder.add(ConventionalItemTags.VILLAGER_JOB_SITES, "Villager Job Sites"); - translationBuilder.add(ConventionalItemTags.BLOCKS_SANDSTONE, "Sandstone Blocks"); - translationBuilder.add(ConventionalItemTags.SLABS_SANDSTONE, "Sandstone Slabs"); - translationBuilder.add(ConventionalItemTags.STAIRS_SANDSTONE, "Sandstone Stairs"); - translationBuilder.add(ConventionalItemTags.RED_BLOCKS_SANDSTONE, "Red Sandstone Blocks"); - translationBuilder.add(ConventionalItemTags.RED_SLABS_SANDSTONE, "Red Sandstone Slabs"); - translationBuilder.add(ConventionalItemTags.RED_STAIRS_SANDSTONE, "Red Sandstone Stairs"); - translationBuilder.add(ConventionalItemTags.UNCOLORED_BLOCKS_SANDSTONE, "Uncolored Sandstone Blocks"); - translationBuilder.add(ConventionalItemTags.UNCOLORED_SLABS_SANDSTONE, "Uncolored Sandstone Slabs"); - translationBuilder.add(ConventionalItemTags.UNCOLORED_STAIRS_SANDSTONE, "Uncolored Sandstone Stairs"); - translationBuilder.add(ConventionalItemTags.DYES, "Dyes"); - translationBuilder.add(ConventionalItemTags.BLACK_DYES, "Black Dyes"); - translationBuilder.add(ConventionalItemTags.BLUE_DYES, "Blue Dyes"); - translationBuilder.add(ConventionalItemTags.BROWN_DYES, "Brown Dyes"); - translationBuilder.add(ConventionalItemTags.CYAN_DYES, "Cyan Dyes"); - translationBuilder.add(ConventionalItemTags.GRAY_DYES, "Gray Dyes"); - translationBuilder.add(ConventionalItemTags.GREEN_DYES, "Green Dyes"); - translationBuilder.add(ConventionalItemTags.LIGHT_BLUE_DYES, "Light Blue Dyes"); - translationBuilder.add(ConventionalItemTags.LIGHT_GRAY_DYES, "Light Gray Dyes"); - translationBuilder.add(ConventionalItemTags.LIME_DYES, "Lime Dyes"); - translationBuilder.add(ConventionalItemTags.MAGENTA_DYES, "Magenta Dyes"); - translationBuilder.add(ConventionalItemTags.ORANGE_DYES, "Orange Dyes"); - translationBuilder.add(ConventionalItemTags.PINK_DYES, "Pink Dyes"); - translationBuilder.add(ConventionalItemTags.PURPLE_DYES, "Purple Dyes"); - translationBuilder.add(ConventionalItemTags.RED_DYES, "Red Dyes"); - translationBuilder.add(ConventionalItemTags.WHITE_DYES, "White Dyes"); - translationBuilder.add(ConventionalItemTags.YELLOW_DYES, "Yellow Dyes"); - translationBuilder.add(ConventionalItemTags.DYED, "Dyed Items"); - translationBuilder.add(ConventionalItemTags.BLACK_DYED, "Black Dyed Items"); - translationBuilder.add(ConventionalItemTags.BLUE_DYED, "Blue Dyed Items"); - translationBuilder.add(ConventionalItemTags.BROWN_DYED, "Brown Dyed Items"); - translationBuilder.add(ConventionalItemTags.CYAN_DYED, "Cyan Dyed Items"); - translationBuilder.add(ConventionalItemTags.GRAY_DYED, "Gray Dyed Items"); - translationBuilder.add(ConventionalItemTags.GREEN_DYED, "Green Dyed Items"); - translationBuilder.add(ConventionalItemTags.LIGHT_BLUE_DYED, "Light Blue Dyed Items"); - translationBuilder.add(ConventionalItemTags.LIGHT_GRAY_DYED, "Light Gray Dyed Items"); - translationBuilder.add(ConventionalItemTags.LIME_DYED, "Lime Dyed Items"); - translationBuilder.add(ConventionalItemTags.MAGENTA_DYED, "Magenta Dyed Items"); - translationBuilder.add(ConventionalItemTags.ORANGE_DYED, "Orange Dyed Items"); - translationBuilder.add(ConventionalItemTags.PINK_DYED, "Pink Dyed Items"); - translationBuilder.add(ConventionalItemTags.PURPLE_DYED, "Purple Dyed Items"); - translationBuilder.add(ConventionalItemTags.RED_DYED, "Red Dyed Items"); - translationBuilder.add(ConventionalItemTags.WHITE_DYED, "White Dyed Items"); - translationBuilder.add(ConventionalItemTags.YELLOW_DYED, "Yellow Dyed Items"); - - // Enchantments - translationBuilder.add(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS, "Increases Block Drops"); - translationBuilder.add(ConventionalEnchantmentTags.INCREASES_ENTITY_DROPS, "Increases Entity Drops"); - translationBuilder.add(ConventionalEnchantmentTags.WEAPON_DAMAGE_ENHANCEMENT, "Weapon Damage Enhancements"); - translationBuilder.add(ConventionalEnchantmentTags.ENTITY_MOVEMENT_ENHANCEMENT, "Entity Movement Enhancements"); - translationBuilder.add(ConventionalEnchantmentTags.ENTITY_DEFENSE_ENHANCEMENT, "Entity Defense Enhancements"); - - // Entity Types - translationBuilder.add(ConventionalEntityTypeTags.BOSSES, "Bosses"); - translationBuilder.add(ConventionalEntityTypeTags.MINECARTS, "Minecarts"); - translationBuilder.add(ConventionalEntityTypeTags.BOATS, "Boats"); - translationBuilder.add(ConventionalEntityTypeTags.CAPTURING_NOT_SUPPORTED, "Capturing Not Supported"); - - // Fluids - translationBuilder.add(ConventionalFluidTags.LAVA, "Lava"); - translationBuilder.add(ConventionalFluidTags.WATER, "Water"); - translationBuilder.add(ConventionalFluidTags.MILK, "Milk"); - translationBuilder.add(ConventionalFluidTags.HONEY, "Honey"); - - // Biomes - translationBuilder.add(ConventionalBiomeTags.IS_OVERWORLD, "Overworld"); - translationBuilder.add(ConventionalBiomeTags.IS_THE_END, "The End"); - translationBuilder.add(ConventionalBiomeTags.IS_NETHER, "Nether"); - translationBuilder.add(ConventionalBiomeTags.IS_TAIGA, "Taiga"); - translationBuilder.add(ConventionalBiomeTags.IS_EXTREME_HILLS, "Extreme Hills"); - translationBuilder.add(ConventionalBiomeTags.IS_WINDSWEPT, "Windswept"); - translationBuilder.add(ConventionalBiomeTags.IS_JUNGLE, "Jungle"); - translationBuilder.add(ConventionalBiomeTags.IS_PLAINS, "Plains"); - translationBuilder.add(ConventionalBiomeTags.IS_SAVANNA, "Savanna"); - translationBuilder.add(ConventionalBiomeTags.IS_ICY, "Icy"); - translationBuilder.add(ConventionalBiomeTags.IS_AQUATIC_ICY, "Icy Aquatic"); - translationBuilder.add(ConventionalBiomeTags.IS_BEACH, "Beach"); - translationBuilder.add(ConventionalBiomeTags.IS_FOREST, "Forest"); - translationBuilder.add(ConventionalBiomeTags.IS_BIRCH_FOREST, "Birch Forest"); - translationBuilder.add(ConventionalBiomeTags.IS_OCEAN, "Ocean"); - translationBuilder.add(ConventionalBiomeTags.IS_DESERT, "Desert"); - translationBuilder.add(ConventionalBiomeTags.IS_RIVER, "River"); - translationBuilder.add(ConventionalBiomeTags.IS_SWAMP, "Swamp"); - translationBuilder.add(ConventionalBiomeTags.IS_MUSHROOM, "Mushroom"); - translationBuilder.add(ConventionalBiomeTags.IS_UNDERGROUND, "Underground"); - translationBuilder.add(ConventionalBiomeTags.IS_MOUNTAIN, "Mountain"); - translationBuilder.add(ConventionalBiomeTags.OVERWORLD_IS_HOT, "Hot Overworld"); - translationBuilder.add(ConventionalBiomeTags.IS_HOT, "Hot"); - translationBuilder.add(ConventionalBiomeTags.OVERWORLD_IS_TEMPERATE, "Temperate Overworld"); - translationBuilder.add(ConventionalBiomeTags.IS_TEMPERATE, "Temperate"); - translationBuilder.add(ConventionalBiomeTags.OVERWORLD_IS_COLD, "Cold Overworld"); - translationBuilder.add(ConventionalBiomeTags.IS_COLD, "Cold"); - translationBuilder.add(ConventionalBiomeTags.OVERWORLD_IS_WET, "Wet Overworld"); - translationBuilder.add(ConventionalBiomeTags.IS_WET, "Wet"); - translationBuilder.add(ConventionalBiomeTags.OVERWORLD_IS_DRY, "Dry Overworld"); - translationBuilder.add(ConventionalBiomeTags.IS_DRY, "Dry"); - translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_SPARSE, "Sparse Vegetation"); - translationBuilder.add(ConventionalBiomeTags.OVERWORLD_IS_VEGETATION_SPARSE, "Sparse Overworld Vegetation"); - translationBuilder.add(ConventionalBiomeTags.IS_VEGETATION_DENSE, "Dense Vegetation"); - translationBuilder.add(ConventionalBiomeTags.OVERWORLD_IS_VEGETATION_DENSE, "Dense Overworld Vegetation"); - translationBuilder.add(ConventionalBiomeTags.CONIFEROUS_IS_TREE, "Coniferous Tree"); - translationBuilder.add(ConventionalBiomeTags.SAVANNA_IS_TREE, "Savanna Tree"); - translationBuilder.add(ConventionalBiomeTags.JUNGLE_IS_TREE, "Jungle Tree"); - translationBuilder.add(ConventionalBiomeTags.DECIDUOUS_IS_TREE, "Deciduous Tree"); - translationBuilder.add(ConventionalBiomeTags.IS_VOID, "Void"); - translationBuilder.add(ConventionalBiomeTags.PEAK_IS_MOUNTAIN, "Mountain Peak"); - translationBuilder.add(ConventionalBiomeTags.SLOPE_IS_MOUNTAIN, "Mountain Slope"); - translationBuilder.add(ConventionalBiomeTags.IS_AQUATIC, "Aquatic"); - translationBuilder.add(ConventionalBiomeTags.IS_WASTELAND, "Wasteland"); - translationBuilder.add(ConventionalBiomeTags.IS_DEAD, "Dead"); - translationBuilder.add(ConventionalBiomeTags.IS_FLORAL, "Floral"); - translationBuilder.add(ConventionalBiomeTags.IS_SNOWY, "Snowy"); - translationBuilder.add(ConventionalBiomeTags.IS_BADLANDS, "Badlands"); - translationBuilder.add(ConventionalBiomeTags.IS_CAVE, "Cave"); - translationBuilder.add(ConventionalBiomeTags.IS_END_ISLAND, "End Island"); - translationBuilder.add(ConventionalBiomeTags.IS_NETHER_FOREST, "Nether Forest"); - translationBuilder.add(ConventionalBiomeTags.IS_SNOWY_PLAINS, "Snowy Plains"); - translationBuilder.add(ConventionalBiomeTags.IS_STONY_SHORES, "Stony Shores"); - translationBuilder.add(ConventionalBiomeTags.IS_FLOWER_FOREST, "Flower Forest"); - translationBuilder.add(ConventionalBiomeTags.IS_DEEP_OCEAN, "Deep Ocean"); - translationBuilder.add(ConventionalBiomeTags.IS_SHALLOW_OCEAN, "Shallow Ocean"); - } -} diff --git a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json deleted file mode 100644 index 97223767c0..0000000000 --- a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2-datagen/lang/en_us.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "tag.block.c.barrels": "Barrels", - "tag.block.c.barrels.wooden": "Barrels Wooden", - "tag.block.c.bookshelves": "Bookshelves", - "tag.block.c.budding_blocks": "Budding Blocks", - "tag.block.c.buds": "Buds", - "tag.block.c.chests": "Chests", - "tag.block.c.clusters": "Clusters", - "tag.block.c.dyed": "Dyed Blocks", - "tag.block.c.dyed.black": "Black Dyed Blocks", - "tag.block.c.dyed.blue": "Blue Dyed Blocks", - "tag.block.c.dyed.brown": "Brown Dyed Blocks", - "tag.block.c.dyed.cyan": "Cyan Dyed Blocks", - "tag.block.c.dyed.gray": "Gray Dyed Blocks", - "tag.block.c.dyed.green": "Green Dyed Blocks", - "tag.block.c.dyed.light_blue": "Light Blue Dyed Blocks", - "tag.block.c.dyed.light_gray": "Light Gray Dyed Blocks", - "tag.block.c.dyed.lime": "Lime Dyed Blocks", - "tag.block.c.dyed.magenta": "Magenta Dyed Blocks", - "tag.block.c.dyed.orange": "Orange Dyed Blocks", - "tag.block.c.dyed.pink": "Pink Dyed Blocks", - "tag.block.c.dyed.purple": "Purple Dyed Blocks", - "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.glass_blocks": "Glass Blocks", - "tag.block.c.glass_panes": "Glass Panes", - "tag.block.c.ores": "Ores", - "tag.block.c.ores.netherite_scrap": "Netherite Scrap Ores", - "tag.block.c.ores.quartz": "Quartz Ores", - "tag.block.c.relocation_not_supported": "Relocation Not Supported", - "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", - "tag.block.c.sandstone.red_stairs": "Red Sandstone Stairs", - "tag.block.c.sandstone.slabs": "Sandstone Slabs", - "tag.block.c.sandstone.stairs": "Sandstone Stairs", - "tag.block.c.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", - "tag.block.c.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", - "tag.block.c.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", - "tag.block.c.shulker_boxes": "Shulker Boxes", - "tag.block.c.villager_job_sites": "Villager Job Sites", - "tag.block_entity_type.c.relocation_not_supported": "Relocation Not Supported", - "tag.enchantment.c.entity_defense_enhancement": "Entity Defense Enhancements", - "tag.enchantment.c.entity_movement_enhancement": "Entity Movement Enhancements", - "tag.enchantment.c.fortune": "Increases Block Drops", - "tag.enchantment.c.looting": "Increases Entity Drops", - "tag.enchantment.c.weapon_damage_enhancement": "Weapon Damage Enhancements", - "tag.entity_type.c.boats": "Boats", - "tag.entity_type.c.bosses": "Bosses", - "tag.entity_type.c.capturing_not_supported": "Capturing Not Supported", - "tag.entity_type.c.minecarts": "Minecarts", - "tag.fluid.c.honey": "Honey", - "tag.fluid.c.lava": "Lava", - "tag.fluid.c.milk": "Milk", - "tag.fluid.c.water": "Water", - "tag.item.c.barrels": "Barrels", - "tag.item.c.barrels.wooden": "Wooden Barrels", - "tag.item.c.bookshelves": "Bookshelves", - "tag.item.c.buckets.empty": "Empty Buckets", - "tag.item.c.buckets.entity_water": "Entity Water Buckets", - "tag.item.c.buckets.lava": "Lava Buckets", - "tag.item.c.buckets.milk": "Milk Buckets", - "tag.item.c.buckets.water": "Water Buckets", - "tag.item.c.budding_blocks": "Budding Blocks", - "tag.item.c.buds": "Buds", - "tag.item.c.chests": "Chests", - "tag.item.c.clusters": "Clusters", - "tag.item.c.coal": "Coal", - "tag.item.c.dusts": "Dusts", - "tag.item.c.dusts.glowstone": "Glowstone Dusts", - "tag.item.c.dusts.redstone": "Redstone Dusts", - "tag.item.c.dyed": "Dyed Items", - "tag.item.c.dyed.black": "Black Dyed Items", - "tag.item.c.dyed.blue": "Blue Dyed Items", - "tag.item.c.dyed.brown": "Brown Dyed Items", - "tag.item.c.dyed.cyan": "Cyan Dyed Items", - "tag.item.c.dyed.gray": "Gray Dyed Items", - "tag.item.c.dyed.green": "Green Dyed Items", - "tag.item.c.dyed.light_blue": "Light Blue Dyed Items", - "tag.item.c.dyed.light_gray": "Light Gray Dyed Items", - "tag.item.c.dyed.lime": "Lime Dyed Items", - "tag.item.c.dyed.magenta": "Magenta Dyed Items", - "tag.item.c.dyed.orange": "Orange Dyed Items", - "tag.item.c.dyed.pink": "Pink Dyed Items", - "tag.item.c.dyed.purple": "Purple Dyed Items", - "tag.item.c.dyed.red": "Red Dyed Items", - "tag.item.c.dyed.white": "White Dyed Items", - "tag.item.c.dyed.yellow": "Yellow Dyed Items", - "tag.item.c.dyes": "Dyes", - "tag.item.c.dyes.black": "Black Dyes", - "tag.item.c.dyes.blue": "Blue Dyes", - "tag.item.c.dyes.brown": "Brown Dyes", - "tag.item.c.dyes.cyan": "Cyan Dyes", - "tag.item.c.dyes.gray": "Gray Dyes", - "tag.item.c.dyes.green": "Green Dyes", - "tag.item.c.dyes.light_blue": "Light Blue Dyes", - "tag.item.c.dyes.light_gray": "Light Gray Dyes", - "tag.item.c.dyes.lime": "Lime Dyes", - "tag.item.c.dyes.magenta": "Magenta Dyes", - "tag.item.c.dyes.orange": "Orange Dyes", - "tag.item.c.dyes.pink": "Pink Dyes", - "tag.item.c.dyes.purple": "Purple Dyes", - "tag.item.c.dyes.red": "Red Dyes", - "tag.item.c.dyes.white": "White Dyes", - "tag.item.c.dyes.yellow": "Yellow Dyes", - "tag.item.c.foods": "Foods", - "tag.item.c.gems": "Gems", - "tag.item.c.gems.amethyst": "Amethyst Gems", - "tag.item.c.gems.diamond": "Diamond Gems", - "tag.item.c.gems.emerald": "Emerald Gems", - "tag.item.c.gems.lapis": "Lapis Gems", - "tag.item.c.gems.prismarine": "Prismarine Gems", - "tag.item.c.gems.quartz": "Quartz Gems", - "tag.item.c.glass_blocks": "Glass Blocks", - "tag.item.c.glass_panes": "Glass Panes", - "tag.item.c.ingots": "Ingots", - "tag.item.c.ingots.copper": "Ingots Copper", - "tag.item.c.ingots.gold": "Ingots Gold", - "tag.item.c.ingots.iron": "Ingots Iron", - "tag.item.c.ingots.netherite": "Ingots Netherite", - "tag.item.c.nuggets": "Nuggets", - "tag.item.c.ores": "Ores", - "tag.item.c.ores.netherite_scrap": "Netherite Scrap Ores", - "tag.item.c.ores.quartz": "Quartz Ores", - "tag.item.c.potions": "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", - "tag.item.c.raw_blocks.iron": "Raw Iron Blocks", - "tag.item.c.raw_materials": "Raw Materials", - "tag.item.c.raw_materials.copper": "Raw Copper Materials", - "tag.item.c.raw_materials.gold": "Raw Gold Materials", - "tag.item.c.raw_materials.iron": "Raw Iron Materials", - "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", - "tag.item.c.sandstone.red_stairs": "Red Sandstone Stairs", - "tag.item.c.sandstone.slabs": "Sandstone Slabs", - "tag.item.c.sandstone.stairs": "Sandstone Stairs", - "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.shulker_boxes": "Shulker Boxes", - "tag.item.c.tools": "Tools", - "tag.item.c.tools.bows": "Bows", - "tag.item.c.tools.crossbows": "Crossbows", - "tag.item.c.tools.fishing_rods": "Fishing Rods", - "tag.item.c.tools.shears": "Shears", - "tag.item.c.tools.shields": "Shields", - "tag.item.c.tools.spears": "Spears", - "tag.item.c.villager_job_sites": "Villager Job Sites", - "tag.worldgen.biome.c.is_aquatic": "Aquatic", - "tag.worldgen.biome.c.is_aquatic_icy": "Icy Aquatic", - "tag.worldgen.biome.c.is_badlands": "Badlands", - "tag.worldgen.biome.c.is_beach": "Beach", - "tag.worldgen.biome.c.is_birch_forest": "Birch Forest", - "tag.worldgen.biome.c.is_cave": "Cave", - "tag.worldgen.biome.c.is_cold": "Cold", - "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.overworld": "Dense Overworld Vegetation", - "tag.worldgen.biome.c.is_desert": "Desert", - "tag.worldgen.biome.c.is_dry": "Dry", - "tag.worldgen.biome.c.is_dry.overworld": "Dry Overworld", - "tag.worldgen.biome.c.is_end_island": "End Island", - "tag.worldgen.biome.c.is_extreme_hills": "Extreme Hills", - "tag.worldgen.biome.c.is_floral": "Floral", - "tag.worldgen.biome.c.is_flower_forest": "Flower Forest", - "tag.worldgen.biome.c.is_forest": "Forest", - "tag.worldgen.biome.c.is_hot": "Hot", - "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_mountain": "Mountain", - "tag.worldgen.biome.c.is_mountain.peak": "Mountain Peak", - "tag.worldgen.biome.c.is_mountain.slope": "Mountain Slope", - "tag.worldgen.biome.c.is_mushroom": "Mushroom", - "tag.worldgen.biome.c.is_nether": "Nether", - "tag.worldgen.biome.c.is_nether_forest": "Nether Forest", - "tag.worldgen.biome.c.is_ocean": "Ocean", - "tag.worldgen.biome.c.is_overworld": "Overworld", - "tag.worldgen.biome.c.is_plains": "Plains", - "tag.worldgen.biome.c.is_river": "River", - "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.overworld": "Sparse Overworld Vegetation", - "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.overworld": "Temperate Overworld", - "tag.worldgen.biome.c.is_the_end": "The End", - "tag.worldgen.biome.c.is_tree.coniferous": "Coniferous Tree", - "tag.worldgen.biome.c.is_tree.deciduous": "Deciduous Tree", - "tag.worldgen.biome.c.is_tree.jungle": "Jungle Tree", - "tag.worldgen.biome.c.is_tree.savanna": "Savanna Tree", - "tag.worldgen.biome.c.is_underground": "Underground", - "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.overworld": "Wet Overworld", - "tag.worldgen.biome.c.is_windswept": "Windswept" -} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/FabricTagKeyExtension.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/FabricTagKeyExtension.java deleted file mode 100644 index 6db8aa3179..0000000000 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/FabricTagKeyExtension.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.fabricmc.fabric.api.tag.convention.v2; - -import net.minecraft.text.Text; -import net.minecraft.util.Identifier; -import net.minecraft.registry.tag.TagKey; - -/** - * General-purpose Fabric-provided extensions for {@link TagKey} subclasses. - * - *

These extensions were designed primarily for giving extra utility methods for TagKeys usages. - * Getting a TagKey's translation key for example. - * - *

Note: This interface is automatically implemented on all {@link TagKey} instances via Mixin and interface injection. - */ -public interface FabricTagKeyExtension { - /** - * Use this to get a TagKey's translation key safely on any side. - * - *

Format for vanilla registry TagKeys is: - * tag.(registry_path).(tag_namespace).(tag_path) - * - *

Format for modded registry TagKeys is: - * tag.(registry_namespace).(registry_path).(tag_namespace).(tag_path) - * - *

The registry's path and tag path's slashes will be converted to periods. - * - * @return the translation key for a TagKey. - */ - default String getTagTranslationKey() { - StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append("tag."); - - TagKey tagKey = ((TagKey) this); - Identifier registryIdentifier = tagKey.registry().getValue(); - Identifier tagIdentifier = tagKey.id(); - - if (!registryIdentifier.getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) { - stringBuilder.append(registryIdentifier.getNamespace()) - .append("."); - } - - stringBuilder.append(registryIdentifier.getPath().replace("/", ".")) - .append(".") - .append(tagIdentifier.getNamespace()) - .append(".") - .append(tagIdentifier.getPath().replace("/", ".").replace(":", ".")); - - return stringBuilder.toString(); - } - - /** - * Use this to get a TagKey's translatable text for display purposes. - * - *

The text uses the result of {@link TagKey#getTagTranslationKey} for the translation key - * and will fall back to displaying #tag_namespace:tag_path if no translation exists. - * - * @return the translatable text for a TagKey. - */ - default Text getTagTranslatableText() { - return Text.translatableWithFallback(getTagTranslationKey(), "#" + ((TagKey) this).id().toString()); - } -} diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java index 57ab8038da..4050636b7b 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java @@ -30,12 +30,6 @@ public class ConventionLogWarningConfigs { public static final Logger LOGGER = LoggerFactory.getLogger(ConventionLogWarningConfigs.class); - /** - * A config option mainly for developers. - * Logs out modded item tags that do not have translations when running on integrated server. - * Defaults to DEV_SHORT. - */ - public static final LOG_WARNING_MODES LOG_UNTRANSLATED_WARNING_MODE; /** * A config option mainly for developers. * Logs out modded tags that are using the 'c' namespace when running on integrated server or dedicated server. @@ -56,28 +50,27 @@ public enum LOG_WARNING_MODES { if (!configDir.exists()) { if (!configDir.mkdir()) { - LOGGER.warn("[Fabric Tag Conventions v1] Could not create configuration directory: " + configDir.getAbsolutePath()); + LOGGER.warn("[Fabric Tag Conventions v2] Could not create configuration directory: " + configDir.getAbsolutePath()); } } - File configFile = new File(configDir, "fabric-tag-conventions-v1.properties"); + File configFile = new File(configDir, "fabric-tag-conventions-v2.properties"); Properties properties = new Properties(); if (configFile.exists()) { try (FileInputStream stream = new FileInputStream(configFile)) { properties.load(stream); } catch (IOException e) { - LOGGER.warn("[Fabric Tag Conventions v1] Could not read property file '" + configFile.getAbsolutePath() + "'", e); + LOGGER.warn("[Fabric Tag Conventions v2] Could not read property file '" + configFile.getAbsolutePath() + "'", e); } } - LOG_UNTRANSLATED_WARNING_MODE = asEnum((String) properties.computeIfAbsent("log-untranslated-item-tag-warnings", (a) -> "SILENCED"), LOG_WARNING_MODES.SILENCED); LOG_LEGACY_WARNING_MODE = asEnum((String) properties.computeIfAbsent("log-legacy-tag-warnings", (a) -> "DEV_SHORT"), LOG_WARNING_MODES.DEV_SHORT); try (FileOutputStream stream = new FileOutputStream(configFile)) { - properties.store(stream, "Fabric Tag Conventions v1 properties file"); + properties.store(stream, "Fabric Tag Conventions v2 properties file"); } catch (IOException e) { - LOGGER.warn("[Fabric Tag Conventions v1] Could not store property file '" + configFile.getAbsolutePath() + "'", e); + LOGGER.warn("[Fabric Tag Conventions v2] Could not store property file '" + configFile.getAbsolutePath() + "'", e); } } diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/convention/TagKeyExtensionMixin.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/convention/TagKeyExtensionMixin.java deleted file mode 100644 index 738c55115d..0000000000 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/convention/TagKeyExtensionMixin.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.fabricmc.fabric.mixin.convention; - -import org.spongepowered.asm.mixin.Mixin; - -import net.minecraft.registry.tag.TagKey; - -import net.fabricmc.fabric.api.tag.convention.v2.FabricTagKeyExtension; - -@Mixin(TagKey.class) -public interface TagKeyExtensionMixin extends FabricTagKeyExtension { -} diff --git a/fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v1/icon.png b/fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v2/icon.png similarity index 100% rename from fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v1/icon.png rename to fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v2/icon.png diff --git a/fabric-convention-tags-v2/src/main/resources/fabric-convention-tags-api-v2.mixins.json b/fabric-convention-tags-v2/src/main/resources/fabric-convention-tags-api-v2.mixins.json deleted file mode 100644 index d203263ffc..0000000000 --- a/fabric-convention-tags-v2/src/main/resources/fabric-convention-tags-api-v2.mixins.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "required": true, - "package": "net.fabricmc.fabric.mixin.convention", - "compatibilityLevel": "JAVA_17", - "mixins": [ - "TagKeyExtensionMixin" - ], - "injectors": { - "defaultRequire": 1 - } -} diff --git a/fabric-convention-tags-v2/src/main/resources/fabric.mod.json b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json index bcaa0d563d..d42bb0a78f 100644 --- a/fabric-convention-tags-v2/src/main/resources/fabric.mod.json +++ b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json @@ -18,9 +18,6 @@ "entrypoints": { "main": [ "net.fabricmc.fabric.impl.tag.convention.ConventionLogWarnings" - ], - "client": [ - "net.fabricmc.fabric.impl.tag.convention.client.ConventionLogWarningsClient" ] }, "depends": { @@ -28,14 +25,7 @@ "minecraft": ">=1.18.2", "fabric-lifecycle-events-v1": "*" }, - "mixins": [ - "fabric-convention-tags-api-v2.mixins.json" - ], - "description": "Contains common tags used by mods for vanilla things.", - "custom": { - "fabric-api:module-lifecycle": "stable", - "loom:injected_interfaces": { - "net/minecraft/class_6862": ["net/fabricmc/fabric/api/tag/convention/v2/FabricTagKeyExtension"] - } - } + "mixins": [], + "description": "Contains common tags used by mods for better inter-mod compatibility.", + "custom": {} } diff --git a/fabric-convention-tags-v2/src/testmod/resources/fabric.mod.json b/fabric-convention-tags-v2/src/testmod/resources/fabric.mod.json index 34a4ff0988..65cc19fed5 100644 --- a/fabric-convention-tags-v2/src/testmod/resources/fabric.mod.json +++ b/fabric-convention-tags-v2/src/testmod/resources/fabric.mod.json @@ -10,7 +10,7 @@ }, "entrypoints": { "main": [ - "net.fabricmc.fabric.test.tag.convention.v1.TagUtilTest" + "net.fabricmc.fabric.test.tag.convention.v2.TagUtilTest" ] } } diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java index 4a06a88ae1..849922531f 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java @@ -41,7 +41,6 @@ import net.minecraft.item.ItemGroup; import net.minecraft.registry.Registries; import net.minecraft.registry.RegistryKey; -import net.minecraft.registry.tag.TagKey; import net.minecraft.stat.StatType; import net.minecraft.text.TextContent; import net.minecraft.text.TranslatableTextContent; @@ -223,16 +222,6 @@ default void add(Identifier identifier, String value) { add(identifier.toTranslationKey(), value); } - /** - * Adds a translation for an {@link TagKey}. - * - * @param tagKey The {@link TagKey} to get the translation key from. - * @param value The value of the entry. - */ - default void add(TagKey tagKey, String value) { - add(tagKey.getTagTranslationKey(), value); - } - /** * Merges an existing language file into the generated language file. * From ecee1621c2ea1f9b228d4a4428ef9ee40677d5e3 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 11:05:53 -0400 Subject: [PATCH 033/123] Fixed legacy tag detection and optional tag entries --- .../datagen/generators/BiomeTagGenerator.java | 33 --------- .../datagen/generators/BlockTagGenerator.java | 15 ---- .../generators/EnchantmentTagGenerator.java | 12 ---- .../generators/EntityTypeTagGenerator.java | 10 --- .../datagen/generators/FluidTagGenerator.java | 11 --- .../datagen/generators/ItemTagGenerator.java | 39 ++-------- .../resources/data/c/tags/blocks/barrels.json | 6 +- .../data/c/tags/blocks/bookshelves.json | 6 +- .../data/c/tags/blocks/budding_blocks.json | 6 +- .../resources/data/c/tags/blocks/buds.json | 6 +- .../resources/data/c/tags/blocks/chests.json | 6 +- .../data/c/tags/blocks/clusters.json | 6 +- .../data/c/tags/blocks/glass_blocks.json | 6 +- .../data/c/tags/blocks/glass_panes.json | 6 +- .../resources/data/c/tags/blocks/ores.json | 4 -- .../data/c/tags/blocks/shulker_boxes.json | 6 +- .../c/tags/blocks/villager_job_sites.json | 6 +- .../entity_defense_enhancement.json | 6 +- .../entity_movement_enhancement.json | 6 +- .../data/c/tags/enchantment/fortune.json | 6 +- .../data/c/tags/enchantment/looting.json | 6 +- .../weapon_damage_enhancement.json | 6 +- .../data/c/tags/entity_types/boats.json | 6 +- .../data/c/tags/entity_types/bosses.json | 6 +- .../data/c/tags/entity_types/minecarts.json | 6 +- .../resources/data/c/tags/fluids/honey.json | 7 +- .../resources/data/c/tags/fluids/lava.json | 4 -- .../resources/data/c/tags/fluids/milk.json | 7 +- .../resources/data/c/tags/fluids/water.json | 4 -- .../resources/data/c/tags/items/barrels.json | 6 +- .../data/c/tags/items/bookshelves.json | 6 +- .../data/c/tags/items/buckets/empty.json | 10 +-- .../c/tags/items/buckets/entity_water.json | 10 +-- .../data/c/tags/items/buckets/lava.json | 10 +-- .../data/c/tags/items/buckets/milk.json | 10 +-- .../data/c/tags/items/buckets/water.json | 10 +-- .../data/c/tags/items/budding_blocks.json | 6 +- .../resources/data/c/tags/items/buds.json | 6 +- .../resources/data/c/tags/items/chests.json | 6 +- .../resources/data/c/tags/items/clusters.json | 6 +- .../resources/data/c/tags/items/coal.json | 4 -- .../resources/data/c/tags/items/dusts.json | 6 +- .../data/c/tags/items/dusts/redstone.json | 10 +-- .../resources/data/c/tags/items/dyes.json | 4 -- .../resources/data/c/tags/items/foods.json | 6 +- .../resources/data/c/tags/items/gems.json | 6 +- .../data/c/tags/items/gems/diamond.json | 4 -- .../data/c/tags/items/gems/emerald.json | 4 -- .../data/c/tags/items/gems/lapis.json | 4 -- .../data/c/tags/items/glass_blocks.json | 6 +- .../data/c/tags/items/glass_panes.json | 6 +- .../resources/data/c/tags/items/ingots.json | 6 +- .../data/c/tags/items/ingots/copper.json | 10 +-- .../data/c/tags/items/ingots/gold.json | 10 +-- .../data/c/tags/items/ingots/iron.json | 10 +-- .../data/c/tags/items/ingots/netherite.json | 10 +-- .../resources/data/c/tags/items/nuggets.json | 6 +- .../resources/data/c/tags/items/ores.json | 4 -- .../data/c/tags/items/ores/quartz.json | 10 +-- .../resources/data/c/tags/items/potions.json | 6 +- .../data/c/tags/items/raw_blocks/copper.json | 10 +-- .../data/c/tags/items/raw_blocks/gold.json | 10 +-- .../data/c/tags/items/raw_blocks/iron.json | 10 +-- .../data/c/tags/items/raw_materials.json | 10 +-- .../data/c/tags/items/shulker_boxes.json | 6 +- .../data/c/tags/items/tools/bows.json | 4 -- .../data/c/tags/items/tools/shears.json | 4 -- .../data/c/tags/items/tools/shields.json | 4 -- .../data/c/tags/items/tools/spears.json | 4 -- .../data/c/tags/items/villager_job_sites.json | 6 +- .../c/tags/worldgen/biome/is_aquatic.json | 4 -- .../c/tags/worldgen/biome/is_aquatic_icy.json | 6 +- .../c/tags/worldgen/biome/is_badlands.json | 8 --- .../data/c/tags/worldgen/biome/is_beach.json | 6 +- .../tags/worldgen/biome/is_birch_forest.json | 6 +- .../data/c/tags/worldgen/biome/is_dead.json | 7 +- .../c/tags/worldgen/biome/is_deep_ocean.json | 6 +- .../data/c/tags/worldgen/biome/is_desert.json | 6 +- .../tags/worldgen/biome/is_extreme_hills.json | 6 +- .../data/c/tags/worldgen/biome/is_floral.json | 4 -- .../data/c/tags/worldgen/biome/is_forest.json | 4 -- .../data/c/tags/worldgen/biome/is_icy.json | 6 +- .../data/c/tags/worldgen/biome/is_jungle.json | 4 -- .../c/tags/worldgen/biome/is_mountain.json | 4 -- .../c/tags/worldgen/biome/is_mushroom.json | 6 +- .../data/c/tags/worldgen/biome/is_ocean.json | 4 -- .../data/c/tags/worldgen/biome/is_plains.json | 6 +- .../data/c/tags/worldgen/biome/is_river.json | 4 -- .../c/tags/worldgen/biome/is_savanna.json | 6 +- .../tags/worldgen/biome/is_shallow_ocean.json | 6 +- .../data/c/tags/worldgen/biome/is_snowy.json | 6 +- .../tags/worldgen/biome/is_snowy_plains.json | 6 +- .../tags/worldgen/biome/is_stony_shores.json | 6 +- .../data/c/tags/worldgen/biome/is_swamp.json | 6 +- .../data/c/tags/worldgen/biome/is_taiga.json | 4 -- .../c/tags/worldgen/biome/is_underground.json | 4 -- .../data/c/tags/worldgen/biome/is_void.json | 6 +- .../c/tags/worldgen/biome/is_wasteland.json | 7 +- .../c/tags/worldgen/biome/is_windswept.json | 6 +- .../tag/convention/ConventionLogWarnings.java | 71 ++++++++++++++++++- 100 files changed, 142 insertions(+), 629 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 aa479d03a1..30d25d4a87 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 @@ -288,30 +288,7 @@ private void generateBackwardsCompatTags() { getOrCreateTagBuilder(ConventionalBiomeTags.IS_NETHER).addOptionalTag(new Identifier("c", "in_nether")); getOrCreateTagBuilder(ConventionalBiomeTags.IS_THE_END).addOptionalTag(new Identifier("c", "in_the_end")); getOrCreateTagBuilder(ConventionalBiomeTags.IS_OVERWORLD).addOptionalTag(new Identifier("c", "in_the_overworld")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_TAIGA); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_EXTREME_HILLS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_WINDSWEPT); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_JUNGLE); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_PLAINS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_SAVANNA); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_ICY); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_AQUATIC_ICY); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_SNOWY); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_BEACH); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_FOREST); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_BIRCH_FOREST); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_OCEAN); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_DESERT); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_RIVER); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_SWAMP); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_MUSHROOM); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_UNDERGROUND); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_MOUNTAIN); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_BADLANDS).addOptionalTag(new Identifier("c", "is_mesa")); getOrCreateTagBuilder(ConventionalBiomeTags.IS_CAVE).addOptionalTag(new Identifier("c", "caves")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_VOID); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_DEEP_OCEAN); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_SHALLOW_OCEAN); getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_COLD).addOptionalTag(new Identifier("c", "climate_cold")); getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_TEMPERATE).addOptionalTag(new Identifier("c", "climate_temperate")); getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_HOT).addOptionalTag(new Identifier("c", "climate_hot")); @@ -323,20 +300,10 @@ private void generateBackwardsCompatTags() { getOrCreateTagBuilder(ConventionalBiomeTags.DECIDUOUS_IS_TREE).addOptionalTag(new Identifier("c", "tree_deciduous")); getOrCreateTagBuilder(ConventionalBiomeTags.JUNGLE_IS_TREE).addOptionalTag(new Identifier("c", "tree_jungle")); getOrCreateTagBuilder(ConventionalBiomeTags.SAVANNA_IS_TREE).addOptionalTag(new Identifier("c", "tree_savanna")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_FLORAL); getOrCreateTagBuilder(ConventionalBiomeTags.PEAK_IS_MOUNTAIN).addOptionalTag(new Identifier("c", "mountain_peak")); getOrCreateTagBuilder(ConventionalBiomeTags.SLOPE_IS_MOUNTAIN).addOptionalTag(new Identifier("c", "mountain_slope")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_AQUATIC); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_DEAD); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_WASTELAND); getOrCreateTagBuilder(ConventionalBiomeTags.IS_END_ISLAND).addOptionalTag(new Identifier("c", "end_islands")); getOrCreateTagBuilder(ConventionalBiomeTags.IS_NETHER_FOREST).addOptionalTag(new Identifier("c", "nether_forests")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_SNOWY_PLAINS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBiomeTags.IS_STONY_SHORES); getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLOWER_FOREST).addOptionalTag(new Identifier("c", "flower_forests")); } - - private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey tag) { - return getOrCreateTagBuilder(tag).addOptionalTag(new Identifier("c", tag.id().getPath())); - } } 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 40be167910..ea87b9d2b3 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 @@ -329,17 +329,6 @@ private void generateBackwardsCompatTags() { getOrCreateTagBuilder(ConventionalBlockTags.RELOCATION_NOT_SUPPORTED).addOptionalTag(new Identifier("c", "movement_restricted")); getOrCreateTagBuilder(ConventionalBlockTags.QUARTZ_ORES).addOptionalTag(new Identifier("c", "quartz_ores")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBlockTags.ORES); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBlockTags.BARRELS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBlockTags.CHESTS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBlockTags.BOOKSHELVES); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBlockTags.VILLAGER_JOB_SITES); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBlockTags.BUDDING_BLOCKS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBlockTags.BUDS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBlockTags.CLUSTERS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBlockTags.SHULKER_BOXES); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBlockTags.GLASS_BLOCKS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalBlockTags.GLASS_PANES); getOrCreateTagBuilder(ConventionalBlockTags.WOODEN_BARRELS).addOptionalTag(new Identifier("c", "wooden_barrels")); getOrCreateTagBuilder(ConventionalBlockTags.BLOCKS_SANDSTONE).addOptionalTag(new Identifier("c", "sandstone_blocks")); getOrCreateTagBuilder(ConventionalBlockTags.SLABS_SANDSTONE).addOptionalTag(new Identifier("c", "sandstone_slabs")); @@ -351,8 +340,4 @@ private void generateBackwardsCompatTags() { getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_SLABS_SANDSTONE).addOptionalTag(new Identifier("c", "uncolored_sandstone_slabs")); getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_STAIRS_SANDSTONE).addOptionalTag(new Identifier("c", "uncolored_sandstone_stairs")); } - - private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey tag) { - return getOrCreateTagBuilder(tag).addOptionalTag(new Identifier("c", tag.id().getPath())); - } } diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java index eb5502d89f..496dab7131 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java @@ -56,17 +56,5 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { .add(Enchantments.PROJECTILE_PROTECTION) .add(Enchantments.FIRE_PROTECTION) .add(Enchantments.RESPIRATION); - - // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. - // TODO: Remove backwards compat tag entries in 1.22 - getOrCreateTagBuilderWithOptionalLegacy(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalEnchantmentTags.INCREASES_ENTITY_DROPS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalEnchantmentTags.WEAPON_DAMAGE_ENHANCEMENT); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalEnchantmentTags.ENTITY_MOVEMENT_ENHANCEMENT); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalEnchantmentTags.ENTITY_DEFENSE_ENHANCEMENT); - } - - private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey tag) { - return getOrCreateTagBuilder(tag).addOptionalTag(new Identifier("c", tag.id().getPath())); } } diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java index 9415040031..2efa3db748 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java @@ -49,15 +49,5 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { .add(EntityType.BOAT) .add(EntityType.CHEST_BOAT); getOrCreateTagBuilder(ConventionalEntityTypeTags.CAPTURING_NOT_SUPPORTED); - - // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. - // TODO: Remove backwards compat tag entries in 1.22 - getOrCreateTagBuilderWithOptionalLegacy(ConventionalEntityTypeTags.BOSSES); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalEntityTypeTags.MINECARTS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalEntityTypeTags.BOATS); - } - - private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey> tag) { - return getOrCreateTagBuilder(tag).addOptionalTag(new Identifier("c", tag.id().getPath())); } } diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java index 6cc40cbe9e..aa8bf35bd0 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java @@ -41,16 +41,5 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { .addOptionalTag(FluidTags.LAVA); getOrCreateTagBuilder(ConventionalFluidTags.MILK); getOrCreateTagBuilder(ConventionalFluidTags.HONEY); - - // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. - // TODO: Remove backwards compat tag entries in 1.22 - getOrCreateTagBuilderWithOptionalLegacy(ConventionalFluidTags.WATER); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalFluidTags.LAVA); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalFluidTags.MILK); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalFluidTags.HONEY); - } - - private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey tag) { - return getOrCreateTagBuilder(tag).addOptionalTag(new Identifier("c", tag.id().getPath())); } } 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 2e4d0c3b43..908d1bed5a 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 @@ -397,47 +397,16 @@ private void generateBackwardsCompatTags() { getOrCreateTagBuilder(ConventionalItemTags.CYAN_DYES).addOptionalTag(new Identifier("c", "cyan_dyes")); getOrCreateTagBuilder(ConventionalItemTags.GRAY_DYES).addOptionalTag(new Identifier("c", "gray_dyes")); getOrCreateTagBuilder(ConventionalItemTags.PURPLE_DYES).addOptionalTag(new Identifier("c", "purple_dyes")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.DYES); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.FOODS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.POTIONS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.EMPTY_BUCKETS).addOptionalTag(new Identifier("c", "empty_buckets")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.LAVA_BUCKETS).addOptionalTag(new Identifier("c", "lava_buckets")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.ENTITY_WATER_BUCKETS).addOptionalTag(new Identifier("c", "entity_water_buckets")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.WATER_BUCKETS).addOptionalTag(new Identifier("c", "water_buckets")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.MILK_BUCKETS).addOptionalTag(new Identifier("c", "milk_buckets")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.DUSTS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.GEMS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.INGOTS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.NUGGETS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.RAW_MATERIALS).addOptionalTag(new Identifier("c", "raw_ores")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.IRON_INGOTS).addOptionalTag(new Identifier("c", "iron_ingots")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.COPPER_INGOTS).addOptionalTag(new Identifier("c", "copper_ingots")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.GOLD_INGOTS).addOptionalTag(new Identifier("c", "gold_ingots")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.NETHERITE_INGOTS).addOptionalTag(new Identifier("c", "netherite_ingots")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.REDSTONE_DUSTS).addOptionalTag(new Identifier("c", "dusts")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.QUARTZ_ORES).addOptionalTag(new Identifier("c", "quartz_ores")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.IRON_RAW_BLOCKS).addOptionalTag(new Identifier("c", "raw_iron_blocks")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.COPPER_RAW_BLOCKS).addOptionalTag(new Identifier("c", "raw_copper_blocks")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.GOLD_RAW_BLOCKS).addOptionalTag(new Identifier("c", "raw_gold_blocks")); getOrCreateTagBuilder(ConventionalItemTags.IRON_RAW_MATERIALS).addOptionalTag(new Identifier("c", "raw_iron_ores")); getOrCreateTagBuilder(ConventionalItemTags.COPPER_RAW_MATERIALS).addOptionalTag(new Identifier("c", "raw_copper_ores")); getOrCreateTagBuilder(ConventionalItemTags.GOLD_RAW_MATERIALS).addOptionalTag(new Identifier("c", "raw_gold_ores")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.COAL); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.EMERALD_GEMS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.LAPIS_GEMS); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.DIAMOND_GEMS); getOrCreateTagBuilder(ConventionalItemTags.DIAMOND_GEMS).addOptionalTag(new Identifier("c", "diamonds")); getOrCreateTagBuilder(ConventionalItemTags.LAPIS_GEMS).addOptionalTag(new Identifier("c", "lapis")); getOrCreateTagBuilder(ConventionalItemTags.EMERALD_GEMS).addOptionalTag(new Identifier("c", "emeralds")); getOrCreateTagBuilder(ConventionalItemTags.QUARTZ_GEMS).addOptionalTag(new Identifier("c", "quartz")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.SHEARS_TOOLS).addOptionalTag(new Identifier("c", "shears")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.SPEARS_TOOLS).addOptionalTag(new Identifier("c", "spears")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.BOWS_TOOLS).addOptionalTag(new Identifier("c", "bows")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.SHIELDS_TOOLS).addOptionalTag(new Identifier("c", "shields")); - getOrCreateTagBuilderWithOptionalLegacy(ConventionalItemTags.VILLAGER_JOB_SITES); - } - - private FabricTagBuilder getOrCreateTagBuilderWithOptionalLegacy(TagKey tag) { - return getOrCreateTagBuilder(tag).addOptionalTag(new Identifier("c", tag.id().getPath())); + getOrCreateTagBuilder(ConventionalItemTags.SHEARS_TOOLS).addOptionalTag(new Identifier("c", "shears")); + getOrCreateTagBuilder(ConventionalItemTags.SPEARS_TOOLS).addOptionalTag(new Identifier("c", "spears")); + getOrCreateTagBuilder(ConventionalItemTags.BOWS_TOOLS).addOptionalTag(new Identifier("c", "bows")); + getOrCreateTagBuilder(ConventionalItemTags.SHIELDS_TOOLS).addOptionalTag(new Identifier("c", "shields")); } } diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/barrels.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/barrels.json index 8d3a2bb09b..664f41b0c2 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/barrels.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/barrels.json @@ -1,10 +1,6 @@ { "replace": false, "values": [ - "#c:barrels/wooden", - { - "id": "#c:barrels", - "required": false - } + "#c:barrels/wooden" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/bookshelves.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/bookshelves.json index 05583106f0..6cdb0ddace 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/bookshelves.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/bookshelves.json @@ -1,10 +1,6 @@ { "replace": false, "values": [ - "minecraft:bookshelf", - { - "id": "#c:bookshelves", - "required": false - } + "minecraft:bookshelf" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/budding_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/budding_blocks.json index fb588b0e83..9313d69e58 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/budding_blocks.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/budding_blocks.json @@ -1,10 +1,6 @@ { "replace": false, "values": [ - "minecraft:budding_amethyst", - { - "id": "#c:budding_blocks", - "required": false - } + "minecraft:budding_amethyst" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/buds.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/buds.json index 8cbc022463..b20d30c88f 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/buds.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/buds.json @@ -3,10 +3,6 @@ "values": [ "minecraft:small_amethyst_bud", "minecraft:medium_amethyst_bud", - "minecraft:large_amethyst_bud", - { - "id": "#c:buds", - "required": false - } + "minecraft:large_amethyst_bud" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests.json index 2d7c0d4f46..7acec0eccc 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests.json @@ -3,10 +3,6 @@ "values": [ "minecraft:chest", "minecraft:ender_chest", - "minecraft:trapped_chest", - { - "id": "#c:chests", - "required": false - } + "minecraft:trapped_chest" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/clusters.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/clusters.json index 658e58564d..932252eca6 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/clusters.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/clusters.json @@ -1,10 +1,6 @@ { "replace": false, "values": [ - "minecraft:amethyst_cluster", - { - "id": "#c:clusters", - "required": false - } + "minecraft:amethyst_cluster" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/glass_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/glass_blocks.json index dfe7184b2a..7d701ab396 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/glass_blocks.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/glass_blocks.json @@ -18,10 +18,6 @@ "minecraft:red_stained_glass", "minecraft:tinted_glass", "minecraft:white_stained_glass", - "minecraft:yellow_stained_glass", - { - "id": "#c:glass_blocks", - "required": false - } + "minecraft:yellow_stained_glass" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/glass_panes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/glass_panes.json index f97c5c4c4c..ced01be246 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/glass_panes.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/glass_panes.json @@ -17,10 +17,6 @@ "minecraft:purple_stained_glass_pane", "minecraft:red_stained_glass_pane", "minecraft:white_stained_glass_pane", - "minecraft:yellow_stained_glass_pane", - { - "id": "#c:glass_panes", - "required": false - } + "minecraft:yellow_stained_glass_pane" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores.json index c52789559e..6ce71a0c77 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores.json @@ -40,10 +40,6 @@ { "id": "#c:ores/netherite_scrap", "required": false - }, - { - "id": "#c:ores", - "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/shulker_boxes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/shulker_boxes.json index b9d106097b..8a9b7c8ed2 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/shulker_boxes.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/shulker_boxes.json @@ -17,10 +17,6 @@ "minecraft:red_shulker_box", "minecraft:white_shulker_box", "minecraft:yellow_shulker_box", - "minecraft:black_shulker_box", - { - "id": "#c:shulker_boxes", - "required": false - } + "minecraft:black_shulker_box" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/villager_job_sites.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/villager_job_sites.json index 1263472824..88f3b11bba 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/villager_job_sites.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/villager_job_sites.json @@ -16,10 +16,6 @@ "minecraft:loom", "minecraft:smithing_table", "minecraft:smoker", - "minecraft:stonecutter", - { - "id": "#c:villager_job_sites", - "required": false - } + "minecraft:stonecutter" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_defense_enhancement.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_defense_enhancement.json index 4147b5de4a..b01fdddc4f 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_defense_enhancement.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_defense_enhancement.json @@ -6,10 +6,6 @@ "minecraft:blast_protection", "minecraft:projectile_protection", "minecraft:fire_protection", - "minecraft:respiration", - { - "id": "#c:entity_defense_enhancement", - "required": false - } + "minecraft:respiration" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_movement_enhancement.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_movement_enhancement.json index eb38ea8670..e398c6b107 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_movement_enhancement.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_movement_enhancement.json @@ -3,10 +3,6 @@ "values": [ "minecraft:swift_sneak", "minecraft:depth_strider", - "minecraft:soul_speed", - { - "id": "#c:entity_movement_enhancement", - "required": false - } + "minecraft:soul_speed" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/fortune.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/fortune.json index 048852563a..ce1c23ebc0 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/fortune.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/fortune.json @@ -1,10 +1,6 @@ { "replace": false, "values": [ - "minecraft:fortune", - { - "id": "#c:fortune", - "required": false - } + "minecraft:fortune" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/looting.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/looting.json index a23271914a..8ee65b0c35 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/looting.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/looting.json @@ -1,10 +1,6 @@ { "replace": false, "values": [ - "minecraft:looting", - { - "id": "#c:looting", - "required": false - } + "minecraft:looting" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/weapon_damage_enhancement.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/weapon_damage_enhancement.json index 17df4a9551..bdef43ba26 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/weapon_damage_enhancement.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/weapon_damage_enhancement.json @@ -5,10 +5,6 @@ "minecraft:impaling", "minecraft:smite", "minecraft:power", - "minecraft:sharpness", - { - "id": "#c:weapon_damage_enhancement", - "required": false - } + "minecraft:sharpness" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/boats.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/boats.json index 826bfb4c6a..3b361e1750 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/boats.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/boats.json @@ -2,10 +2,6 @@ "replace": false, "values": [ "minecraft:boat", - "minecraft:chest_boat", - { - "id": "#c:boats", - "required": false - } + "minecraft:chest_boat" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/bosses.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/bosses.json index d290f327d3..4b3521261b 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/bosses.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/bosses.json @@ -2,10 +2,6 @@ "replace": false, "values": [ "minecraft:ender_dragon", - "minecraft:wither", - { - "id": "#c:bosses", - "required": false - } + "minecraft:wither" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/minecarts.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/minecarts.json index affb8fe890..99af753397 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/minecarts.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/minecarts.json @@ -7,10 +7,6 @@ "minecraft:furnace_minecart", "minecraft:command_block_minecart", "minecraft:hopper_minecart", - "minecraft:spawner_minecart", - { - "id": "#c:minecarts", - "required": false - } + "minecraft:spawner_minecart" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/honey.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/honey.json index 7236638722..5e8aecc986 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/honey.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/honey.json @@ -1,9 +1,4 @@ { "replace": false, - "values": [ - { - "id": "#c:honey", - "required": false - } - ] + "values": [] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/lava.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/lava.json index 4ab41673d9..8d87ec53f4 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/lava.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/lava.json @@ -4,10 +4,6 @@ { "id": "#minecraft:lava", "required": false - }, - { - "id": "#c:lava", - "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/milk.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/milk.json index 9b0ea9b81f..5e8aecc986 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/milk.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/milk.json @@ -1,9 +1,4 @@ { "replace": false, - "values": [ - { - "id": "#c:milk", - "required": false - } - ] + "values": [] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/water.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/water.json index 7a05b9c495..16f57ce2d5 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/water.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/water.json @@ -4,10 +4,6 @@ { "id": "#minecraft:water", "required": false - }, - { - "id": "#c:water", - "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels.json index 8d3a2bb09b..664f41b0c2 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels.json @@ -1,10 +1,6 @@ { "replace": false, "values": [ - "#c:barrels/wooden", - { - "id": "#c:barrels", - "required": false - } + "#c:barrels/wooden" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bookshelves.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bookshelves.json index 05583106f0..6cdb0ddace 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bookshelves.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bookshelves.json @@ -1,10 +1,6 @@ { "replace": false, "values": [ - "minecraft:bookshelf", - { - "id": "#c:bookshelves", - "required": false - } + "minecraft:bookshelf" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/empty.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/empty.json index 3130bc20b2..bbbc81a920 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/empty.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/empty.json @@ -1,14 +1,6 @@ { "replace": false, "values": [ - "minecraft:bucket", - { - "id": "#c:buckets/empty", - "required": false - }, - { - "id": "#c:empty_buckets", - "required": false - } + "minecraft:bucket" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/entity_water.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/entity_water.json index b2af4671ec..db3afc465c 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/entity_water.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/entity_water.json @@ -6,14 +6,6 @@ "minecraft:pufferfish_bucket", "minecraft:tropical_fish_bucket", "minecraft:salmon_bucket", - "minecraft:tadpole_bucket", - { - "id": "#c:buckets/entity_water", - "required": false - }, - { - "id": "#c:entity_water_buckets", - "required": false - } + "minecraft:tadpole_bucket" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/lava.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/lava.json index aeeaedc829..cd86ce99cd 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/lava.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/lava.json @@ -1,14 +1,6 @@ { "replace": false, "values": [ - "minecraft:lava_bucket", - { - "id": "#c:buckets/lava", - "required": false - }, - { - "id": "#c:lava_buckets", - "required": false - } + "minecraft:lava_bucket" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/milk.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/milk.json index 174a40ae3f..a3133b34b1 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/milk.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/milk.json @@ -1,14 +1,6 @@ { "replace": false, "values": [ - "minecraft:milk_bucket", - { - "id": "#c:buckets/milk", - "required": false - }, - { - "id": "#c:milk_buckets", - "required": false - } + "minecraft:milk_bucket" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/water.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/water.json index f0cc32ad75..ab70c822fd 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/water.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/water.json @@ -1,14 +1,6 @@ { "replace": false, "values": [ - "minecraft:water_bucket", - { - "id": "#c:buckets/water", - "required": false - }, - { - "id": "#c:water_buckets", - "required": false - } + "minecraft:water_bucket" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/budding_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/budding_blocks.json index fb588b0e83..9313d69e58 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/budding_blocks.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/budding_blocks.json @@ -1,10 +1,6 @@ { "replace": false, "values": [ - "minecraft:budding_amethyst", - { - "id": "#c:budding_blocks", - "required": false - } + "minecraft:budding_amethyst" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buds.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buds.json index 8cbc022463..b20d30c88f 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buds.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buds.json @@ -3,10 +3,6 @@ "values": [ "minecraft:small_amethyst_bud", "minecraft:medium_amethyst_bud", - "minecraft:large_amethyst_bud", - { - "id": "#c:buds", - "required": false - } + "minecraft:large_amethyst_bud" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests.json index 2d7c0d4f46..7acec0eccc 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests.json @@ -3,10 +3,6 @@ "values": [ "minecraft:chest", "minecraft:ender_chest", - "minecraft:trapped_chest", - { - "id": "#c:chests", - "required": false - } + "minecraft:trapped_chest" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/clusters.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/clusters.json index 658e58564d..932252eca6 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/clusters.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/clusters.json @@ -1,10 +1,6 @@ { "replace": false, "values": [ - "minecraft:amethyst_cluster", - { - "id": "#c:clusters", - "required": false - } + "minecraft:amethyst_cluster" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/coal.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/coal.json index 925372a1c2..28404d4411 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/coal.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/coal.json @@ -4,10 +4,6 @@ { "id": "#minecraft:coals", "required": false - }, - { - "id": "#c:coal", - "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts.json index d28bffb051..147e5c7485 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts.json @@ -2,10 +2,6 @@ "replace": false, "values": [ "minecraft:glowstone_dust", - "minecraft:redstone", - { - "id": "#c:dusts", - "required": false - } + "minecraft:redstone" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/redstone.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/redstone.json index fbfa6769d2..2703f553aa 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/redstone.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/redstone.json @@ -1,14 +1,6 @@ { "replace": false, "values": [ - "minecraft:redstone", - { - "id": "#c:dusts/redstone", - "required": false - }, - { - "id": "#c:dusts", - "required": false - } + "minecraft:redstone" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes.json index 1284fbf28f..52ea3efae4 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes.json @@ -64,10 +64,6 @@ { "id": "#c:dyes/purple", "required": false - }, - { - "id": "#c:dyes", - "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json index 580748a49a..a9bb5716de 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json @@ -40,10 +40,6 @@ "minecraft:suspicious_stew", "minecraft:sweet_berries", "minecraft:glow_berries", - "minecraft:honey_bottle", - { - "id": "#c:foods", - "required": false - } + "minecraft:honey_bottle" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems.json index 45d3629800..9f186a1be2 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems.json @@ -4,10 +4,6 @@ "minecraft:diamond", "minecraft:emerald", "minecraft:amethyst_shard", - "minecraft:lapis_lazuli", - { - "id": "#c:gems", - "required": false - } + "minecraft:lapis_lazuli" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/diamond.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/diamond.json index db5b005277..36d5d91586 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/diamond.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/diamond.json @@ -2,10 +2,6 @@ "replace": false, "values": [ "minecraft:diamond", - { - "id": "#c:gems/diamond", - "required": false - }, { "id": "#c:diamonds", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/emerald.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/emerald.json index 5a8ac9d573..c506d650ba 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/emerald.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/emerald.json @@ -2,10 +2,6 @@ "replace": false, "values": [ "minecraft:emerald", - { - "id": "#c:gems/emerald", - "required": false - }, { "id": "#c:emeralds", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/lapis.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/lapis.json index dfd23623e8..8d6dfcd8fa 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/lapis.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/lapis.json @@ -2,10 +2,6 @@ "replace": false, "values": [ "minecraft:lapis_lazuli", - { - "id": "#c:gems/lapis", - "required": false - }, { "id": "#c:lapis", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/glass_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/glass_blocks.json index dfe7184b2a..7d701ab396 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/glass_blocks.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/glass_blocks.json @@ -18,10 +18,6 @@ "minecraft:red_stained_glass", "minecraft:tinted_glass", "minecraft:white_stained_glass", - "minecraft:yellow_stained_glass", - { - "id": "#c:glass_blocks", - "required": false - } + "minecraft:yellow_stained_glass" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/glass_panes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/glass_panes.json index f97c5c4c4c..ced01be246 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/glass_panes.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/glass_panes.json @@ -17,10 +17,6 @@ "minecraft:purple_stained_glass_pane", "minecraft:red_stained_glass_pane", "minecraft:white_stained_glass_pane", - "minecraft:yellow_stained_glass_pane", - { - "id": "#c:glass_panes", - "required": false - } + "minecraft:yellow_stained_glass_pane" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots.json index 18b838043e..ca802dc016 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots.json @@ -4,10 +4,6 @@ "minecraft:copper_ingot", "minecraft:gold_ingot", "minecraft:iron_ingot", - "minecraft:netherite_ingot", - { - "id": "#c:ingots", - "required": false - } + "minecraft:netherite_ingot" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/copper.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/copper.json index a6da07f64b..4b0daa0db9 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/copper.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/copper.json @@ -1,14 +1,6 @@ { "replace": false, "values": [ - "minecraft:copper_ingot", - { - "id": "#c:ingots/copper", - "required": false - }, - { - "id": "#c:copper_ingots", - "required": false - } + "minecraft:copper_ingot" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/gold.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/gold.json index 4ad2f15b04..d88f9571ab 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/gold.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/gold.json @@ -1,14 +1,6 @@ { "replace": false, "values": [ - "minecraft:gold_ingot", - { - "id": "#c:ingots/gold", - "required": false - }, - { - "id": "#c:gold_ingots", - "required": false - } + "minecraft:gold_ingot" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/iron.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/iron.json index c9280f7208..549adc4716 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/iron.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/iron.json @@ -1,14 +1,6 @@ { "replace": false, "values": [ - "minecraft:iron_ingot", - { - "id": "#c:ingots/iron", - "required": false - }, - { - "id": "#c:iron_ingots", - "required": false - } + "minecraft:iron_ingot" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/netherite.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/netherite.json index 11160a6e46..ff3f383d69 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/netherite.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/netherite.json @@ -1,14 +1,6 @@ { "replace": false, "values": [ - "minecraft:netherite_ingot", - { - "id": "#c:ingots/netherite", - "required": false - }, - { - "id": "#c:netherite_ingots", - "required": false - } + "minecraft:netherite_ingot" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/nuggets.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/nuggets.json index c4b20af346..b755b03552 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/nuggets.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/nuggets.json @@ -2,10 +2,6 @@ "replace": false, "values": [ "minecraft:gold_nugget", - "minecraft:iron_nugget", - { - "id": "#c:nuggets", - "required": false - } + "minecraft:iron_nugget" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores.json index 56510a67ff..9c5313c8bd 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores.json @@ -41,10 +41,6 @@ "id": "#c:ores/netherite_scrap", "required": false }, - { - "id": "#c:ores", - "required": false - }, { "id": "#c:ores/quartz", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores/quartz.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores/quartz.json index 7beeaa2dd2..6c65cff932 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores/quartz.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores/quartz.json @@ -1,14 +1,6 @@ { "replace": false, "values": [ - "minecraft:nether_quartz_ore", - { - "id": "#c:ores/quartz", - "required": false - }, - { - "id": "#c:quartz_ores", - "required": false - } + "minecraft:nether_quartz_ore" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/potions.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/potions.json index 8a00f2f73c..3faa4304da 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/potions.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/potions.json @@ -3,10 +3,6 @@ "values": [ "minecraft:lingering_potion", "minecraft:splash_potion", - "minecraft:potion", - { - "id": "#c:potions", - "required": false - } + "minecraft:potion" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/copper.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/copper.json index 009e618e9f..3a578a0277 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/copper.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/copper.json @@ -1,14 +1,6 @@ { "replace": false, "values": [ - "minecraft:raw_copper_block", - { - "id": "#c:raw_blocks/copper", - "required": false - }, - { - "id": "#c:raw_copper_blocks", - "required": false - } + "minecraft:raw_copper_block" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/gold.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/gold.json index d291947d09..4ce9cc47d1 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/gold.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/gold.json @@ -1,14 +1,6 @@ { "replace": false, "values": [ - "minecraft:raw_gold_block", - { - "id": "#c:raw_blocks/gold", - "required": false - }, - { - "id": "#c:raw_gold_blocks", - "required": false - } + "minecraft:raw_gold_block" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/iron.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/iron.json index 1cedf070b3..14f551c592 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/iron.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/iron.json @@ -1,14 +1,6 @@ { "replace": false, "values": [ - "minecraft:raw_iron_block", - { - "id": "#c:raw_blocks/iron", - "required": false - }, - { - "id": "#c:raw_iron_blocks", - "required": false - } + "minecraft:raw_iron_block" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials.json index 6c72ea4ef2..a91d7793b8 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials.json @@ -15,14 +15,6 @@ }, "minecraft:raw_iron", "minecraft:raw_copper", - "minecraft:raw_gold", - { - "id": "#c:raw_materials", - "required": false - }, - { - "id": "#c:raw_ores", - "required": false - } + "minecraft:raw_gold" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/shulker_boxes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/shulker_boxes.json index b9d106097b..8a9b7c8ed2 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/shulker_boxes.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/shulker_boxes.json @@ -17,10 +17,6 @@ "minecraft:red_shulker_box", "minecraft:white_shulker_box", "minecraft:yellow_shulker_box", - "minecraft:black_shulker_box", - { - "id": "#c:shulker_boxes", - "required": false - } + "minecraft:black_shulker_box" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/bows.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/bows.json index f9092276b8..2ef34a8b9e 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/bows.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/bows.json @@ -2,10 +2,6 @@ "replace": false, "values": [ "minecraft:bow", - { - "id": "#c:tools/bows", - "required": false - }, { "id": "#c:bows", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shears.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shears.json index 54d48e9c40..884d5d1544 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shears.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shears.json @@ -2,10 +2,6 @@ "replace": false, "values": [ "minecraft:shears", - { - "id": "#c:tools/shears", - "required": false - }, { "id": "#c:shears", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shields.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shields.json index 88b306282d..9c665cef1f 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shields.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shields.json @@ -2,10 +2,6 @@ "replace": false, "values": [ "minecraft:shield", - { - "id": "#c:tools/shields", - "required": false - }, { "id": "#c:shields", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/spears.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/spears.json index 893481b29d..2198e694c9 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/spears.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/spears.json @@ -2,10 +2,6 @@ "replace": false, "values": [ "minecraft:trident", - { - "id": "#c:tools/spears", - "required": false - }, { "id": "#c:spears", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/villager_job_sites.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/villager_job_sites.json index bdd2ed34b7..6cec2e3a75 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/villager_job_sites.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/villager_job_sites.json @@ -13,10 +13,6 @@ "minecraft:loom", "minecraft:smithing_table", "minecraft:smoker", - "minecraft:stonecutter", - { - "id": "#c:villager_job_sites", - "required": false - } + "minecraft:stonecutter" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_aquatic.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_aquatic.json index a5dba0d3e6..22dbb7bf26 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_aquatic.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_aquatic.json @@ -8,10 +8,6 @@ { "id": "#c:is_river", "required": false - }, - { - "id": "#c:is_aquatic", - "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_aquatic_icy.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_aquatic_icy.json index cf8371ee9d..3909a6b73d 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_aquatic_icy.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_aquatic_icy.json @@ -3,10 +3,6 @@ "values": [ "minecraft:frozen_river", "minecraft:deep_frozen_ocean", - "minecraft:frozen_ocean", - { - "id": "#c:is_aquatic_icy", - "required": false - } + "minecraft:frozen_ocean" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_badlands.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_badlands.json index 52b663d371..a7e3d2ca12 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_badlands.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_badlands.json @@ -4,14 +4,6 @@ { "id": "#minecraft:is_badlands", "required": false - }, - { - "id": "#c:is_badlands", - "required": false - }, - { - "id": "#c:is_mesa", - "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_beach.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_beach.json index 2d728a2d8f..93913ce229 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_beach.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_beach.json @@ -5,10 +5,6 @@ "id": "#minecraft:is_beach", "required": false }, - "minecraft:stony_shore", - { - "id": "#c:is_beach", - "required": false - } + "minecraft:stony_shore" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_birch_forest.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_birch_forest.json index 004d0edbb5..0389e9f8e1 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_birch_forest.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_birch_forest.json @@ -2,10 +2,6 @@ "replace": false, "values": [ "minecraft:birch_forest", - "minecraft:old_growth_birch_forest", - { - "id": "#c:is_birch_forest", - "required": false - } + "minecraft:old_growth_birch_forest" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dead.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dead.json index db78d61bd8..5e8aecc986 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dead.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dead.json @@ -1,9 +1,4 @@ { "replace": false, - "values": [ - { - "id": "#c:is_dead", - "required": false - } - ] + "values": [] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_deep_ocean.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_deep_ocean.json index da092a84bc..7fb9f956d6 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_deep_ocean.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_deep_ocean.json @@ -4,10 +4,6 @@ "minecraft:deep_frozen_ocean", "minecraft:deep_lukewarm_ocean", "minecraft:deep_cold_ocean", - "minecraft:deep_ocean", - { - "id": "#c:is_deep_ocean", - "required": false - } + "minecraft:deep_ocean" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_desert.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_desert.json index daf47906c8..ff757c0365 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_desert.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_desert.json @@ -1,10 +1,6 @@ { "replace": false, "values": [ - "minecraft:desert", - { - "id": "#c:is_desert", - "required": false - } + "minecraft:desert" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_extreme_hills.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_extreme_hills.json index d4f7479323..834dcb1ccc 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_extreme_hills.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_extreme_hills.json @@ -2,10 +2,6 @@ "replace": false, "values": [ "minecraft:windswept_gravelly_hills", - "minecraft:windswept_hills", - { - "id": "#c:is_extreme_hills", - "required": false - } + "minecraft:windswept_hills" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_floral.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_floral.json index cdc4061d1b..26dc0b57d2 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_floral.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_floral.json @@ -7,10 +7,6 @@ { "id": "#c:is_flower_forest", "required": false - }, - { - "id": "#c:is_floral", - "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_forest.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_forest.json index ee8f06761c..21192434b4 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_forest.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_forest.json @@ -4,10 +4,6 @@ { "id": "#minecraft:is_forest", "required": false - }, - { - "id": "#c:is_forest", - "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_icy.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_icy.json index ce3febcd3b..eef6ef3e42 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_icy.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_icy.json @@ -2,10 +2,6 @@ "replace": false, "values": [ "minecraft:frozen_peaks", - "minecraft:ice_spikes", - { - "id": "#c:is_icy", - "required": false - } + "minecraft:ice_spikes" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_jungle.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_jungle.json index d2fc0a56af..a01171ae7d 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_jungle.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_jungle.json @@ -4,10 +4,6 @@ { "id": "#minecraft:is_jungle", "required": false - }, - { - "id": "#c:is_jungle", - "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain.json index a2ea40fc1c..0645b033cf 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain.json @@ -4,10 +4,6 @@ { "id": "#minecraft:is_mountain", "required": false - }, - { - "id": "#c:is_mountain", - "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mushroom.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mushroom.json index 2d54019c09..f97ef26445 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mushroom.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mushroom.json @@ -1,10 +1,6 @@ { "replace": false, "values": [ - "minecraft:mushroom_fields", - { - "id": "#c:is_mushroom", - "required": false - } + "minecraft:mushroom_fields" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_ocean.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_ocean.json index 253f8bcf47..94389fdf12 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_ocean.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_ocean.json @@ -12,10 +12,6 @@ { "id": "#minecraft:is_ocean", "required": false - }, - { - "id": "#c:is_ocean", - "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_plains.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_plains.json index 35cec01518..ce7fb70b56 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_plains.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_plains.json @@ -2,10 +2,6 @@ "replace": false, "values": [ "minecraft:sunflower_plains", - "minecraft:plains", - { - "id": "#c:is_plains", - "required": false - } + "minecraft:plains" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_river.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_river.json index 93a54c9b1e..c84bf06c4b 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_river.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_river.json @@ -4,10 +4,6 @@ { "id": "#minecraft:is_river", "required": false - }, - { - "id": "#c:is_river", - "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_savanna.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_savanna.json index fb814ceafd..4e6172601b 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_savanna.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_savanna.json @@ -7,10 +7,6 @@ }, "minecraft:savanna_plateau", "minecraft:windswept_savanna", - "minecraft:savanna", - { - "id": "#c:is_savanna", - "required": false - } + "minecraft:savanna" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_shallow_ocean.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_shallow_ocean.json index 99e26c0e57..03e9c44ee4 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_shallow_ocean.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_shallow_ocean.json @@ -5,10 +5,6 @@ "minecraft:lukewarm_ocean", "minecraft:frozen_ocean", "minecraft:cold_ocean", - "minecraft:warm_ocean", - { - "id": "#c:is_shallow_ocean", - "required": false - } + "minecraft:warm_ocean" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy.json index a82e88a58e..1df88f66c4 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy.json @@ -4,10 +4,6 @@ "minecraft:snowy_beach", "minecraft:snowy_plains", "minecraft:snowy_slopes", - "minecraft:snowy_taiga", - { - "id": "#c:is_snowy", - "required": false - } + "minecraft:snowy_taiga" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy_plains.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy_plains.json index 0e8f18976c..54db173ca7 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy_plains.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy_plains.json @@ -1,10 +1,6 @@ { "replace": false, "values": [ - "minecraft:snowy_plains", - { - "id": "#c:is_snowy_plains", - "required": false - } + "minecraft:snowy_plains" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_stony_shores.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_stony_shores.json index 397b49607f..f8b581ef71 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_stony_shores.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_stony_shores.json @@ -1,10 +1,6 @@ { "replace": false, "values": [ - "minecraft:stony_shore", - { - "id": "#c:is_stony_shores", - "required": false - } + "minecraft:stony_shore" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_swamp.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_swamp.json index 0376dd6db3..5cc3342407 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_swamp.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_swamp.json @@ -2,10 +2,6 @@ "replace": false, "values": [ "minecraft:mangrove_swamp", - "minecraft:swamp", - { - "id": "#c:is_swamp", - "required": false - } + "minecraft:swamp" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_taiga.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_taiga.json index 8d2cdc6c62..69cce78a6a 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_taiga.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_taiga.json @@ -4,10 +4,6 @@ { "id": "#minecraft:is_taiga", "required": false - }, - { - "id": "#c:is_taiga", - "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_underground.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_underground.json index 25defeebaa..1ad7e25031 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_underground.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_underground.json @@ -4,10 +4,6 @@ { "id": "#c:is_cave", "required": false - }, - { - "id": "#c:is_underground", - "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_void.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_void.json index c9584420c2..76ee211256 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_void.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_void.json @@ -1,10 +1,6 @@ { "replace": false, "values": [ - "minecraft:the_void", - { - "id": "#c:is_void", - "required": false - } + "minecraft:the_void" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wasteland.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wasteland.json index 246bfc0c07..5e8aecc986 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wasteland.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wasteland.json @@ -1,9 +1,4 @@ { "replace": false, - "values": [ - { - "id": "#c:is_wasteland", - "required": false - } - ] + "values": [] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_windswept.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_windswept.json index 7b574e5e6f..8df5621ae5 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_windswept.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_windswept.json @@ -4,10 +4,6 @@ "minecraft:windswept_hills", "minecraft:windswept_gravelly_hills", "minecraft:windswept_forest", - "minecraft:windswept_savanna", - { - "id": "#c:is_windswept", - "required": false - } + "minecraft:windswept_savanna" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 386c976f76..ab831716d7 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -20,6 +20,7 @@ import static net.fabricmc.fabric.impl.tag.convention.ConventionLogWarningConfigs.LOG_WARNING_MODES; import java.util.List; +import java.util.Set; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import org.slf4j.Logger; @@ -33,8 +34,72 @@ import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.fabricmc.loader.api.FabricLoader; +// To be removed in 1.22 Minecraft public class ConventionLogWarnings implements ModInitializer { public static final Logger LOGGER = LoggerFactory.getLogger(ConventionLogWarnings.class); + private static final Set LEGACY_C_TAGS = Set.of( + "movement_restricted", + "quartz_ores", + "wooden_barrels", + "sandstone_blocks", + "sandstone_slabs", + "sandstone_stairs", + "red_sandstone_blocks", + "red_sandstone_slabs", + "red_sandstone_stairs", + "uncolored_sandstone_blocks", + "uncolored_sandstone_slabs", + "uncolored_sandstone_stairs", + + "black_dyes", + "blue_dyes", + "brown_dyes", + "green_dyes", + "red_dyes", + "white_dyes", + "yellow_dyes", + "light_blue_dyes", + "light_gray_dyes", + "lime_dyes", + "magenta_dyes", + "orange_dyes", + "pink_dyes", + "cyan_dyes", + "gray_dyes", + "purple_dyes", + "raw_iron_ores", + "raw_copper_ores", + "raw_gold_ores", + "diamonds", + "lapis", + "emeralds", + "quartz", + "shears", + "spears", + "bows", + "shields", + + "in_nether", + "in_the_end", + "in_the_overworld", + "caves", + "climate_cold", + "climate_temperate", + "climate_hot", + "climate_wet", + "climate_dry", + "vegetation_dense", + "vegetation_sparse", + "tree_coniferous", + "tree_deciduous", + "tree_jungle", + "tree_savanna", + "mountain_peak", + "mountain_slope", + "end_islands", + "nether_forests", + "flower_forests" + ); @Override public void onInitialize() { @@ -43,7 +108,7 @@ public void onInitialize() { // Remove in 1.22 private static void setupLegacyTagWarning() { - // Log tags that are still using legacy 'c' namespace + // Log tags that are still using legacy conventions under 'c' namespace ServerLifecycleEvents.SERVER_STARTED.register(server -> { boolean isConfigSetToDev = LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_SHORT @@ -57,8 +122,8 @@ private static void setupLegacyTagWarning() { dynamicRegistries.streamAllRegistries().forEach(registryEntry -> { if (registryEntry.key().getValue().getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) { registryEntry.value().streamTags().forEach(tagKey -> { - // Grab tags under 'c' namespace - if (tagKey.id().getNamespace().equals("c")) { + // Grab legacy tags under 'c' namespace + if (tagKey.id().getNamespace().equals("c") && LEGACY_C_TAGS.contains(tagKey.id().getPath())) { legacyTags.add(tagKey); } }); From 46cabdd346544d39d3359993d70f5d8f66833abc Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 11:09:24 -0400 Subject: [PATCH 034/123] Added missing deprecated javadoc --- .../net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java index c4bbb8ed23..126a9ff5fe 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java @@ -27,6 +27,9 @@ import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; +/** + * @deprecated Please use {@link net.fabricmc.fabric.api.tag.convention.v2.TagUtil} + */ @Deprecated public final class TagUtil { private TagUtil() { From c7800d1e0f7bed594e347c7b6bc38e5ff8af3f14 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 11:17:19 -0400 Subject: [PATCH 035/123] Fixed deprecation on old api --- .../fabric-convention-tags-v1/build.gradle | 2 +- .../fabric/api/tag/convention/v1/TagUtil.java | 35 +++---------------- 2 files changed, 5 insertions(+), 32 deletions(-) diff --git a/deprecated/fabric-convention-tags-v1/build.gradle b/deprecated/fabric-convention-tags-v1/build.gradle index a95a5a5ef9..a9ae155fd7 100644 --- a/deprecated/fabric-convention-tags-v1/build.gradle +++ b/deprecated/fabric-convention-tags-v1/build.gradle @@ -1,3 +1,3 @@ version = getSubprojectVersion(project) -moduleDependencies(project, ['fabric-api-base']) \ No newline at end of file +moduleDependencies(project, ['fabric-api-base', 'fabric-convention-tags-v2']) \ No newline at end of file diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java index 126a9ff5fe..3283376598 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java @@ -16,16 +16,10 @@ package net.fabricmc.fabric.api.tag.convention.v1; -import java.util.Objects; -import java.util.Optional; - import org.jetbrains.annotations.Nullable; -import net.minecraft.registry.Registries; import net.minecraft.registry.tag.TagKey; import net.minecraft.registry.DynamicRegistryManager; -import net.minecraft.registry.Registry; -import net.minecraft.registry.RegistryKey; /** * @deprecated Please use {@link net.fabricmc.fabric.api.tag.convention.v2.TagUtil} @@ -38,38 +32,17 @@ private TagUtil() { /** * @deprecated Please use {@link net.fabricmc.fabric.api.tag.convention.v2.TagUtil#isIn} */ + @Deprecated public static boolean isIn(TagKey tagKey, T entry) { - return isIn(null, tagKey, entry); + return net.fabricmc.fabric.api.tag.convention.v2.TagUtil.isIn(null, tagKey, entry); } /** * @deprecated Please use {@link net.fabricmc.fabric.api.tag.convention.v2.TagUtil#isIn} */ + @Deprecated @SuppressWarnings("unchecked") public static boolean isIn(@Nullable DynamicRegistryManager registryManager, TagKey tagKey, T entry) { - Optional> maybeRegistry; - Objects.requireNonNull(tagKey); - Objects.requireNonNull(entry); - - if (registryManager != null) { - maybeRegistry = registryManager.getOptional(tagKey.registry()); - } else { - maybeRegistry = Registries.REGISTRIES.getOrEmpty(tagKey.registry().getValue()); - } - - if (maybeRegistry.isPresent()) { - if (tagKey.isOf(maybeRegistry.get().getKey())) { - Registry registry = (Registry) maybeRegistry.get(); - - Optional> maybeKey = registry.getKey(entry); - - // Check synced tag - if (maybeKey.isPresent()) { - return registry.entryOf(maybeKey.get()).isIn(tagKey); - } - } - } - - return false; + return net.fabricmc.fabric.api.tag.convention.v2.TagUtil.isIn(registryManager, tagKey, entry); } } From 4095208c86c49d5b0bcc86c00c4e66461ddb1806 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 11:20:57 -0400 Subject: [PATCH 036/123] Moved tag namespace to constant --- .../datagen/generators/BiomeTagGenerator.java | 44 +++++++------- .../datagen/generators/BlockTagGenerator.java | 26 ++++----- .../datagen/generators/ItemTagGenerator.java | 57 +++++++++---------- .../fabric/api/tag/convention/v2/TagUtil.java | 3 + .../tag/convention/ConventionLogWarnings.java | 3 +- .../impl/tag/convention/TagRegistration.java | 6 +- 6 files changed, 72 insertions(+), 67 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 30d25d4a87..4ea3a22b5a 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 @@ -21,7 +21,6 @@ import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.BiomeTags; -import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeKeys; @@ -29,6 +28,7 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags; +import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; public class BiomeTagGenerator extends FabricTagProvider { public BiomeTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { @@ -278,32 +278,32 @@ private void generateTerrainDescriptorTags() { .add(BiomeKeys.STONY_SHORE); getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLOWER_FOREST) .add(BiomeKeys.FLOWER_FOREST) - .addOptionalTag(new Identifier("c", "flower_forests")); + .addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "flower_forests")); } private void generateBackwardsCompatTags() { // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. // TODO: Remove backwards compat tag entries in 1.22 - getOrCreateTagBuilder(ConventionalBiomeTags.IS_NETHER).addOptionalTag(new Identifier("c", "in_nether")); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_THE_END).addOptionalTag(new Identifier("c", "in_the_end")); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_OVERWORLD).addOptionalTag(new Identifier("c", "in_the_overworld")); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_CAVE).addOptionalTag(new Identifier("c", "caves")); - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_COLD).addOptionalTag(new Identifier("c", "climate_cold")); - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_TEMPERATE).addOptionalTag(new Identifier("c", "climate_temperate")); - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_HOT).addOptionalTag(new Identifier("c", "climate_hot")); - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_WET).addOptionalTag(new Identifier("c", "climate_wet")); - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_DRY).addOptionalTag(new Identifier("c", "climate_dry")); - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_VEGETATION_DENSE).addOptionalTag(new Identifier("c", "vegetation_dense")); - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_VEGETATION_SPARSE).addOptionalTag(new Identifier("c", "vegetation_sparse")); - getOrCreateTagBuilder(ConventionalBiomeTags.CONIFEROUS_IS_TREE).addOptionalTag(new Identifier("c", "tree_coniferous")); - getOrCreateTagBuilder(ConventionalBiomeTags.DECIDUOUS_IS_TREE).addOptionalTag(new Identifier("c", "tree_deciduous")); - getOrCreateTagBuilder(ConventionalBiomeTags.JUNGLE_IS_TREE).addOptionalTag(new Identifier("c", "tree_jungle")); - getOrCreateTagBuilder(ConventionalBiomeTags.SAVANNA_IS_TREE).addOptionalTag(new Identifier("c", "tree_savanna")); - getOrCreateTagBuilder(ConventionalBiomeTags.PEAK_IS_MOUNTAIN).addOptionalTag(new Identifier("c", "mountain_peak")); - getOrCreateTagBuilder(ConventionalBiomeTags.SLOPE_IS_MOUNTAIN).addOptionalTag(new Identifier("c", "mountain_slope")); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_END_ISLAND).addOptionalTag(new Identifier("c", "end_islands")); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_NETHER_FOREST).addOptionalTag(new Identifier("c", "nether_forests")); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLOWER_FOREST).addOptionalTag(new Identifier("c", "flower_forests")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_NETHER).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "in_nether")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_THE_END).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "in_the_end")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_OVERWORLD).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "in_the_overworld")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_CAVE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "caves")); + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_COLD).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_cold")); + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_TEMPERATE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_temperate")); + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_HOT).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_hot")); + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_WET).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_wet")); + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_DRY).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_dry")); + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_VEGETATION_DENSE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "vegetation_dense")); + getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_VEGETATION_SPARSE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "vegetation_sparse")); + getOrCreateTagBuilder(ConventionalBiomeTags.CONIFEROUS_IS_TREE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_coniferous")); + getOrCreateTagBuilder(ConventionalBiomeTags.DECIDUOUS_IS_TREE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_deciduous")); + getOrCreateTagBuilder(ConventionalBiomeTags.JUNGLE_IS_TREE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_jungle")); + getOrCreateTagBuilder(ConventionalBiomeTags.SAVANNA_IS_TREE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_savanna")); + getOrCreateTagBuilder(ConventionalBiomeTags.PEAK_IS_MOUNTAIN).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "mountain_peak")); + getOrCreateTagBuilder(ConventionalBiomeTags.SLOPE_IS_MOUNTAIN).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "mountain_slope")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_END_ISLAND).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "end_islands")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_NETHER_FOREST).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "nether_forests")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLOWER_FOREST).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "flower_forests")); } } 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 ea87b9d2b3..d4327dfdb0 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 @@ -23,12 +23,12 @@ import net.minecraft.block.Blocks; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.BlockTags; -import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags; +import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { static List VILLAGER_JOB_SITE_BLOCKS = List.of( @@ -327,17 +327,17 @@ private void generateBackwardsCompatTags() { // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. // TODO: Remove backwards compat tag entries in 1.22 - getOrCreateTagBuilder(ConventionalBlockTags.RELOCATION_NOT_SUPPORTED).addOptionalTag(new Identifier("c", "movement_restricted")); - getOrCreateTagBuilder(ConventionalBlockTags.QUARTZ_ORES).addOptionalTag(new Identifier("c", "quartz_ores")); - getOrCreateTagBuilder(ConventionalBlockTags.WOODEN_BARRELS).addOptionalTag(new Identifier("c", "wooden_barrels")); - getOrCreateTagBuilder(ConventionalBlockTags.BLOCKS_SANDSTONE).addOptionalTag(new Identifier("c", "sandstone_blocks")); - getOrCreateTagBuilder(ConventionalBlockTags.SLABS_SANDSTONE).addOptionalTag(new Identifier("c", "sandstone_slabs")); - getOrCreateTagBuilder(ConventionalBlockTags.STAIRS_SANDSTONE).addOptionalTag(new Identifier("c", "sandstone_stairs")); - getOrCreateTagBuilder(ConventionalBlockTags.RED_BLOCKS_SANDSTONE).addOptionalTag(new Identifier("c", "red_sandstone_blocks")); - getOrCreateTagBuilder(ConventionalBlockTags.RED_SLABS_SANDSTONE).addOptionalTag(new Identifier("c", "red_sandstone_slabs")); - getOrCreateTagBuilder(ConventionalBlockTags.RED_STAIRS_SANDSTONE).addOptionalTag(new Identifier("c", "red_sandstone_stairs")); - getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_BLOCKS_SANDSTONE).addOptionalTag(new Identifier("c", "uncolored_sandstone_blocks")); - getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_SLABS_SANDSTONE).addOptionalTag(new Identifier("c", "uncolored_sandstone_slabs")); - getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_STAIRS_SANDSTONE).addOptionalTag(new Identifier("c", "uncolored_sandstone_stairs")); + getOrCreateTagBuilder(ConventionalBlockTags.RELOCATION_NOT_SUPPORTED).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "movement_restricted")); + getOrCreateTagBuilder(ConventionalBlockTags.QUARTZ_ORES).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "quartz_ores")); + getOrCreateTagBuilder(ConventionalBlockTags.WOODEN_BARRELS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "wooden_barrels")); + getOrCreateTagBuilder(ConventionalBlockTags.BLOCKS_SANDSTONE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "sandstone_blocks")); + getOrCreateTagBuilder(ConventionalBlockTags.SLABS_SANDSTONE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "sandstone_slabs")); + getOrCreateTagBuilder(ConventionalBlockTags.STAIRS_SANDSTONE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "sandstone_stairs")); + getOrCreateTagBuilder(ConventionalBlockTags.RED_BLOCKS_SANDSTONE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "red_sandstone_blocks")); + getOrCreateTagBuilder(ConventionalBlockTags.RED_SLABS_SANDSTONE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "red_sandstone_slabs")); + getOrCreateTagBuilder(ConventionalBlockTags.RED_STAIRS_SANDSTONE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "red_sandstone_stairs")); + getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_BLOCKS_SANDSTONE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "uncolored_sandstone_blocks")); + getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_SLABS_SANDSTONE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "uncolored_sandstone_slabs")); + getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_STAIRS_SANDSTONE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "uncolored_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 908d1bed5a..512b6677c0 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 @@ -18,19 +18,18 @@ import java.util.concurrent.CompletableFuture; -import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; import net.minecraft.item.Items; import net.minecraft.registry.Registries; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.ItemTags; -import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags; import net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags; +import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; public class ItemTagGenerator extends FabricTagProvider.ItemTagProvider { public ItemTagGenerator(FabricDataOutput output, CompletableFuture completableFuture, FabricTagProvider.BlockTagProvider blockTags) { @@ -381,32 +380,32 @@ private void generateBackwardsCompatTags() { // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. // TODO: Remove backwards compat tag entries in 1.22 - getOrCreateTagBuilder(ConventionalItemTags.BLACK_DYES).addOptionalTag(new Identifier("c", "black_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.BLUE_DYES).addOptionalTag(new Identifier("c", "blue_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.BROWN_DYES).addOptionalTag(new Identifier("c", "brown_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.GREEN_DYES).addOptionalTag(new Identifier("c", "green_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.RED_DYES).addOptionalTag(new Identifier("c", "red_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.WHITE_DYES).addOptionalTag(new Identifier("c", "white_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.YELLOW_DYES).addOptionalTag(new Identifier("c", "yellow_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.LIGHT_BLUE_DYES).addOptionalTag(new Identifier("c", "light_blue_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.LIGHT_GRAY_DYES).addOptionalTag(new Identifier("c", "light_gray_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.LIME_DYES).addOptionalTag(new Identifier("c", "lime_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.MAGENTA_DYES).addOptionalTag(new Identifier("c", "magenta_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.ORANGE_DYES).addOptionalTag(new Identifier("c", "orange_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.PINK_DYES).addOptionalTag(new Identifier("c", "pink_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.CYAN_DYES).addOptionalTag(new Identifier("c", "cyan_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.GRAY_DYES).addOptionalTag(new Identifier("c", "gray_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.PURPLE_DYES).addOptionalTag(new Identifier("c", "purple_dyes")); - getOrCreateTagBuilder(ConventionalItemTags.IRON_RAW_MATERIALS).addOptionalTag(new Identifier("c", "raw_iron_ores")); - getOrCreateTagBuilder(ConventionalItemTags.COPPER_RAW_MATERIALS).addOptionalTag(new Identifier("c", "raw_copper_ores")); - getOrCreateTagBuilder(ConventionalItemTags.GOLD_RAW_MATERIALS).addOptionalTag(new Identifier("c", "raw_gold_ores")); - getOrCreateTagBuilder(ConventionalItemTags.DIAMOND_GEMS).addOptionalTag(new Identifier("c", "diamonds")); - getOrCreateTagBuilder(ConventionalItemTags.LAPIS_GEMS).addOptionalTag(new Identifier("c", "lapis")); - getOrCreateTagBuilder(ConventionalItemTags.EMERALD_GEMS).addOptionalTag(new Identifier("c", "emeralds")); - getOrCreateTagBuilder(ConventionalItemTags.QUARTZ_GEMS).addOptionalTag(new Identifier("c", "quartz")); - getOrCreateTagBuilder(ConventionalItemTags.SHEARS_TOOLS).addOptionalTag(new Identifier("c", "shears")); - getOrCreateTagBuilder(ConventionalItemTags.SPEARS_TOOLS).addOptionalTag(new Identifier("c", "spears")); - getOrCreateTagBuilder(ConventionalItemTags.BOWS_TOOLS).addOptionalTag(new Identifier("c", "bows")); - getOrCreateTagBuilder(ConventionalItemTags.SHIELDS_TOOLS).addOptionalTag(new Identifier("c", "shields")); + getOrCreateTagBuilder(ConventionalItemTags.BLACK_DYES).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "black_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.BLUE_DYES).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "blue_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.BROWN_DYES).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "brown_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.GREEN_DYES).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "green_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.RED_DYES).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "red_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.WHITE_DYES).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "white_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.YELLOW_DYES).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "yellow_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.LIGHT_BLUE_DYES).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "light_blue_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.LIGHT_GRAY_DYES).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "light_gray_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.LIME_DYES).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "lime_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.MAGENTA_DYES).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "magenta_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.ORANGE_DYES).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "orange_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.PINK_DYES).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "pink_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.CYAN_DYES).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "cyan_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.GRAY_DYES).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "gray_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.PURPLE_DYES).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "purple_dyes")); + getOrCreateTagBuilder(ConventionalItemTags.IRON_RAW_MATERIALS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "raw_iron_ores")); + getOrCreateTagBuilder(ConventionalItemTags.COPPER_RAW_MATERIALS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "raw_copper_ores")); + getOrCreateTagBuilder(ConventionalItemTags.GOLD_RAW_MATERIALS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "raw_gold_ores")); + getOrCreateTagBuilder(ConventionalItemTags.DIAMOND_GEMS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "diamonds")); + getOrCreateTagBuilder(ConventionalItemTags.LAPIS_GEMS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "lapis")); + getOrCreateTagBuilder(ConventionalItemTags.EMERALD_GEMS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "emeralds")); + getOrCreateTagBuilder(ConventionalItemTags.QUARTZ_GEMS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "quartz")); + getOrCreateTagBuilder(ConventionalItemTags.SHEARS_TOOLS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "shears")); + getOrCreateTagBuilder(ConventionalItemTags.SPEARS_TOOLS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "spears")); + getOrCreateTagBuilder(ConventionalItemTags.BOWS_TOOLS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "bows")); + getOrCreateTagBuilder(ConventionalItemTags.SHIELDS_TOOLS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "shields")); } } diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/TagUtil.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/TagUtil.java index 036f74e695..d4aa209ece 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/TagUtil.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/TagUtil.java @@ -35,6 +35,9 @@ * For non-dynamic registry entries, the simpler {@link #isIn(TagKey, Object)} can be used. */ public final class TagUtil { + public static String C_TAG_NAMESPACE = "c"; + public static String FABRIC_TAG_NAMESPACE = "fabric"; + private TagUtil() { } diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index ab831716d7..294f0532d3 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -32,6 +32,7 @@ import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; +import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; import net.fabricmc.loader.api.FabricLoader; // To be removed in 1.22 Minecraft @@ -123,7 +124,7 @@ private static void setupLegacyTagWarning() { if (registryEntry.key().getValue().getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) { registryEntry.value().streamTags().forEach(tagKey -> { // Grab legacy tags under 'c' namespace - if (tagKey.id().getNamespace().equals("c") && LEGACY_C_TAGS.contains(tagKey.id().getPath())) { + if (tagKey.id().getNamespace().equals(TagUtil.C_TAG_NAMESPACE) && LEGACY_C_TAGS.contains(tagKey.id().getPath())) { legacyTags.add(tagKey); } }); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java index 66e9287e4f..2fd69fa0f2 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java @@ -29,6 +29,8 @@ import net.minecraft.registry.RegistryKey; import net.minecraft.world.biome.Biome; +import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; + public class TagRegistration { public static final TagRegistration ITEM_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.ITEM); public static final TagRegistration BLOCK_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.BLOCK); @@ -44,10 +46,10 @@ private TagRegistration(RegistryKey> registry) { } public TagKey registerFabric(String tagId) { - return TagKey.of(registryKey, new Identifier("fabric", tagId)); + return TagKey.of(registryKey, new Identifier(TagUtil.FABRIC_TAG_NAMESPACE, tagId)); } public TagKey registerC(String tagId) { - return TagKey.of(registryKey, new Identifier("c", tagId)); + return TagKey.of(registryKey, new Identifier(TagUtil.C_TAG_NAMESPACE, tagId)); } } From 0e492221879ee2363ccb6257c1874c3a515509fd Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 11:22:12 -0400 Subject: [PATCH 037/123] Convert TagRegistration to record --- .../fabric/impl/tag/convention/TagRegistration.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java index 2fd69fa0f2..eb07620e7e 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java @@ -31,7 +31,7 @@ import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; -public class TagRegistration { +public record TagRegistration(RegistryKey> registryKey) { public static final TagRegistration ITEM_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.ITEM); public static final TagRegistration BLOCK_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.BLOCK); public static final TagRegistration> BLOCK_ENTITY_TYPE_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.BLOCK_ENTITY_TYPE); @@ -39,11 +39,6 @@ public class TagRegistration { public static final TagRegistration FLUID_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.FLUID); public static final TagRegistration> ENTITY_TYPE_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.ENTITY_TYPE); public static final TagRegistration ENCHANTMENT_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.ENCHANTMENT); - private final RegistryKey> registryKey; - - private TagRegistration(RegistryKey> registry) { - registryKey = registry; - } public TagKey registerFabric(String tagId) { return TagKey.of(registryKey, new Identifier(TagUtil.FABRIC_TAG_NAMESPACE, tagId)); From abc2292148ecf7969883bf3f1298550088131d83 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 11:24:33 -0400 Subject: [PATCH 038/123] Fixed version requirements and versioning --- .../src/main/resources/fabric.mod.json | 6 +++--- gradle.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fabric-convention-tags-v2/src/main/resources/fabric.mod.json b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json index d42bb0a78f..d1a98c416d 100644 --- a/fabric-convention-tags-v2/src/main/resources/fabric.mod.json +++ b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "fabric-convention-tags-v2", - "name": "Fabric Convention Tags", + "name": "Fabric Convention Tags (v2)", "version": "${version}", "environment": "*", "license": "Apache-2.0", @@ -21,8 +21,8 @@ ] }, "depends": { - "fabricloader": ">=0.4.0", - "minecraft": ">=1.18.2", + "fabricloader": ">=0.14.22", + "minecraft": ">=1.20.1", "fabric-lifecycle-events-v1": "*" }, "mixins": [], diff --git a/gradle.properties b/gradle.properties index 953840d626..e43a36aec9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -61,5 +61,5 @@ fabric-sound-api-v1-version=1.0.13 fabric-transfer-api-v1-version=3.3.6 fabric-transitive-access-wideners-v1-version=5.0.2 fabric-convention-tags-v1-version=1.5.6 -fabric-convention-tags-v2-version=2.0.0 +fabric-convention-tags-v2-version=1.0.0 fabric-client-tags-api-v1-version=1.1.3 From de96c112175ca5e3b71fafc6c07842a28595343a Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 11:25:13 -0400 Subject: [PATCH 039/123] Added missing deprecation for old fluid tags --- .../fabric/api/tag/convention/v1/ConventionalFluidTags.java | 1 + 1 file changed, 1 insertion(+) diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalFluidTags.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalFluidTags.java index fcb9f0c845..9a46a319b6 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalFluidTags.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalFluidTags.java @@ -24,6 +24,7 @@ /** * @deprecated Please use {@link net.fabricmc.fabric.api.tag.convention.v2.ConventionalFluidTags} */ +@Deprecated public final class ConventionalFluidTags { private ConventionalFluidTags() { } From 83204fcbf9b28ac774926727d35fcf8c908ac370 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 11:26:26 -0400 Subject: [PATCH 040/123] Made fabric api's own internal tag generator final --- .../tag/convention/datagen/generators/BiomeTagGenerator.java | 2 +- .../datagen/generators/BlockEntityTypeTagGenerator.java | 2 +- .../tag/convention/datagen/generators/BlockTagGenerator.java | 2 +- .../convention/datagen/generators/EnchantmentTagGenerator.java | 2 +- .../convention/datagen/generators/EntityTypeTagGenerator.java | 2 +- .../tag/convention/datagen/generators/FluidTagGenerator.java | 2 +- .../tag/convention/datagen/generators/ItemTagGenerator.java | 2 +- 7 files changed, 7 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 4ea3a22b5a..0c580b7e0e 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 @@ -30,7 +30,7 @@ import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags; import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; -public class BiomeTagGenerator extends FabricTagProvider { +public final class BiomeTagGenerator extends FabricTagProvider { public BiomeTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { super(output, RegistryKeys.BIOME, completableFuture); } diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java index 4366011694..6caebc91df 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java @@ -24,7 +24,7 @@ import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockEntityTypeTags; -public class BlockEntityTypeTagGenerator extends FabricTagProvider.BlockEntityTypeTagProvider { +public final class BlockEntityTypeTagGenerator extends FabricTagProvider.BlockEntityTypeTagProvider { public BlockEntityTypeTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { super(output, completableFuture); } 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 d4327dfdb0..bccc7063dd 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 @@ -30,7 +30,7 @@ import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags; import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; -public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { +public final class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { static List VILLAGER_JOB_SITE_BLOCKS = List.of( Blocks.BARREL, Blocks.BLAST_FURNACE, diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java index 496dab7131..ec6ace2774 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java @@ -28,7 +28,7 @@ import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags; -public class EnchantmentTagGenerator extends FabricTagProvider.EnchantmentTagProvider { +public final class EnchantmentTagGenerator extends FabricTagProvider.EnchantmentTagProvider { public EnchantmentTagGenerator(FabricDataOutput output, CompletableFuture registriesFuture) { super(output, registriesFuture); } diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java index 2efa3db748..4bbb55ec15 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java @@ -27,7 +27,7 @@ import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.fabricmc.fabric.api.tag.convention.v2.ConventionalEntityTypeTags; -public class EntityTypeTagGenerator extends FabricTagProvider.EntityTypeTagProvider { +public final class EntityTypeTagGenerator extends FabricTagProvider.EntityTypeTagProvider { public EntityTypeTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { super(output, completableFuture); } diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java index aa8bf35bd0..c39e3dc6b7 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java @@ -28,7 +28,7 @@ import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.fabricmc.fabric.api.tag.convention.v2.ConventionalFluidTags; -public class FluidTagGenerator extends FabricTagProvider.FluidTagProvider { +public final class FluidTagGenerator extends FabricTagProvider.FluidTagProvider { public FluidTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { super(output, completableFuture); } 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 512b6677c0..6800e17e10 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 @@ -31,7 +31,7 @@ import net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags; import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; -public class ItemTagGenerator extends FabricTagProvider.ItemTagProvider { +public final class ItemTagGenerator extends FabricTagProvider.ItemTagProvider { public ItemTagGenerator(FabricDataOutput output, CompletableFuture completableFuture, FabricTagProvider.BlockTagProvider blockTags) { super(output, completableFuture, blockTags); } From b253d3e2a82b92c28b6d9bb4a5eddead3d126b48 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 13:36:37 -0400 Subject: [PATCH 041/123] Improve the legacy tag detection and added some new tags --- .../fabric-convention-tags-v1/build.gradle | 5 +- .../datagen/generators/BlockTagGenerator.java | 17 +- .../datagen/generators/ItemTagGenerator.java | 20 ++- .../convention/v2/ConventionalBlockTags.java | 5 + .../convention/v2/ConventionalItemTags.java | 10 ++ .../tag/convention/ConventionLogWarnings.java | 157 +++++++++++------- 6 files changed, 146 insertions(+), 68 deletions(-) diff --git a/deprecated/fabric-convention-tags-v1/build.gradle b/deprecated/fabric-convention-tags-v1/build.gradle index a9ae155fd7..c3234962d0 100644 --- a/deprecated/fabric-convention-tags-v1/build.gradle +++ b/deprecated/fabric-convention-tags-v1/build.gradle @@ -1,3 +1,6 @@ version = getSubprojectVersion(project) -moduleDependencies(project, ['fabric-api-base', 'fabric-convention-tags-v2']) \ No newline at end of file +moduleDependencies(project, [ + 'fabric-api-base', + 'fabric-convention-tags-v2' +]) \ No newline at end of file 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 bccc7063dd..a58b23cb0e 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 @@ -56,6 +56,16 @@ public BlockTagGenerator(FabricDataOutput output, CompletableFuture STONES = register("stones"); + // Ores and ingots - broad categories public static final TagKey ORES = register("ores"); @@ -41,6 +45,7 @@ private ConventionalBlockTags() { public static final TagKey WOODEN_BARRELS = register("barrels/wooden"); 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 GLASS_BLOCKS = register("glass_blocks"); public static final TagKey GLASS_PANES = register("glass_panes"); public static final TagKey SHULKER_BOXES = register("shulker_boxes"); 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 63e2039c84..8ffaeeea07 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 @@ -29,6 +29,10 @@ public final class ConventionalItemTags { private ConventionalItemTags() { } + // Natural stone-like blocks that can spawn in-world such as Stone, Granite, Diorite, and others. + // Not variations like Stone Bricks or Diorite Slabs. + public static final TagKey STONES = register("stones"); + // Tool tags public static final TagKey TOOLS = register("tools"); public static final TagKey SHEARS_TOOLS = register("tools/shears"); @@ -99,6 +103,7 @@ private ConventionalItemTags() { public static final TagKey WOODEN_BARRELS = register("barrels/wooden"); 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 GLASS_BLOCKS = register("glass_blocks"); public static final TagKey GLASS_PANES = register("glass_panes"); public static final TagKey SHULKER_BOXES = register("shulker_boxes"); @@ -159,6 +164,11 @@ private ConventionalItemTags() { public static final TagKey WHITE_DYED = register("dyed/white"); public static final TagKey YELLOW_DYED = register("dyed/yellow"); + // Other + public static final TagKey STRINGS = register("strings"); + public static final TagKey RODS = register("rods"); + public static final TagKey WOODEN_RODS = register("rods/wooden"); + private static TagKey register(String tagID) { return TagRegistration.ITEM_TAG_REGISTRATION.registerC(tagID); } diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 294f0532d3..d653bdf5e2 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -28,6 +28,7 @@ import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.registry.tag.TagKey; +import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; import net.fabricmc.api.ModInitializer; @@ -38,68 +39,96 @@ // To be removed in 1.22 Minecraft public class ConventionLogWarnings implements ModInitializer { public static final Logger LOGGER = LoggerFactory.getLogger(ConventionLogWarnings.class); - private static final Set LEGACY_C_TAGS = Set.of( - "movement_restricted", - "quartz_ores", - "wooden_barrels", - "sandstone_blocks", - "sandstone_slabs", - "sandstone_stairs", - "red_sandstone_blocks", - "red_sandstone_slabs", - "red_sandstone_stairs", - "uncolored_sandstone_blocks", - "uncolored_sandstone_slabs", - "uncolored_sandstone_stairs", - - "black_dyes", - "blue_dyes", - "brown_dyes", - "green_dyes", - "red_dyes", - "white_dyes", - "yellow_dyes", - "light_blue_dyes", - "light_gray_dyes", - "lime_dyes", - "magenta_dyes", - "orange_dyes", - "pink_dyes", - "cyan_dyes", - "gray_dyes", - "purple_dyes", - "raw_iron_ores", - "raw_copper_ores", - "raw_gold_ores", - "diamonds", - "lapis", - "emeralds", - "quartz", - "shears", - "spears", - "bows", - "shields", - - "in_nether", - "in_the_end", - "in_the_overworld", - "caves", - "climate_cold", - "climate_temperate", - "climate_hot", - "climate_wet", - "climate_dry", - "vegetation_dense", - "vegetation_sparse", - "tree_coniferous", - "tree_deciduous", - "tree_jungle", - "tree_savanna", - "mountain_peak", - "mountain_slope", - "end_islands", - "nether_forests", - "flower_forests" + + // Old `c` tags that we migrated to a new tag under a new convention. + // May also contain commonly used `c` tags that are not following convention. + private static final Set> LEGACY_C_TAGS = Set.>of( + // Old v1 tags that are discouraged + TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "movement_restricted")), + TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "quartz_ores")), + TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "wooden_barrels")), + TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "sandstone_blocks")), + TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "sandstone_stairs")), + TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "sandstone_slabs")), + TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "red_sandstone_blocks")), + TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "red_sandstone_stairs")), + TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "red_sandstone_slabs")), + TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "uncolored_sandstone_blocks")), + TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "uncolored_sandstone_stairs")), + TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "uncolored_sandstone_slabs")), + + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "black_dyes")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "blue_dyes")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "brown_dyes")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "green_dyes")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "red_dyes")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "white_dyes")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "yellow_dyes")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "light_blue_dyes")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "light_gray_dyes")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "lime_dyes")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "magenta_dyes")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "orange_dyes")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "pink_dyes")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "cyan_dyes")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "gray_dyes")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "purple_dyes")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "raw_iron_ores")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "raw_gold_ores")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "diamonds")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "lapis")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "emeralds")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "quartz")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "shears")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "spears")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "bows")), + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "shields")), + + TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "in_nether")), + TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "in_the_end")), + TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "in_overworld")), + TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "caves")), + TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_cold")), + TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_temperate")), + TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_hot")), + TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_wet")), + TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_dry")), + TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "vegetation_dense")), + TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "vegetation_sparse")), + TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_coniferous")), + TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_deciduous")), + TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_jungle")), + TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_savanna")), + TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "mountain_peak")), + TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "mountain_slope")), + TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "end_islands")), + TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "nether_forests")), + TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "flower_forests")), + + // Commonly used `c` tags that are using discouraged conventions. (Not plural or not folder form) + TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "barrel")), // Should be using barrels + TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "chest")), // Should be using chests + TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "glass")), // Should be using glass_blocks + TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "glass_pane")), // Should be using glass_blocks + TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "immobile")), // Should be using relocation_not_supported + TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "wooden_chests")), // Should be using chests/wooden + TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "workbench")), + TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "stone")), // Should be using stones + + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "axes")), // Should be using vanilla's equivalent tag + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "pickaxes")), // Should be using vanilla's equivalent tag + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "hoes")), // Should be using vanilla's equivalent tag + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "shovels")), // Should be using vanilla's equivalent tag + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "swords")), // Should be using vanilla's equivalent tag + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "barrel")), // Should be using barrels + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "chest")), // Should be using chests + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "glass")), // Should be using glass_blocks + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "glass_pane")), // Should be using glass_blocks + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "glowstone_dusts")), // Should be using dusts/glowstone + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "redstone_dusts")), // Should be using dusts/redstone + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "stone")), // Should be using stones + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "string")), // Should be using strings + TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "wooden_rods")) // Should be using rods/wooden ); @Override @@ -123,8 +152,8 @@ private static void setupLegacyTagWarning() { dynamicRegistries.streamAllRegistries().forEach(registryEntry -> { if (registryEntry.key().getValue().getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) { registryEntry.value().streamTags().forEach(tagKey -> { - // Grab legacy tags under 'c' namespace - if (tagKey.id().getNamespace().equals(TagUtil.C_TAG_NAMESPACE) && LEGACY_C_TAGS.contains(tagKey.id().getPath())) { + // Grab legacy tags we migrated or discourage + if (LEGACY_C_TAGS.contains(tagKey)) { legacyTags.add(tagKey); } }); From 01dec05a0768e06a3e77c5762d11c8ed4923ce20 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 14:12:15 -0400 Subject: [PATCH 042/123] Moved logger to v1 and improve the logging --- .../ConventionLogWarningConfigs.java | 0 .../tag/convention/ConventionLogWarnings.java | 223 ++++++++++++++++++ .../tag/convention/ConventionLogWarnings.java | 190 --------------- 3 files changed, 223 insertions(+), 190 deletions(-) rename {fabric-convention-tags-v2 => deprecated/fabric-convention-tags-v1}/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java (100%) create mode 100644 deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java delete mode 100644 fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java similarity index 100% rename from fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java rename to deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java new file mode 100644 index 0000000000..f32b8f4d72 --- /dev/null +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -0,0 +1,223 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.impl.tag.convention; + +import static net.fabricmc.fabric.impl.tag.convention.ConventionLogWarningConfigs.LOG_LEGACY_WARNING_MODE; +import static net.fabricmc.fabric.impl.tag.convention.ConventionLogWarningConfigs.LOG_WARNING_MODES; + +import java.util.AbstractMap; +import java.util.List; +import java.util.Map; + +import it.unimi.dsi.fastutil.objects.ObjectArrayList; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import net.minecraft.registry.DynamicRegistryManager; +import net.minecraft.registry.tag.ItemTags; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; + +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBiomeTags; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalItemTags; +import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; +import net.fabricmc.loader.api.FabricLoader; + +public class ConventionLogWarnings implements ModInitializer { + public static final Logger LOGGER = LoggerFactory.getLogger(ConventionLogWarnings.class); + + // Old `c` tags that we migrated to a new tag under a new convention. + // May also contain commonly used `c` tags that are not following convention. + private static final Map, TagKey> LEGACY_C_TAGS = Map., TagKey>ofEntries( + // Old v1 tags that are discouraged + createMapEntry(ConventionalBlockTags.MOVEMENT_RESTRICTED, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.RELOCATION_NOT_SUPPORTED), + createMapEntry(ConventionalBlockTags.QUARTZ_ORES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.QUARTZ_ORES), + createMapEntry(ConventionalBlockTags.WOODEN_BARRELS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.WOODEN_BARRELS), + createMapEntry(ConventionalBlockTags.SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.BLOCKS_SANDSTONE), + createMapEntry(ConventionalBlockTags.SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.STAIRS_SANDSTONE), + createMapEntry(ConventionalBlockTags.SANDSTONE_SLABS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.SLABS_SANDSTONE), + createMapEntry(ConventionalBlockTags.RED_SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.RED_BLOCKS_SANDSTONE), + createMapEntry(ConventionalBlockTags.RED_SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.RED_STAIRS_SANDSTONE), + createMapEntry(ConventionalBlockTags.RED_SANDSTONE_SLABS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.RED_SLABS_SANDSTONE), + createMapEntry(ConventionalBlockTags.UNCOLORED_SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.UNCOLORED_BLOCKS_SANDSTONE), + createMapEntry(ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.UNCOLORED_STAIRS_SANDSTONE), + createMapEntry(ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.UNCOLORED_SLABS_SANDSTONE), + + createMapEntry(ConventionalItemTags.QUARTZ_ORES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.QUARTZ_ORES), + createMapEntry(ConventionalItemTags.WOODEN_BARRELS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WOODEN_BARRELS), + createMapEntry(ConventionalItemTags.SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BLOCKS_SANDSTONE), + createMapEntry(ConventionalItemTags.SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.STAIRS_SANDSTONE), + createMapEntry(ConventionalItemTags.SANDSTONE_SLABS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SLABS_SANDSTONE), + createMapEntry(ConventionalItemTags.RED_SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RED_BLOCKS_SANDSTONE), + createMapEntry(ConventionalItemTags.RED_SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RED_STAIRS_SANDSTONE), + createMapEntry(ConventionalItemTags.RED_SANDSTONE_SLABS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RED_SLABS_SANDSTONE), + createMapEntry(ConventionalItemTags.UNCOLORED_SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.UNCOLORED_BLOCKS_SANDSTONE), + createMapEntry(ConventionalItemTags.UNCOLORED_SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.UNCOLORED_STAIRS_SANDSTONE), + createMapEntry(ConventionalItemTags.BLACK_DYES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BLACK_DYES), + createMapEntry(ConventionalItemTags.BLUE_DYES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BLUE_DYES), + createMapEntry(ConventionalItemTags.BROWN_DYES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BROWN_DYES), + createMapEntry(ConventionalItemTags.GREEN_DYES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.GREEN_DYES), + createMapEntry(ConventionalItemTags.RED_DYES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RED_DYES), + createMapEntry(ConventionalItemTags.WHITE_DYES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WHITE_DYES), + createMapEntry(ConventionalItemTags.YELLOW_DYES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.YELLOW_DYES), + createMapEntry(ConventionalItemTags.LIGHT_BLUE_DYES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.LIGHT_BLUE_DYES), + createMapEntry(ConventionalItemTags.LIGHT_GRAY_DYES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.LIGHT_GRAY_DYES), + createMapEntry(ConventionalItemTags.LIME_DYES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.LIME_DYES), + createMapEntry(ConventionalItemTags.MAGENTA_DYES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.MAGENTA_DYES), + createMapEntry(ConventionalItemTags.ORANGE_DYES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.ORANGE_DYES), + createMapEntry(ConventionalItemTags.PINK_DYES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.PINK_DYES), + createMapEntry(ConventionalItemTags.CYAN_DYES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.CYAN_DYES), + createMapEntry(ConventionalItemTags.GRAY_DYES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.GRAY_DYES), + createMapEntry(ConventionalItemTags.PURPLE_DYES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.PURPLE_DYES), + createMapEntry(ConventionalItemTags.RAW_IRON_ORES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.IRON_RAW_MATERIALS), + createMapEntry(ConventionalItemTags.RAW_GOLD_ORES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.GOLD_RAW_MATERIALS), + createMapEntry(ConventionalItemTags.DIAMONDS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.DIAMOND_GEMS), + createMapEntry(ConventionalItemTags.LAPIS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.LAPIS_GEMS), + createMapEntry(ConventionalItemTags.EMERALDS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.EMERALD_GEMS), + createMapEntry(ConventionalItemTags.QUARTZ, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.QUARTZ_GEMS), + createMapEntry(ConventionalItemTags.SHEARS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SHEARS_TOOLS), + createMapEntry(ConventionalItemTags.SPEARS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SPEARS_TOOLS), + createMapEntry(ConventionalItemTags.BOWS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BOWS_TOOLS), + createMapEntry(ConventionalItemTags.SHIELDS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SHIELDS_TOOLS), + + createMapEntry(ConventionalBiomeTags.IN_NETHER, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_NETHER), + createMapEntry(ConventionalBiomeTags.IN_THE_END, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_THE_END), + createMapEntry(ConventionalBiomeTags.IN_OVERWORLD, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_OVERWORLD), + createMapEntry(ConventionalBiomeTags.CAVES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_CAVE), + createMapEntry(ConventionalBiomeTags.CLIMATE_COLD, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_COLD), + createMapEntry(ConventionalBiomeTags.CLIMATE_TEMPERATE, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_TEMPERATE), + createMapEntry(ConventionalBiomeTags.CLIMATE_HOT, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_HOT), + createMapEntry(ConventionalBiomeTags.CLIMATE_WET, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_WET), + createMapEntry(ConventionalBiomeTags.CLIMATE_DRY, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_DRY), + createMapEntry(ConventionalBiomeTags.VEGETATION_DENSE, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_VEGETATION_DENSE), + createMapEntry(ConventionalBiomeTags.VEGETATION_SPARSE, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_VEGETATION_SPARSE), + createMapEntry(ConventionalBiomeTags.TREE_CONIFEROUS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.CONIFEROUS_IS_TREE), + createMapEntry(ConventionalBiomeTags.TREE_DECIDUOUS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.DECIDUOUS_IS_TREE), + createMapEntry(ConventionalBiomeTags.TREE_JUNGLE, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.JUNGLE_IS_TREE), + createMapEntry(ConventionalBiomeTags.TREE_SAVANNA, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.SAVANNA_IS_TREE), + createMapEntry(ConventionalBiomeTags.MOUNTAIN_PEAK, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.PEAK_IS_MOUNTAIN), + createMapEntry(ConventionalBiomeTags.MOUNTAIN_SLOPE, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.SLOPE_IS_MOUNTAIN), + createMapEntry(ConventionalBiomeTags.END_ISLANDS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_END_ISLAND), + createMapEntry(ConventionalBiomeTags.NETHER_FORESTS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_NETHER_FOREST), + createMapEntry(ConventionalBiomeTags.FLOWER_FORESTS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_FLOWER_FOREST), + + // Commonly used `c` tags that are using discouraged conventions. (Not plural or not folder form) + createMapEntry(RegistryKeys.BLOCK, "barrel", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.BARRELS), + createMapEntry(RegistryKeys.BLOCK, "chest", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.CHESTS), + createMapEntry(RegistryKeys.BLOCK, "wooden_chests", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.WOODEN_CHESTS), + createMapEntry(RegistryKeys.BLOCK, "glass", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.GLASS_BLOCKS), + createMapEntry(RegistryKeys.BLOCK, "glass_pane", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.GLASS_PANES), + createMapEntry(RegistryKeys.BLOCK, "immobile", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.RELOCATION_NOT_SUPPORTED), + createMapEntry(RegistryKeys.BLOCK, "stone", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.STONES), + createMapEntry(RegistryKeys.BLOCK, "workbench", "workbenches"), + + createMapEntry(RegistryKeys.ITEM, "axes", ItemTags.AXES), + createMapEntry(RegistryKeys.ITEM, "pickaxes", ItemTags.PICKAXES), + createMapEntry(RegistryKeys.ITEM, "hoes", ItemTags.HOES), + createMapEntry(RegistryKeys.ITEM, "shovels", ItemTags.SHOVELS), + createMapEntry(RegistryKeys.ITEM, "swords", ItemTags.SWORDS), + createMapEntry(RegistryKeys.ITEM, "barrel", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BARRELS), + createMapEntry(RegistryKeys.ITEM, "chest", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.CHESTS), + createMapEntry(RegistryKeys.ITEM, "glass", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.GLASS_BLOCKS), + createMapEntry(RegistryKeys.ITEM, "glass_pane", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.GLASS_PANES), + createMapEntry(RegistryKeys.ITEM, "glowstone_dusts", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.GLOWSTONE_DUSTS), + createMapEntry(RegistryKeys.ITEM, "redstone_dusts", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.REDSTONE_DUSTS), + createMapEntry(RegistryKeys.ITEM, "stone", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.STONES), + createMapEntry(RegistryKeys.ITEM, "string", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.STRINGS), + createMapEntry(RegistryKeys.ITEM, "wooden_rods", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WOODEN_RODS) + + ); + + @Override + public void onInitialize() { + if (LOG_LEGACY_WARNING_MODE != LOG_WARNING_MODES.SILENCED) setupLegacyTagWarning(); + } + + // Remove in 1.22 + private static void setupLegacyTagWarning() { + // Log tags that are still using legacy conventions under 'c' namespace + ServerLifecycleEvents.SERVER_STARTED.register(server -> { + boolean isConfigSetToDev = + LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_SHORT + || LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE; + + if (FabricLoader.getInstance().isDevelopmentEnvironment() == isConfigSetToDev) { + List> legacyTags = new ObjectArrayList<>(); + DynamicRegistryManager.Immutable dynamicRegistries = server.getRegistryManager(); + + // We only care about vanilla registries + dynamicRegistries.streamAllRegistries().forEach(registryEntry -> { + if (registryEntry.key().getValue().getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) { + registryEntry.value().streamTags().forEach(tagKey -> { + // Grab legacy tags we migrated or discourage + if (LEGACY_C_TAGS.containsKey(tagKey)) { + legacyTags.add(tagKey); + } + }); + } + }); + + if (!legacyTags.isEmpty()) { + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append(""" + \n Dev warning - Legacy Tags detected. Please migrate your old `c` tags to our new `c` tags that follows better conventions! See classes under net.fabricmc.fabric.api.tag.convention.v1 package for all tags. + NOTE: Many tags have been moved around or renamed. Some new ones were added so please review the new tags. + And make sure you follow tag conventions for new tags! The convention is `c` with nouns generally being plural and adjectives being singular. + You can disable this message in Fabric API's properties config file by setting log-legacy-tag-warnings to "SILENCED" or see individual tags with "DEV_VERBOSE". + """); + + // Print out all legacy tags when desired. + boolean isConfigSetToVerbose = + LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE + || LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.PROD_VERBOSE; + + if (isConfigSetToVerbose) { + stringBuilder.append("\nLegacy tags:"); + + for (TagKey tagKey : legacyTags) { + stringBuilder.append("\n ").append(tagKey).append(" -> ").append(LEGACY_C_TAGS.get(tagKey)); + } + } + + LOGGER.warn(stringBuilder.toString()); + } + } + }); + } + + private static AbstractMap.SimpleEntry, TagKey> createMapEntry(TagKey tag1, TagKey tag2) { + return new AbstractMap.SimpleEntry<>(tag1, tag2); + } + + private static AbstractMap.SimpleEntry, TagKey> createMapEntry(RegistryKey> registryKey, String tagId1, TagKey tag2) { + return new AbstractMap.SimpleEntry<>(createTagKeyUnderC(registryKey, tagId1), tag2); + } + + private static AbstractMap.SimpleEntry, TagKey> createMapEntry(RegistryKey> registryKey, String tagId1, String tagId2) { + return new AbstractMap.SimpleEntry<>(createTagKeyUnderC(registryKey, tagId1), createTagKeyUnderC(registryKey, tagId2)); + } + + private static TagKey createTagKeyUnderC(RegistryKey> registryKey, String tagId) { + return TagKey.of(registryKey, new Identifier(TagUtil.C_TAG_NAMESPACE, tagId)); + } +} diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java deleted file mode 100644 index d653bdf5e2..0000000000 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ /dev/null @@ -1,190 +0,0 @@ -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.fabricmc.fabric.impl.tag.convention; - -import static net.fabricmc.fabric.impl.tag.convention.ConventionLogWarningConfigs.LOG_LEGACY_WARNING_MODE; -import static net.fabricmc.fabric.impl.tag.convention.ConventionLogWarningConfigs.LOG_WARNING_MODES; - -import java.util.List; -import java.util.Set; - -import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import net.minecraft.registry.DynamicRegistryManager; -import net.minecraft.registry.tag.TagKey; -import net.minecraft.registry.RegistryKeys; -import net.minecraft.util.Identifier; - -import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; -import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; -import net.fabricmc.loader.api.FabricLoader; - -// To be removed in 1.22 Minecraft -public class ConventionLogWarnings implements ModInitializer { - public static final Logger LOGGER = LoggerFactory.getLogger(ConventionLogWarnings.class); - - // Old `c` tags that we migrated to a new tag under a new convention. - // May also contain commonly used `c` tags that are not following convention. - private static final Set> LEGACY_C_TAGS = Set.>of( - // Old v1 tags that are discouraged - TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "movement_restricted")), - TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "quartz_ores")), - TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "wooden_barrels")), - TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "sandstone_blocks")), - TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "sandstone_stairs")), - TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "sandstone_slabs")), - TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "red_sandstone_blocks")), - TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "red_sandstone_stairs")), - TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "red_sandstone_slabs")), - TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "uncolored_sandstone_blocks")), - TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "uncolored_sandstone_stairs")), - TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "uncolored_sandstone_slabs")), - - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "black_dyes")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "blue_dyes")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "brown_dyes")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "green_dyes")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "red_dyes")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "white_dyes")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "yellow_dyes")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "light_blue_dyes")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "light_gray_dyes")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "lime_dyes")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "magenta_dyes")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "orange_dyes")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "pink_dyes")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "cyan_dyes")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "gray_dyes")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "purple_dyes")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "raw_iron_ores")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "raw_gold_ores")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "diamonds")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "lapis")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "emeralds")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "quartz")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "shears")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "spears")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "bows")), - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "shields")), - - TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "in_nether")), - TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "in_the_end")), - TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "in_overworld")), - TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "caves")), - TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_cold")), - TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_temperate")), - TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_hot")), - TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_wet")), - TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_dry")), - TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "vegetation_dense")), - TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "vegetation_sparse")), - TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_coniferous")), - TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_deciduous")), - TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_jungle")), - TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_savanna")), - TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "mountain_peak")), - TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "mountain_slope")), - TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "end_islands")), - TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "nether_forests")), - TagKey.of(RegistryKeys.BIOME, new Identifier(TagUtil.C_TAG_NAMESPACE, "flower_forests")), - - // Commonly used `c` tags that are using discouraged conventions. (Not plural or not folder form) - TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "barrel")), // Should be using barrels - TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "chest")), // Should be using chests - TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "glass")), // Should be using glass_blocks - TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "glass_pane")), // Should be using glass_blocks - TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "immobile")), // Should be using relocation_not_supported - TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "wooden_chests")), // Should be using chests/wooden - TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "workbench")), - TagKey.of(RegistryKeys.BLOCK, new Identifier(TagUtil.C_TAG_NAMESPACE, "stone")), // Should be using stones - - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "axes")), // Should be using vanilla's equivalent tag - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "pickaxes")), // Should be using vanilla's equivalent tag - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "hoes")), // Should be using vanilla's equivalent tag - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "shovels")), // Should be using vanilla's equivalent tag - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "swords")), // Should be using vanilla's equivalent tag - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "barrel")), // Should be using barrels - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "chest")), // Should be using chests - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "glass")), // Should be using glass_blocks - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "glass_pane")), // Should be using glass_blocks - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "glowstone_dusts")), // Should be using dusts/glowstone - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "redstone_dusts")), // Should be using dusts/redstone - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "stone")), // Should be using stones - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "string")), // Should be using strings - TagKey.of(RegistryKeys.ITEM, new Identifier(TagUtil.C_TAG_NAMESPACE, "wooden_rods")) // Should be using rods/wooden - ); - - @Override - public void onInitialize() { - if (LOG_LEGACY_WARNING_MODE != LOG_WARNING_MODES.SILENCED) setupLegacyTagWarning(); - } - - // Remove in 1.22 - private static void setupLegacyTagWarning() { - // Log tags that are still using legacy conventions under 'c' namespace - ServerLifecycleEvents.SERVER_STARTED.register(server -> { - boolean isConfigSetToDev = - LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_SHORT - || LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE; - - if (FabricLoader.getInstance().isDevelopmentEnvironment() == isConfigSetToDev) { - List> legacyTags = new ObjectArrayList<>(); - DynamicRegistryManager.Immutable dynamicRegistries = server.getRegistryManager(); - - // We only care about vanilla registries - dynamicRegistries.streamAllRegistries().forEach(registryEntry -> { - if (registryEntry.key().getValue().getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) { - registryEntry.value().streamTags().forEach(tagKey -> { - // Grab legacy tags we migrated or discourage - if (LEGACY_C_TAGS.contains(tagKey)) { - legacyTags.add(tagKey); - } - }); - } - }); - - if (!legacyTags.isEmpty()) { - StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append(""" - \n Dev warning - Legacy Tags detected. Please migrate your old `c` tags to our new `c` tags that follows better conventions! See classes under net.fabricmc.fabric.api.tag.convention.v1 package for all tags. - NOTE: Many tags have been moved around or renamed. Some new ones were added so please review the new tags. - And make sure you follow tag conventions for new tags! The convention is `c` with nouns generally being plural and adjectives being singular. - You can disable this message in Fabric API's properties config file by setting log-legacy-tag-warnings to "SILENCED" or see individual tags with "DEV_VERBOSE". - """); - - // Print out all legacy tags when desired. - boolean isConfigSetToVerbose = - LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE - || LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.PROD_VERBOSE; - - if (isConfigSetToVerbose) { - stringBuilder.append("\nLegacy tags:"); - - for (TagKey tagKey : legacyTags) { - stringBuilder.append("\n ").append(tagKey); - } - } - - LOGGER.warn(stringBuilder.toString()); - } - } - }); - } -} From 7fab6ac0c01a28855f06e662594d5e62ffed4a0a Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 15:44:19 -0400 Subject: [PATCH 043/123] Moved logging to v1 and improve the logging --- .../convention/v1/ConventionalBiomeTags.java | 2 +- .../convention/v1/ConventionalBlockTags.java | 2 +- .../v1/ConventionalEnchantmentTags.java | 2 +- .../v1/ConventionalEntityTypeTags.java | 2 +- .../convention/v1/ConventionalFluidTags.java | 2 +- .../convention/v1/ConventionalItemTags.java | 2 +- .../ConventionLogWarningConfigs.java | 92 ---------------- .../tag/convention/ConventionLogWarnings.java | 100 ++++++++++-------- .../impl/tag/convention/TagRegistration.java | 10 +- .../src/main/resources/fabric.mod.json | 5 + .../resources/data/c/tags/items/axes.json | 5 + .../convention/v2/ConventionalBiomeTags.java | 2 +- .../v2/ConventionalBlockEntityTypeTags.java | 2 +- .../convention/v2/ConventionalBlockTags.java | 2 +- .../v2/ConventionalEnchantmentTags.java | 2 +- .../v2/ConventionalEntityTypeTags.java | 2 +- .../convention/v2/ConventionalFluidTags.java | 2 +- .../convention/v2/ConventionalItemTags.java | 2 +- .../convention/{ => v2}/TagRegistration.java | 2 +- .../src/main/resources/fabric.mod.json | 5 - 20 files changed, 81 insertions(+), 164 deletions(-) delete mode 100644 deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/axes.json rename fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/{ => v2}/TagRegistration.java (97%) diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java index 508912bad4..b93d4a3f18 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java @@ -134,6 +134,6 @@ private ConventionalBiomeTags() { public static final TagKey SHALLOW_OCEAN = register("shallow_ocean"); private static TagKey register(String tagID) { - return TagRegistration.BIOME_TAG_REGISTRATION.registerCommon(tagID); + return TagRegistration.BIOME_TAG_REGISTRATION.registerC(tagID); } } diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java index 8cede6a311..ccee5bfe45 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java @@ -68,6 +68,6 @@ private ConventionalBlockTags() { public static final TagKey MOVEMENT_RESTRICTED = register("movement_restricted"); private static TagKey register(String tagID) { - return TagRegistration.BLOCK_TAG_REGISTRATION.registerCommon(tagID); + return TagRegistration.BLOCK_TAG_REGISTRATION.registerC(tagID); } } diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEnchantmentTags.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEnchantmentTags.java index 41d7e8cc4d..e1c786af3b 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEnchantmentTags.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEnchantmentTags.java @@ -53,6 +53,6 @@ private ConventionalEnchantmentTags() { public static final TagKey ENTITY_DEFENSE_ENHANCEMENT = register("entity_defense_enhancement"); private static TagKey register(String tagID) { - return TagRegistration.ENCHANTMENT_TAG_REGISTRATION.registerCommon(tagID); + return TagRegistration.ENCHANTMENT_TAG_REGISTRATION.registerC(tagID); } } diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java index 70bc40d1e0..966b3510ea 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java @@ -37,6 +37,6 @@ private ConventionalEntityTypeTags() { public static final TagKey> BOATS = register("boats"); private static TagKey> register(String tagID) { - return TagRegistration.ENTITY_TYPE_TAG_REGISTRATION.registerCommon(tagID); + return TagRegistration.ENTITY_TYPE_TAG_REGISTRATION.registerC(tagID); } } diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalFluidTags.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalFluidTags.java index 9a46a319b6..c29f3d513a 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalFluidTags.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalFluidTags.java @@ -35,6 +35,6 @@ private ConventionalFluidTags() { public static final TagKey HONEY = register("honey"); private static TagKey register(String tagID) { - return TagRegistration.FLUID_TAG_REGISTRATION.registerCommon(tagID); + return TagRegistration.FLUID_TAG_REGISTRATION.registerC(tagID); } } diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java index e764c0bf91..8044747a03 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java @@ -151,6 +151,6 @@ private ConventionalItemTags() { public static final TagKey SWORDS = register("swords"); private static TagKey register(String tagID) { - return TagRegistration.ITEM_TAG_REGISTRATION.registerCommon(tagID); + return TagRegistration.ITEM_TAG_REGISTRATION.registerC(tagID); } } diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java deleted file mode 100644 index 4050636b7b..0000000000 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarningConfigs.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.fabricmc.fabric.impl.tag.convention; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.Properties; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import net.fabricmc.loader.api.FabricLoader; - -public class ConventionLogWarningConfigs { - public static final Logger LOGGER = LoggerFactory.getLogger(ConventionLogWarningConfigs.class); - - /** - * A config option mainly for developers. - * Logs out modded tags that are using the 'c' namespace when running on integrated server or dedicated server. - * Defaults to DEV_SHORT. - */ - public static final LOG_WARNING_MODES LOG_LEGACY_WARNING_MODE; - - public enum LOG_WARNING_MODES { - SILENCED, - DEV_SHORT, - DEV_VERBOSE, - PROD_SHORT, - PROD_VERBOSE - } - - static { - File configDir = FabricLoader.getInstance().getConfigDir().resolve("fabric").toFile(); - - if (!configDir.exists()) { - if (!configDir.mkdir()) { - LOGGER.warn("[Fabric Tag Conventions v2] Could not create configuration directory: " + configDir.getAbsolutePath()); - } - } - - File configFile = new File(configDir, "fabric-tag-conventions-v2.properties"); - Properties properties = new Properties(); - - if (configFile.exists()) { - try (FileInputStream stream = new FileInputStream(configFile)) { - properties.load(stream); - } catch (IOException e) { - LOGGER.warn("[Fabric Tag Conventions v2] Could not read property file '" + configFile.getAbsolutePath() + "'", e); - } - } - - LOG_LEGACY_WARNING_MODE = asEnum((String) properties.computeIfAbsent("log-legacy-tag-warnings", (a) -> "DEV_SHORT"), LOG_WARNING_MODES.DEV_SHORT); - - try (FileOutputStream stream = new FileOutputStream(configFile)) { - properties.store(stream, "Fabric Tag Conventions v2 properties file"); - } catch (IOException e) { - LOGGER.warn("[Fabric Tag Conventions v2] Could not store property file '" + configFile.getAbsolutePath() + "'", e); - } - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - private static T asEnum(String property, T defValue) { - if (property == null || property.isEmpty()) { - return defValue; - } else { - for (Enum obj : defValue.getClass().getEnumConstants()) { - if (property.equalsIgnoreCase(obj.name())) { - //noinspection unchecked - return (T) obj; - } - } - - return defValue; - } - } -} diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index f32b8f4d72..2a767d3718 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -16,9 +16,6 @@ package net.fabricmc.fabric.impl.tag.convention; -import static net.fabricmc.fabric.impl.tag.convention.ConventionLogWarningConfigs.LOG_LEGACY_WARNING_MODE; -import static net.fabricmc.fabric.impl.tag.convention.ConventionLogWarningConfigs.LOG_WARNING_MODES; - import java.util.AbstractMap; import java.util.List; import java.util.Map; @@ -44,6 +41,14 @@ import net.fabricmc.loader.api.FabricLoader; public class ConventionLogWarnings implements ModInitializer { + + public static final String LOG_LEGACY_WARNING_MODE = System.getProperty("fabric-tag-conventions-v1.legacyTagWarning", LOG_WARNING_MODES.DEV_SHORT.name()); + public enum LOG_WARNING_MODES { + SILENCED, + DEV_SHORT, + DEV_VERBOSE + } + public static final Logger LOGGER = LoggerFactory.getLogger(ConventionLogWarnings.class); // Old `c` tags that we migrated to a new tag under a new convention. @@ -136,6 +141,11 @@ public class ConventionLogWarnings implements ModInitializer { createMapEntry(RegistryKeys.ITEM, "hoes", ItemTags.HOES), createMapEntry(RegistryKeys.ITEM, "shovels", ItemTags.SHOVELS), createMapEntry(RegistryKeys.ITEM, "swords", ItemTags.SWORDS), + createMapEntry(createTagKeyUnderFabric(RegistryKeys.ITEM, "axes"), ItemTags.AXES), + createMapEntry(createTagKeyUnderFabric(RegistryKeys.ITEM, "pickaxes"), ItemTags.PICKAXES), + createMapEntry(createTagKeyUnderFabric(RegistryKeys.ITEM, "hoes"), ItemTags.HOES), + createMapEntry(createTagKeyUnderFabric(RegistryKeys.ITEM, "shovels"), ItemTags.SHOVELS), + createMapEntry(createTagKeyUnderFabric(RegistryKeys.ITEM, "swords"), ItemTags.SWORDS), createMapEntry(RegistryKeys.ITEM, "barrel", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BARRELS), createMapEntry(RegistryKeys.ITEM, "chest", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.CHESTS), createMapEntry(RegistryKeys.ITEM, "glass", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.GLASS_BLOCKS), @@ -150,57 +160,52 @@ public class ConventionLogWarnings implements ModInitializer { @Override public void onInitialize() { - if (LOG_LEGACY_WARNING_MODE != LOG_WARNING_MODES.SILENCED) setupLegacyTagWarning(); + if (FabricLoader.getInstance().isDevelopmentEnvironment() && !LOG_LEGACY_WARNING_MODE.equalsIgnoreCase(LOG_WARNING_MODES.SILENCED.name())) + setupLegacyTagWarning(); } - // Remove in 1.22 private static void setupLegacyTagWarning() { // Log tags that are still using legacy conventions under 'c' namespace ServerLifecycleEvents.SERVER_STARTED.register(server -> { - boolean isConfigSetToDev = - LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_SHORT - || LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE; - - if (FabricLoader.getInstance().isDevelopmentEnvironment() == isConfigSetToDev) { - List> legacyTags = new ObjectArrayList<>(); - DynamicRegistryManager.Immutable dynamicRegistries = server.getRegistryManager(); - - // We only care about vanilla registries - dynamicRegistries.streamAllRegistries().forEach(registryEntry -> { - if (registryEntry.key().getValue().getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) { - registryEntry.value().streamTags().forEach(tagKey -> { - // Grab legacy tags we migrated or discourage - if (LEGACY_C_TAGS.containsKey(tagKey)) { - legacyTags.add(tagKey); - } - }); - } - }); - - if (!legacyTags.isEmpty()) { - StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append(""" - \n Dev warning - Legacy Tags detected. Please migrate your old `c` tags to our new `c` tags that follows better conventions! See classes under net.fabricmc.fabric.api.tag.convention.v1 package for all tags. - NOTE: Many tags have been moved around or renamed. Some new ones were added so please review the new tags. - And make sure you follow tag conventions for new tags! The convention is `c` with nouns generally being plural and adjectives being singular. - You can disable this message in Fabric API's properties config file by setting log-legacy-tag-warnings to "SILENCED" or see individual tags with "DEV_VERBOSE". - """); - - // Print out all legacy tags when desired. - boolean isConfigSetToVerbose = - LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.DEV_VERBOSE - || LOG_LEGACY_WARNING_MODE == LOG_WARNING_MODES.PROD_VERBOSE; - - if (isConfigSetToVerbose) { - stringBuilder.append("\nLegacy tags:"); - - for (TagKey tagKey : legacyTags) { - stringBuilder.append("\n ").append(tagKey).append(" -> ").append(LEGACY_C_TAGS.get(tagKey)); + List> legacyTags = new ObjectArrayList<>(); + DynamicRegistryManager.Immutable dynamicRegistries = server.getRegistryManager(); + + // We only care about vanilla registries + dynamicRegistries.streamAllRegistries().forEach(registryEntry -> { + if (registryEntry.key().getValue().getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) { + registryEntry.value().streamTags().forEach(tagKey -> { + // Grab legacy tags we migrated or discourage + if (LEGACY_C_TAGS.containsKey(tagKey)) { + legacyTags.add(tagKey); } + }); + } + }); + + if (!legacyTags.isEmpty()) { + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append(""" + \n Dev warning - Legacy Tags detected. Please migrate your old `c` tags to our new `c` tags that follows better conventions! + See classes under net.fabricmc.fabric.api.tag.convention.v2 package for all tags. + + NOTE: Many tags have been moved around or renamed. Some new ones were added so please review the new tags. + And make sure you follow tag conventions for new tags! The convention is `c` with nouns generally being plural and adjectives being singular. + You can disable this message by this system property to your runs: `-Dfabric-tag-conventions-v1.legacyTagWarning=SILENCED`. + To see individual legacy tags found, set the system property to `-Dfabric-tag-conventions-v1.legacyTagWarning=DEV_VERBOSE` instead. Default is `DEV_SHORT`. + """); + + // Print out all legacy tags when desired. + boolean isConfigSetToVerbose = LOG_LEGACY_WARNING_MODE.equalsIgnoreCase(LOG_WARNING_MODES.DEV_VERBOSE.name()); + + if (isConfigSetToVerbose) { + stringBuilder.append("\nLegacy tags and their replacement:"); + + for (TagKey tagKey : legacyTags) { + stringBuilder.append("\n ").append(tagKey).append(" -> ").append(LEGACY_C_TAGS.get(tagKey)); } - - LOGGER.warn(stringBuilder.toString()); } + + LOGGER.warn(stringBuilder.toString()); } }); } @@ -220,4 +225,7 @@ private static AbstractMap.SimpleEntry, TagKey> createMapEntry( private static TagKey createTagKeyUnderC(RegistryKey> registryKey, String tagId) { return TagKey.of(registryKey, new Identifier(TagUtil.C_TAG_NAMESPACE, tagId)); } + private static TagKey createTagKeyUnderFabric(RegistryKey> registryKey, String tagId) { + return TagKey.of(registryKey, new Identifier(TagUtil.FABRIC_TAG_NAMESPACE, tagId)); + } } diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java index 3466cfaec0..6f2c4dbff8 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java @@ -42,17 +42,13 @@ private TagRegistration(RegistryKey> registry) { registryKey = registry; } - /** - * @deprecated Please use {@link net.fabricmc.fabric.impl.tag.convention.TagRegistration#registerFabric} - */ + @Deprecated public TagKey registerFabric(String tagId) { return TagKey.of(registryKey, new Identifier("fabric", tagId)); } - /** - * @deprecated Please use {@link net.fabricmc.fabric.impl.tag.convention.TagRegistration#registerCommon} - */ - public TagKey registerCommon(String tagId) { + @Deprecated + public TagKey registerC(String tagId) { return TagKey.of(registryKey, new Identifier("c", tagId)); } } diff --git a/deprecated/fabric-convention-tags-v1/src/main/resources/fabric.mod.json b/deprecated/fabric-convention-tags-v1/src/main/resources/fabric.mod.json index 9fd425d38c..7907713ada 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/resources/fabric.mod.json +++ b/deprecated/fabric-convention-tags-v1/src/main/resources/fabric.mod.json @@ -15,6 +15,11 @@ "authors": [ "FabricMC" ], + "entrypoints": { + "main": [ + "net.fabricmc.fabric.impl.tag.convention.ConventionLogWarnings" + ] + }, "depends": { "fabricloader": ">=0.4.0", "minecraft": ">=1.18.2" diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/axes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/axes.json new file mode 100644 index 0000000000..a22514f66a --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/axes.json @@ -0,0 +1,5 @@ +{ + "replace": false, + "values": [ + ] +} \ No newline at end of file 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 02bf504a8d..a0657f79a8 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 @@ -19,7 +19,7 @@ import net.minecraft.registry.tag.TagKey; import net.minecraft.world.biome.Biome; -import net.fabricmc.fabric.impl.tag.convention.TagRegistration; +import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; /** * See {@link net.minecraft.registry.tag.BiomeTags} for vanilla tags. diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java index dff43da7f4..3fdcff1f5c 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java @@ -19,7 +19,7 @@ import net.minecraft.block.entity.BlockEntityType; import net.minecraft.registry.tag.TagKey; -import net.fabricmc.fabric.impl.tag.convention.TagRegistration; +import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; public final class ConventionalBlockEntityTypeTags { private ConventionalBlockEntityTypeTags() { 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 a323ad67d3..81349cb66f 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 @@ -20,7 +20,7 @@ import net.minecraft.block.Block; import net.minecraft.registry.tag.TagKey; -import net.fabricmc.fabric.impl.tag.convention.TagRegistration; +import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; /** * See {@link net.minecraft.registry.tag.BlockTags} for vanilla tags. diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java index 0effbc030e..7343b2a8cc 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java @@ -19,7 +19,7 @@ import net.minecraft.enchantment.Enchantment; import net.minecraft.registry.tag.TagKey; -import net.fabricmc.fabric.impl.tag.convention.TagRegistration; +import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; public final class ConventionalEnchantmentTags { private ConventionalEnchantmentTags() { diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java index b03cfa371e..919b1327c6 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java @@ -19,7 +19,7 @@ import net.minecraft.entity.EntityType; import net.minecraft.registry.tag.TagKey; -import net.fabricmc.fabric.impl.tag.convention.TagRegistration; +import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; /** * See {@link net.minecraft.registry.tag.EntityTypeTags} for vanilla tags. diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalFluidTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalFluidTags.java index 9f9b3950b6..a55063c6ec 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalFluidTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalFluidTags.java @@ -19,7 +19,7 @@ import net.minecraft.fluid.Fluid; import net.minecraft.registry.tag.TagKey; -import net.fabricmc.fabric.impl.tag.convention.TagRegistration; +import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; /** * See {@link net.minecraft.registry.tag.FluidTags} for vanilla tags. 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 8ffaeeea07..6a8e15d638 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 @@ -19,7 +19,7 @@ import net.minecraft.item.Item; import net.minecraft.registry.tag.TagKey; -import net.fabricmc.fabric.impl.tag.convention.TagRegistration; +import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; /** * See {@link net.minecraft.registry.tag.ItemTags} for vanilla tags. diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java similarity index 97% rename from fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java rename to fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java index eb07620e7e..681137b985 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.fabricmc.fabric.impl.tag.convention; +package net.fabricmc.fabric.impl.tag.convention.v2; import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntityType; diff --git a/fabric-convention-tags-v2/src/main/resources/fabric.mod.json b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json index d1a98c416d..c0e6b3e19e 100644 --- a/fabric-convention-tags-v2/src/main/resources/fabric.mod.json +++ b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json @@ -15,11 +15,6 @@ "authors": [ "FabricMC" ], - "entrypoints": { - "main": [ - "net.fabricmc.fabric.impl.tag.convention.ConventionLogWarnings" - ] - }, "depends": { "fabricloader": ">=0.14.22", "minecraft": ">=1.20.1", From 2f2e86ce81d07b9af28fb703161dc85b7d3dbd2e Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 16:06:56 -0400 Subject: [PATCH 044/123] fixed styling issues --- .../impl/tag/convention/ConventionLogWarnings.java | 7 ++++--- .../datagen/generators/EnchantmentTagGenerator.java | 3 --- .../datagen/generators/EntityTypeTagGenerator.java | 2 -- .../datagen/generators/FluidTagGenerator.java | 3 --- .../convention/v2/ConventionalBlockEntityTypeTags.java | 4 ++-- .../api/tag/convention/v2/ConventionalBlockTags.java | 10 +++++----- 6 files changed, 11 insertions(+), 18 deletions(-) diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 2a767d3718..4f8c9f4704 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -41,7 +41,6 @@ import net.fabricmc.loader.api.FabricLoader; public class ConventionLogWarnings implements ModInitializer { - public static final String LOG_LEGACY_WARNING_MODE = System.getProperty("fabric-tag-conventions-v1.legacyTagWarning", LOG_WARNING_MODES.DEV_SHORT.name()); public enum LOG_WARNING_MODES { SILENCED, @@ -160,8 +159,9 @@ public enum LOG_WARNING_MODES { @Override public void onInitialize() { - if (FabricLoader.getInstance().isDevelopmentEnvironment() && !LOG_LEGACY_WARNING_MODE.equalsIgnoreCase(LOG_WARNING_MODES.SILENCED.name())) + if (FabricLoader.getInstance().isDevelopmentEnvironment() && !LOG_LEGACY_WARNING_MODE.equalsIgnoreCase(LOG_WARNING_MODES.SILENCED.name())) { setupLegacyTagWarning(); + } } private static void setupLegacyTagWarning() { @@ -187,7 +187,7 @@ private static void setupLegacyTagWarning() { stringBuilder.append(""" \n Dev warning - Legacy Tags detected. Please migrate your old `c` tags to our new `c` tags that follows better conventions! See classes under net.fabricmc.fabric.api.tag.convention.v2 package for all tags. - + NOTE: Many tags have been moved around or renamed. Some new ones were added so please review the new tags. And make sure you follow tag conventions for new tags! The convention is `c` with nouns generally being plural and adjectives being singular. You can disable this message by this system property to your runs: `-Dfabric-tag-conventions-v1.legacyTagWarning=SILENCED`. @@ -225,6 +225,7 @@ private static AbstractMap.SimpleEntry, TagKey> createMapEntry( private static TagKey createTagKeyUnderC(RegistryKey> registryKey, String tagId) { return TagKey.of(registryKey, new Identifier(TagUtil.C_TAG_NAMESPACE, tagId)); } + private static TagKey createTagKeyUnderFabric(RegistryKey> registryKey, String tagId) { return TagKey.of(registryKey, new Identifier(TagUtil.FABRIC_TAG_NAMESPACE, tagId)); } diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java index ec6ace2774..d72aa8637a 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java @@ -18,11 +18,8 @@ import java.util.concurrent.CompletableFuture; -import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.Enchantments; import net.minecraft.registry.RegistryWrapper; -import net.minecraft.registry.tag.TagKey; -import net.minecraft.util.Identifier; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java index 4bbb55ec15..0b7667f708 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java @@ -20,8 +20,6 @@ import net.minecraft.entity.EntityType; import net.minecraft.registry.RegistryWrapper; -import net.minecraft.registry.tag.TagKey; -import net.minecraft.util.Identifier; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java index c39e3dc6b7..b175fccd20 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java @@ -18,11 +18,8 @@ import java.util.concurrent.CompletableFuture; -import net.minecraft.fluid.Fluid; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.FluidTags; -import net.minecraft.registry.tag.TagKey; -import net.minecraft.util.Identifier; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java index 3fdcff1f5c..5aab3a19ca 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java @@ -28,8 +28,8 @@ private ConventionalBlockEntityTypeTags() { /** * Blocks should be included in this tag if their movement can cause serious issues such as world corruption * upon being moved, such as chunk loaders or pipes, for mods that move block entities. - *

- * See also the equivalent block tag: {@link ConventionalBlockTags#RELOCATION_NOT_SUPPORTED} + * + *

See also the equivalent block tag: {@link ConventionalBlockTags#RELOCATION_NOT_SUPPORTED} */ public static final TagKey> RELOCATION_NOT_SUPPORTED = register("relocation_not_supported"); 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 81349cb66f..62e74afcfc 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 @@ -52,15 +52,15 @@ private ConventionalBlockTags() { // Related to budding mechanics /** - * For blocks that are similar to amethyst where their budding block produces buds and cluster blocks + * For blocks that are similar to amethyst where their budding block produces buds and cluster blocks. */ public static final TagKey BUDDING_BLOCKS = register("budding_blocks"); /** - * For blocks that are similar to amethyst where they have buddings forming from budding blocks + * For blocks that are similar to amethyst where they have buddings forming from budding blocks. */ public static final TagKey BUDS = register("buds"); /** - * For blocks that are similar to amethyst where they have clusters forming from budding blocks + * For blocks that are similar to amethyst where they have clusters forming from budding blocks. */ public static final TagKey CLUSTERS = register("clusters"); @@ -100,8 +100,8 @@ private ConventionalBlockTags() { * Blocks should be included in this tag if their movement can cause serious issues such as world corruption * upon being moved, such as chunk loaders or pipes, for mods that move blocks but do not respect * {@link AbstractBlock.AbstractBlockState#getPistonBehavior}. - *

- * See also the equivalent block entity type tag: {@link ConventionalBlockEntityTypeTags#RELOCATION_NOT_SUPPORTED} + * + *

See also the equivalent block entity type tag: {@link ConventionalBlockEntityTypeTags#RELOCATION_NOT_SUPPORTED} */ public static final TagKey RELOCATION_NOT_SUPPORTED = register("relocation_not_supported"); From cb30f41af4dbc897aac50632510a83c090ea7b92 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 16:41:04 -0400 Subject: [PATCH 045/123] fixed missing module lifecycle --- fabric-convention-tags-v2/src/main/resources/fabric.mod.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fabric-convention-tags-v2/src/main/resources/fabric.mod.json b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json index c0e6b3e19e..a3b5c9c119 100644 --- a/fabric-convention-tags-v2/src/main/resources/fabric.mod.json +++ b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json @@ -22,5 +22,7 @@ }, "mixins": [], "description": "Contains common tags used by mods for better inter-mod compatibility.", - "custom": {} + "custom": { + "fabric-api:module-lifecycle": "stable" + } } From 06baabd54c7ce566b39ae6fabdc5ebc867c851eb Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 16:41:35 -0400 Subject: [PATCH 046/123] reran gendata and log workstation replacements --- .../tag/convention/ConventionLogWarnings.java | 5 ++++- .../resources/data/c/tags/blocks/chests.json | 5 ++--- .../data/c/tags/blocks/chests/wooden.json | 11 +++++++++++ .../resources/data/c/tags/blocks/stones.json | 13 +++++++++++++ .../data/c/tags/items/barrels/wooden.json | 4 ++++ .../resources/data/c/tags/items/chests.json | 5 ++--- .../data/c/tags/items/chests/wooden.json | 15 +++++++++++++++ .../data/c/tags/items/dusts/glowstone.json | 6 +++++- .../data/c/tags/items/dusts/redstone.json | 6 +++++- .../resources/data/c/tags/items/rods.json | 10 ++++++++++ .../c/tags/items/{axes.json => rods/wooden.json} | 1 + .../resources/data/c/tags/items/stones.json | 13 +++++++++++++ .../resources/data/c/tags/items/strings.json | 10 ++++++++++ 13 files changed, 95 insertions(+), 9 deletions(-) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests/wooden.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/stones.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests/wooden.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{axes.json => rods/wooden.json} (65%) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/stones.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/strings.json diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 4f8c9f4704..ec8aa356f6 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -133,7 +133,10 @@ public enum LOG_WARNING_MODES { createMapEntry(RegistryKeys.BLOCK, "glass_pane", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.GLASS_PANES), createMapEntry(RegistryKeys.BLOCK, "immobile", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.RELOCATION_NOT_SUPPORTED), createMapEntry(RegistryKeys.BLOCK, "stone", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.STONES), - createMapEntry(RegistryKeys.BLOCK, "workbench", "workbenches"), + createMapEntry(RegistryKeys.BLOCK, "workbench", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.VILLAGER_JOB_SITES), + createMapEntry(RegistryKeys.BLOCK, "workbenches", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.VILLAGER_JOB_SITES), + createMapEntry(RegistryKeys.BLOCK, "workstation", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.VILLAGER_JOB_SITES), + createMapEntry(RegistryKeys.BLOCK, "workstations", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.VILLAGER_JOB_SITES), createMapEntry(RegistryKeys.ITEM, "axes", ItemTags.AXES), createMapEntry(RegistryKeys.ITEM, "pickaxes", ItemTags.PICKAXES), diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests.json index 7acec0eccc..9ec42a987a 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests.json @@ -1,8 +1,7 @@ { "replace": false, "values": [ - "minecraft:chest", - "minecraft:ender_chest", - "minecraft:trapped_chest" + "#c:chests/wooden", + "minecraft:ender_chest" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests/wooden.json new file mode 100644 index 0000000000..6f6d1cfd05 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests/wooden.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:chest", + "minecraft:trapped_chest", + { + "id": "#c:wooden_chests", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/stones.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/stones.json new file mode 100644 index 0000000000..66ca59d9af --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/stones.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "minecraft:andesite", + "minecraft:diorite", + "minecraft:granite", + "minecraft:infested_stone", + "minecraft:stone", + "minecraft:deepslate", + "minecraft:infested_deepslate", + "minecraft:tuff" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels/wooden.json index a9c1763f11..604c5cde27 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels/wooden.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels/wooden.json @@ -2,6 +2,10 @@ "replace": false, "values": [ "minecraft:barrel", + { + "id": "#c:wooden_barrels", + "required": false + }, { "id": "#c:wooden_barrels", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests.json index 7acec0eccc..9ec42a987a 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests.json @@ -1,8 +1,7 @@ { "replace": false, "values": [ - "minecraft:chest", - "minecraft:ender_chest", - "minecraft:trapped_chest" + "#c:chests/wooden", + "minecraft:ender_chest" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests/wooden.json new file mode 100644 index 0000000000..a877dfe096 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests/wooden.json @@ -0,0 +1,15 @@ +{ + "replace": false, + "values": [ + "minecraft:chest", + "minecraft:trapped_chest", + { + "id": "#c:wooden_chests", + "required": false + }, + { + "id": "#c:wooden_chests", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/glowstone.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/glowstone.json index 08d35494bb..dcc3a1fa1e 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/glowstone.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/glowstone.json @@ -1,6 +1,10 @@ { "replace": false, "values": [ - "minecraft:glowstone_dust" + "minecraft:glowstone_dust", + { + "id": "#c:glowstone_dusts", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/redstone.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/redstone.json index 2703f553aa..a0b3cfe802 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/redstone.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/redstone.json @@ -1,6 +1,10 @@ { "replace": false, "values": [ - "minecraft:redstone" + "minecraft:redstone", + { + "id": "#c:redstone_dusts", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json new file mode 100644 index 0000000000..e1e19f2959 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + { + "id": "#c:rods/wooden", + "required": false + }, + "minecraft:blaze_rod" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/axes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/wooden.json similarity index 65% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/axes.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/wooden.json index a22514f66a..390efe6924 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/axes.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/wooden.json @@ -1,5 +1,6 @@ { "replace": false, "values": [ + "minecraft:stick" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/stones.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/stones.json new file mode 100644 index 0000000000..66ca59d9af --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/stones.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "minecraft:andesite", + "minecraft:diorite", + "minecraft:granite", + "minecraft:infested_stone", + "minecraft:stone", + "minecraft:deepslate", + "minecraft:infested_deepslate", + "minecraft:tuff" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/strings.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/strings.json new file mode 100644 index 0000000000..86c603831b --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/strings.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:string", + { + "id": "#c:strings", + "required": false + } + ] +} \ No newline at end of file From f2bffc6714bd4429073cc8f97989c342e5f6a3b3 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 16:47:07 -0400 Subject: [PATCH 047/123] Proper stone javadocs --- .../fabric/api/tag/convention/v2/ConventionalBlockTags.java | 6 ++++-- .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) 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 62e74afcfc..11e59c6fd9 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 @@ -30,8 +30,10 @@ public final class ConventionalBlockTags { private ConventionalBlockTags() { } - // Natural stone-like blocks that can spawn in-world such as Stone, Granite, Diorite, and others. - // Not variations like Stone Bricks or Diorite Slabs. + /** + * Natural stone-like blocks that can spawn in-world such as Stone, Granite, Diorite, and others. + * Not variations like Stone Bricks or Diorite Slabs. + */ public static final TagKey STONES = register("stones"); // Ores and ingots - broad categories 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 6a8e15d638..4652d155ec 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 @@ -29,8 +29,10 @@ public final class ConventionalItemTags { private ConventionalItemTags() { } - // Natural stone-like blocks that can spawn in-world such as Stone, Granite, Diorite, and others. - // Not variations like Stone Bricks or Diorite Slabs. + /** + * Natural stone-like blocks that can spawn in-world such as Stone, Granite, Diorite, and others. + * Not variations like Stone Bricks or Diorite Slabs. + */ public static final TagKey STONES = register("stones"); // Tool tags From 1b08fd91a71ec202591e52529d6292a8cc2e304d Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 16:55:55 -0400 Subject: [PATCH 048/123] Fixed namespace in test warnings and renamed enchantment tags --- .../fabric/impl/tag/convention/ConventionLogWarnings.java | 4 ++++ .../api/tag/convention/v2/ConventionalEnchantmentTags.java | 4 ++-- .../fabricmc/fabric/test/tag/convention/v2/TagUtilTest.java | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index ec8aa356f6..06d43a4440 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -36,6 +36,7 @@ import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBiomeTags; import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalEnchantmentTags; import net.fabricmc.fabric.api.tag.convention.v1.ConventionalItemTags; import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; import net.fabricmc.loader.api.FabricLoader; @@ -104,6 +105,9 @@ public enum LOG_WARNING_MODES { createMapEntry(ConventionalItemTags.BOWS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BOWS_TOOLS), createMapEntry(ConventionalItemTags.SHIELDS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SHIELDS_TOOLS), + createMapEntry(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS), + createMapEntry(ConventionalEnchantmentTags.INCREASES_ENTITY_DROPS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.INCREASES_ENTITY_DROPS), + createMapEntry(ConventionalBiomeTags.IN_NETHER, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_NETHER), createMapEntry(ConventionalBiomeTags.IN_THE_END, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_THE_END), createMapEntry(ConventionalBiomeTags.IN_OVERWORLD, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_OVERWORLD), diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java index 7343b2a8cc..a8d003a5ae 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java @@ -29,12 +29,12 @@ private ConventionalEnchantmentTags() { * A tag containing enchantments that increase the amount or * quality of drops from blocks, such as {@link net.minecraft.enchantment.Enchantments#FORTUNE}. */ - public static final TagKey INCREASES_BLOCK_DROPS = register("fortune"); + public static final TagKey INCREASES_BLOCK_DROPS = register("increase_block_drops"); /** * A tag containing enchantments that increase the amount or * quality of drops from entities, such as {@link net.minecraft.enchantment.Enchantments#LOOTING}. */ - public static final TagKey INCREASES_ENTITY_DROPS = register("looting"); + public static final TagKey INCREASES_ENTITY_DROPS = register("increase_entity_drops"); /** * For enchantments that increase the damage dealt by an item. */ 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 7fd4c91650..0adb84fe80 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 @@ -38,7 +38,7 @@ public class TagUtilTest implements ModInitializer { public void onInitialize() { ServerLifecycleEvents.SERVER_STARTED.register(server -> { if (!TagUtil.isIn(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS, Enchantments.FORTUNE)) { - throw new AssertionError("Failed to find fortune in common:fortune!"); + throw new AssertionError("Failed to find fortune in c:increase_block_drops!"); } if (TagUtil.isIn(ConventionalBiomeTags.IS_OVERWORLD, server.getRegistryManager().get(RegistryKeys.BIOME).get(BiomeKeys.BADLANDS))) { @@ -47,11 +47,11 @@ public void onInitialize() { // If this fails, the tag is missing a biome or the util is broken if (!TagUtil.isIn(server.getRegistryManager(), ConventionalBiomeTags.IS_OVERWORLD, server.getRegistryManager().get(RegistryKeys.BIOME).get(BiomeKeys.BADLANDS))) { - throw new AssertionError("Failed to find an overworld biome (%s) in common:in_overworld!".formatted(BiomeKeys.BADLANDS)); + throw new AssertionError("Failed to find an overworld biome (%s) in c:in_overworld!".formatted(BiomeKeys.BADLANDS)); } if (!TagUtil.isIn(server.getRegistryManager(), ConventionalBlockTags.ORES, Blocks.DIAMOND_ORE)) { - throw new AssertionError("Failed to find diamond ore in common:ores!"); + throw new AssertionError("Failed to find diamond ore in c:ores!"); } //Success! From 2f4f70eedcc2244f990216988a98a262be3b7c56 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 16:56:13 -0400 Subject: [PATCH 049/123] Removed ingot from block ore comments --- .../fabric/api/tag/convention/v2/ConventionalBlockTags.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/ConventionalBlockTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java index 11e59c6fd9..f153df7c36 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 @@ -36,10 +36,10 @@ private ConventionalBlockTags() { */ public static final TagKey STONES = register("stones"); - // Ores and ingots - broad categories + // Ores - broad categories public static final TagKey ORES = register("ores"); - // Ores and ingots - vanilla instances + // Ores - vanilla instances public static final TagKey QUARTZ_ORES = register("ores/quartz"); public static final TagKey NETHERITE_SCRAP_ORES = register("ores/netherite_scrap"); From ba6a34ef00052fd778083b97fe611060fbf20bd8 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 17:08:51 -0400 Subject: [PATCH 050/123] updated log message --- .../fabric/impl/tag/convention/ConventionLogWarnings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 06d43a4440..8da647f283 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -192,7 +192,7 @@ private static void setupLegacyTagWarning() { if (!legacyTags.isEmpty()) { StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append(""" - \n Dev warning - Legacy Tags detected. Please migrate your old `c` tags to our new `c` tags that follows better conventions! + \n Dev warning - Legacy Tags detected. Please migrate your old tags to our new format that follows better conventions! See classes under net.fabricmc.fabric.api.tag.convention.v2 package for all tags. NOTE: Many tags have been moved around or renamed. Some new ones were added so please review the new tags. From f59ec6357b74e5a5443ed4328db856a3d675d474 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 18:44:02 -0400 Subject: [PATCH 051/123] Fixed tag entry ordering --- .../datagen/generators/BlockTagGenerator.java | 116 +++++++++--------- .../datagen/generators/ItemTagGenerator.java | 74 +++++------ .../resources/data/c/tags/blocks/dyed.json | 22 ++-- .../data/c/tags/blocks/glass_blocks.json | 24 ++-- .../data/c/tags/blocks/glass_panes.json | 22 ++-- .../resources/data/c/tags/blocks/ores.json | 16 +-- .../c/tags/blocks/sandstone/red_blocks.json | 2 +- .../blocks/sandstone/uncolored_blocks.json | 2 +- .../data/c/tags/blocks/shulker_boxes.json | 20 +-- .../resources/data/c/tags/blocks/stones.json | 8 +- ...fortune.json => increase_block_drops.json} | 0 ...ooting.json => increase_entity_drops.json} | 0 .../c/tags/items/buckets/entity_water.json | 4 +- .../resources/data/c/tags/items/dyed.json | 22 ++-- .../resources/data/c/tags/items/dyes.json | 32 ++--- .../resources/data/c/tags/items/gems.json | 2 +- .../data/c/tags/items/glass_blocks.json | 24 ++-- .../data/c/tags/items/glass_panes.json | 22 ++-- .../resources/data/c/tags/items/ores.json | 20 +-- .../resources/data/c/tags/items/potions.json | 4 +- .../data/c/tags/items/raw_blocks.json | 4 +- .../data/c/tags/items/raw_materials.json | 10 +- .../resources/data/c/tags/items/rods.json | 4 +- .../c/tags/items/sandstone/red_blocks.json | 2 +- .../items/sandstone/uncolored_blocks.json | 2 +- .../data/c/tags/items/shulker_boxes.json | 20 +-- .../resources/data/c/tags/items/stones.json | 8 +- .../resources/data/c/tags/items/tools.json | 8 +- .../convention/v2/ConventionalBlockTags.java | 3 +- .../convention/v2/ConventionalItemTags.java | 3 +- 30 files changed, 246 insertions(+), 254 deletions(-) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/{fortune.json => increase_block_drops.json} (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/{looting.json => increase_entity_drops.json} (100%) 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 a58b23cb0e..5a1b4625b2 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 @@ -57,30 +57,28 @@ public BlockTagGenerator(FabricDataOutput output, CompletableFuture STONES = register("stones"); 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 4652d155ec..19d7ce5c47 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 @@ -30,8 +30,7 @@ private ConventionalItemTags() { } /** - * Natural stone-like blocks that can spawn in-world such as Stone, Granite, Diorite, and others. - * Not variations like Stone Bricks or Diorite Slabs. + * Natural stone-like blocks that can be used as a base ingredient in recipes that takes stone. */ public static final TagKey STONES = register("stones"); From 6bfa40883756c8a7197d0cc6eaedf29ead73dfca Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 19:33:43 -0400 Subject: [PATCH 052/123] Put Wooden rods first Blaze rod tag added to help show people that more rods can be added to rods folder --- .../fabric/impl/tag/convention/ConventionLogWarnings.java | 1 + .../tag/convention/datagen/generators/ItemTagGenerator.java | 6 ++++-- .../src/generated/resources/data/c/tags/items/rods.json | 5 ++++- .../generated/resources/data/c/tags/items/rods/blaze.json | 6 ++++++ .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 1 + 5 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/blaze.json diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 8da647f283..60d80a7f5e 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -160,6 +160,7 @@ public enum LOG_WARNING_MODES { createMapEntry(RegistryKeys.ITEM, "redstone_dusts", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.REDSTONE_DUSTS), createMapEntry(RegistryKeys.ITEM, "stone", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.STONES), createMapEntry(RegistryKeys.ITEM, "string", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.STRINGS), + createMapEntry(RegistryKeys.ITEM, "sticks", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WOODEN_RODS), createMapEntry(RegistryKeys.ITEM, "wooden_rods", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.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 91d96c3c13..39f6948c40 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 @@ -267,9 +267,11 @@ private void generateOtherTags() { .add(Items.STRING); getOrCreateTagBuilder(ConventionalItemTags.WOODEN_RODS) .add(Items.STICK); + getOrCreateTagBuilder(ConventionalItemTags.BLAZE_RODS) + .add(Items.BLAZE_ROD); getOrCreateTagBuilder(ConventionalItemTags.RODS) - .add(Items.BLAZE_ROD) - .addOptionalTag(ConventionalItemTags.WOODEN_RODS); + .addOptionalTag(ConventionalItemTags.WOODEN_RODS) + .addOptionalTag(ConventionalItemTags.BLAZE_RODS); } private void generateDyedTags() { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json index c958e942ad..109344658e 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json @@ -1,10 +1,13 @@ { "replace": false, "values": [ - "minecraft:blaze_rod", { "id": "#c:rods/wooden", "required": false + }, + { + "id": "#c:rods/blaze", + "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/blaze.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/blaze.json new file mode 100644 index 0000000000..8cbb7bc030 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/blaze.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:blaze_rod" + ] +} \ No newline at end of file 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 19d7ce5c47..177b78970f 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 @@ -169,6 +169,7 @@ private ConventionalItemTags() { public static final TagKey STRINGS = register("strings"); public static final TagKey RODS = register("rods"); public static final TagKey WOODEN_RODS = register("rods/wooden"); + public static final TagKey BLAZE_RODS = register("rods/blaze"); private static TagKey register(String tagID) { return TagRegistration.ITEM_TAG_REGISTRATION.registerC(tagID); From d4b21578118c9f5d927ed5e2983afc402c03a12f Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 24 Sep 2023 08:50:26 -0400 Subject: [PATCH 053/123] Adjusted param names and field names --- .../impl/tag/convention/ConventionLogWarnings.java | 4 ++-- .../fabric/test/tag/client/v1/ClientTagTest.java | 2 +- .../generators/EnchantmentTagGenerator.java | 4 ++-- .../tag/convention/v2/ConventionalBiomeTags.java | 4 ++-- .../v2/ConventionalBlockEntityTypeTags.java | 4 ++-- .../tag/convention/v2/ConventionalBlockTags.java | 6 +++--- .../convention/v2/ConventionalEnchantmentTags.java | 8 ++++---- .../convention/v2/ConventionalEntityTypeTags.java | 4 ++-- .../tag/convention/v2/ConventionalFluidTags.java | 4 ++-- .../tag/convention/v2/ConventionalItemTags.java | 6 +++--- .../impl/tag/convention/v2/TagRegistration.java | 14 +++++++------- .../fabric/test/tag/convention/v2/TagUtilTest.java | 2 +- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 60d80a7f5e..538007d63f 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -105,8 +105,8 @@ public enum LOG_WARNING_MODES { createMapEntry(ConventionalItemTags.BOWS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BOWS_TOOLS), createMapEntry(ConventionalItemTags.SHIELDS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SHIELDS_TOOLS), - createMapEntry(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS), - createMapEntry(ConventionalEnchantmentTags.INCREASES_ENTITY_DROPS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.INCREASES_ENTITY_DROPS), + createMapEntry(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.INCREASE_BLOCK_DROPS), + createMapEntry(ConventionalEnchantmentTags.INCREASES_ENTITY_DROPS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.INCREASE_ENTITY_DROPS), createMapEntry(ConventionalBiomeTags.IN_NETHER, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_NETHER), createMapEntry(ConventionalBiomeTags.IN_THE_END, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_THE_END), diff --git a/fabric-client-tags-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java b/fabric-client-tags-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java index a33aebfde3..1e29b730f1 100644 --- a/fabric-client-tags-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java +++ b/fabric-client-tags-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java @@ -51,7 +51,7 @@ public void onInitializeClient() { } ClientLifecycleEvents.CLIENT_STARTED.register(client -> { - if (ClientTags.getOrCreateLocalTag(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS) == null) { + if (ClientTags.getOrCreateLocalTag(ConventionalEnchantmentTags.INCREASE_BLOCK_DROPS) == null) { throw new AssertionError("Expected to load c:fortune, but it was not found!"); } diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java index d72aa8637a..1bcc41ffc1 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java @@ -32,9 +32,9 @@ public EnchantmentTagGenerator(FabricDataOutput output, CompletableFuture IS_DEEP_OCEAN = register("is_deep_ocean"); public static final TagKey IS_SHALLOW_OCEAN = register("is_shallow_ocean"); - private static TagKey register(String tagID) { - return TagRegistration.BIOME_TAG_REGISTRATION.registerC(tagID); + private static TagKey register(String tagId) { + return TagRegistration.BIOME_TAG.registerC(tagId); } } diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java index 5aab3a19ca..1285dc1f35 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java @@ -33,7 +33,7 @@ private ConventionalBlockEntityTypeTags() { */ public static final TagKey> RELOCATION_NOT_SUPPORTED = register("relocation_not_supported"); - private static TagKey> register(String tagID) { - return TagRegistration.BLOCK_ENTITY_TYPE_TAG_REGISTRATION.registerC(tagID); + private static TagKey> register(String tagId) { + return TagRegistration.BLOCK_ENTITY_TYPE_TAG.registerC(tagId); } } 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 d150960bb2..1589ce679c 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 @@ -31,7 +31,7 @@ private ConventionalBlockTags() { } /** - * Natural stone-like blocks that can be used as a base ingredient in recipes that takes stone. + * Natural stone-like blocks that can be used as a base ingredient in recipes that take stone. */ public static final TagKey STONES = register("stones"); @@ -106,7 +106,7 @@ private ConventionalBlockTags() { */ public static final TagKey RELOCATION_NOT_SUPPORTED = register("relocation_not_supported"); - private static TagKey register(String tagID) { - return TagRegistration.BLOCK_TAG_REGISTRATION.registerC(tagID); + private static TagKey register(String tagId) { + return TagRegistration.BLOCK_TAG.registerC(tagId); } } diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java index a8d003a5ae..d6723cc0e0 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java @@ -29,12 +29,12 @@ private ConventionalEnchantmentTags() { * A tag containing enchantments that increase the amount or * quality of drops from blocks, such as {@link net.minecraft.enchantment.Enchantments#FORTUNE}. */ - public static final TagKey INCREASES_BLOCK_DROPS = register("increase_block_drops"); + public static final TagKey INCREASE_BLOCK_DROPS = register("increase_block_drops"); /** * A tag containing enchantments that increase the amount or * quality of drops from entities, such as {@link net.minecraft.enchantment.Enchantments#LOOTING}. */ - public static final TagKey INCREASES_ENTITY_DROPS = register("increase_entity_drops"); + public static final TagKey INCREASE_ENTITY_DROPS = register("increase_entity_drops"); /** * For enchantments that increase the damage dealt by an item. */ @@ -48,7 +48,7 @@ private ConventionalEnchantmentTags() { */ public static final TagKey ENTITY_DEFENSE_ENHANCEMENT = register("entity_defense_enhancement"); - private static TagKey register(String tagID) { - return TagRegistration.ENCHANTMENT_TAG_REGISTRATION.registerC(tagID); + private static TagKey register(String tagId) { + return TagRegistration.ENCHANTMENT_TAG.registerC(tagId); } } diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java index 919b1327c6..dde091bdc0 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java @@ -43,7 +43,7 @@ private ConventionalEntityTypeTags() { */ public static final TagKey> CAPTURING_NOT_SUPPORTED = register("capturing_not_supported"); - private static TagKey> register(String tagID) { - return TagRegistration.ENTITY_TYPE_TAG_REGISTRATION.registerC(tagID); + private static TagKey> register(String tagId) { + return TagRegistration.ENTITY_TYPE_TAG.registerC(tagId); } } diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalFluidTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalFluidTags.java index a55063c6ec..852813b956 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalFluidTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalFluidTags.java @@ -34,7 +34,7 @@ private ConventionalFluidTags() { public static final TagKey MILK = register("milk"); public static final TagKey HONEY = register("honey"); - private static TagKey register(String tagID) { - return TagRegistration.FLUID_TAG_REGISTRATION.registerC(tagID); + private static TagKey register(String tagId) { + return TagRegistration.FLUID_TAG.registerC(tagId); } } 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 177b78970f..a9f1acc23c 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 @@ -30,7 +30,7 @@ private ConventionalItemTags() { } /** - * Natural stone-like blocks that can be used as a base ingredient in recipes that takes stone. + * Natural stone-like blocks that can be used as a base ingredient in recipes that take stone. */ public static final TagKey STONES = register("stones"); @@ -171,7 +171,7 @@ private ConventionalItemTags() { public static final TagKey WOODEN_RODS = register("rods/wooden"); public static final TagKey BLAZE_RODS = register("rods/blaze"); - private static TagKey register(String tagID) { - return TagRegistration.ITEM_TAG_REGISTRATION.registerC(tagID); + private static TagKey register(String tagId) { + return TagRegistration.ITEM_TAG.registerC(tagId); } } diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java index 681137b985..2a2d2a8d44 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java @@ -32,13 +32,13 @@ import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; public record TagRegistration(RegistryKey> registryKey) { - public static final TagRegistration ITEM_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.ITEM); - public static final TagRegistration BLOCK_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.BLOCK); - public static final TagRegistration> BLOCK_ENTITY_TYPE_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.BLOCK_ENTITY_TYPE); - public static final TagRegistration BIOME_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.BIOME); - public static final TagRegistration FLUID_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.FLUID); - public static final TagRegistration> ENTITY_TYPE_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.ENTITY_TYPE); - public static final TagRegistration ENCHANTMENT_TAG_REGISTRATION = new TagRegistration<>(RegistryKeys.ENCHANTMENT); + public static final TagRegistration ITEM_TAG = new TagRegistration<>(RegistryKeys.ITEM); + public static final TagRegistration BLOCK_TAG = new TagRegistration<>(RegistryKeys.BLOCK); + public static final TagRegistration> BLOCK_ENTITY_TYPE_TAG = new TagRegistration<>(RegistryKeys.BLOCK_ENTITY_TYPE); + public static final TagRegistration BIOME_TAG = new TagRegistration<>(RegistryKeys.BIOME); + public static final TagRegistration FLUID_TAG = new TagRegistration<>(RegistryKeys.FLUID); + public static final TagRegistration> ENTITY_TYPE_TAG = new TagRegistration<>(RegistryKeys.ENTITY_TYPE); + public static final TagRegistration ENCHANTMENT_TAG = new TagRegistration<>(RegistryKeys.ENCHANTMENT); public TagKey registerFabric(String tagId) { return TagKey.of(registryKey, new Identifier(TagUtil.FABRIC_TAG_NAMESPACE, tagId)); 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 0adb84fe80..5ee4331b20 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 @@ -37,7 +37,7 @@ public class TagUtilTest implements ModInitializer { @Override public void onInitialize() { ServerLifecycleEvents.SERVER_STARTED.register(server -> { - if (!TagUtil.isIn(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS, Enchantments.FORTUNE)) { + if (!TagUtil.isIn(ConventionalEnchantmentTags.INCREASE_BLOCK_DROPS, Enchantments.FORTUNE)) { throw new AssertionError("Failed to find fortune in c:increase_block_drops!"); } From 8f5097b60711cc1e5d8e4481e8ccffa20070d0a5 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 24 Sep 2023 08:50:43 -0400 Subject: [PATCH 054/123] removed unneeded dep in datagen --- fabric-data-generation-api-v1/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fabric-data-generation-api-v1/build.gradle b/fabric-data-generation-api-v1/build.gradle index 43e85537b9..8df7b38a23 100644 --- a/fabric-data-generation-api-v1/build.gradle +++ b/fabric-data-generation-api-v1/build.gradle @@ -6,8 +6,7 @@ moduleDependencies(project, [ 'fabric-networking-api-v1', 'fabric-resource-conditions-api-v1', 'fabric-item-group-api-v1', - 'fabric-recipe-api-v1', - 'fabric-convention-tags-v2' + 'fabric-recipe-api-v1' ]) dependencies { From a7c0d63d05ff9f4d3e9a4c9406516f559c4785af Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 24 Sep 2023 08:58:03 -0400 Subject: [PATCH 055/123] Adjusted tag field names to be more readable --- .../tag/convention/ConventionLogWarnings.java | 46 ++++++------- .../datagen/generators/BiomeTagGenerator.java | 66 +++++++++---------- .../datagen/generators/BlockTagGenerator.java | 50 +++++++------- .../datagen/generators/ItemTagGenerator.java | 18 ++--- .../convention/v2/ConventionalBiomeTags.java | 26 ++++---- .../convention/v2/ConventionalBlockTags.java | 18 ++--- .../convention/v2/ConventionalItemTags.java | 18 ++--- 7 files changed, 121 insertions(+), 121 deletions(-) diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 538007d63f..5d316d5af0 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -58,26 +58,26 @@ public enum LOG_WARNING_MODES { createMapEntry(ConventionalBlockTags.MOVEMENT_RESTRICTED, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.RELOCATION_NOT_SUPPORTED), createMapEntry(ConventionalBlockTags.QUARTZ_ORES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.QUARTZ_ORES), createMapEntry(ConventionalBlockTags.WOODEN_BARRELS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.WOODEN_BARRELS), - createMapEntry(ConventionalBlockTags.SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.BLOCKS_SANDSTONE), - createMapEntry(ConventionalBlockTags.SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.STAIRS_SANDSTONE), - createMapEntry(ConventionalBlockTags.SANDSTONE_SLABS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.SLABS_SANDSTONE), - createMapEntry(ConventionalBlockTags.RED_SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.RED_BLOCKS_SANDSTONE), - createMapEntry(ConventionalBlockTags.RED_SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.RED_STAIRS_SANDSTONE), - createMapEntry(ConventionalBlockTags.RED_SANDSTONE_SLABS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.RED_SLABS_SANDSTONE), - createMapEntry(ConventionalBlockTags.UNCOLORED_SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.UNCOLORED_BLOCKS_SANDSTONE), - createMapEntry(ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.UNCOLORED_STAIRS_SANDSTONE), - createMapEntry(ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.UNCOLORED_SLABS_SANDSTONE), + createMapEntry(ConventionalBlockTags.SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.SANDSTONE_BLOCKS), + createMapEntry(ConventionalBlockTags.SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.SANDSTONE_STAIRS), + createMapEntry(ConventionalBlockTags.SANDSTONE_SLABS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.SANDSTONE_SLABS), + createMapEntry(ConventionalBlockTags.RED_SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.RED_SANDSTONE_BLOCKS), + createMapEntry(ConventionalBlockTags.RED_SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.RED_SANDSTONE_STAIRS), + createMapEntry(ConventionalBlockTags.RED_SANDSTONE_SLABS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.RED_SANDSTONE_SLABS), + createMapEntry(ConventionalBlockTags.UNCOLORED_SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.UNCOLORED_SANDSTONE_BLOCKS), + createMapEntry(ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS), + createMapEntry(ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS), createMapEntry(ConventionalItemTags.QUARTZ_ORES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.QUARTZ_ORES), createMapEntry(ConventionalItemTags.WOODEN_BARRELS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WOODEN_BARRELS), - createMapEntry(ConventionalItemTags.SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BLOCKS_SANDSTONE), - createMapEntry(ConventionalItemTags.SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.STAIRS_SANDSTONE), - createMapEntry(ConventionalItemTags.SANDSTONE_SLABS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SLABS_SANDSTONE), - createMapEntry(ConventionalItemTags.RED_SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RED_BLOCKS_SANDSTONE), - createMapEntry(ConventionalItemTags.RED_SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RED_STAIRS_SANDSTONE), - createMapEntry(ConventionalItemTags.RED_SANDSTONE_SLABS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RED_SLABS_SANDSTONE), - createMapEntry(ConventionalItemTags.UNCOLORED_SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.UNCOLORED_BLOCKS_SANDSTONE), - createMapEntry(ConventionalItemTags.UNCOLORED_SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.UNCOLORED_STAIRS_SANDSTONE), + createMapEntry(ConventionalItemTags.SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SANDSTONE_BLOCKS), + createMapEntry(ConventionalItemTags.SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SANDSTONE_STAIRS), + createMapEntry(ConventionalItemTags.SANDSTONE_SLABS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SANDSTONE_SLABS), + createMapEntry(ConventionalItemTags.RED_SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RED_SANDSTONE_BLOCKS), + createMapEntry(ConventionalItemTags.RED_SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RED_SANDSTONE_STAIRS), + createMapEntry(ConventionalItemTags.RED_SANDSTONE_SLABS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RED_SANDSTONE_SLABS), + createMapEntry(ConventionalItemTags.UNCOLORED_SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.UNCOLORED_SANDSTONE_BLOCKS), + createMapEntry(ConventionalItemTags.UNCOLORED_SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.UNCOLORED_SANDSTONE_STAIRS), createMapEntry(ConventionalItemTags.BLACK_DYES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BLACK_DYES), createMapEntry(ConventionalItemTags.BLUE_DYES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BLUE_DYES), createMapEntry(ConventionalItemTags.BROWN_DYES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BROWN_DYES), @@ -119,12 +119,12 @@ public enum LOG_WARNING_MODES { createMapEntry(ConventionalBiomeTags.CLIMATE_DRY, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_DRY), createMapEntry(ConventionalBiomeTags.VEGETATION_DENSE, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_VEGETATION_DENSE), createMapEntry(ConventionalBiomeTags.VEGETATION_SPARSE, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_VEGETATION_SPARSE), - createMapEntry(ConventionalBiomeTags.TREE_CONIFEROUS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.CONIFEROUS_IS_TREE), - createMapEntry(ConventionalBiomeTags.TREE_DECIDUOUS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.DECIDUOUS_IS_TREE), - createMapEntry(ConventionalBiomeTags.TREE_JUNGLE, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.JUNGLE_IS_TREE), - createMapEntry(ConventionalBiomeTags.TREE_SAVANNA, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.SAVANNA_IS_TREE), - createMapEntry(ConventionalBiomeTags.MOUNTAIN_PEAK, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.PEAK_IS_MOUNTAIN), - createMapEntry(ConventionalBiomeTags.MOUNTAIN_SLOPE, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.SLOPE_IS_MOUNTAIN), + createMapEntry(ConventionalBiomeTags.TREE_CONIFEROUS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_CONIFEROUS_TREE), + createMapEntry(ConventionalBiomeTags.TREE_DECIDUOUS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_DECIDUOUS_TREE), + createMapEntry(ConventionalBiomeTags.TREE_JUNGLE, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_JUNGLE_TREE), + createMapEntry(ConventionalBiomeTags.TREE_SAVANNA, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_SAVANNA_TREE), + createMapEntry(ConventionalBiomeTags.MOUNTAIN_PEAK, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_MOUNTAIN_PEAK), + createMapEntry(ConventionalBiomeTags.MOUNTAIN_SLOPE, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_MOUNTAIN_SLOPE), createMapEntry(ConventionalBiomeTags.END_ISLANDS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_END_ISLAND), createMapEntry(ConventionalBiomeTags.NETHER_FORESTS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_NETHER_FOREST), createMapEntry(ConventionalBiomeTags.FLOWER_FORESTS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_FLOWER_FOREST), 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 0c580b7e0e..210fceb7c2 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 @@ -171,7 +171,7 @@ private void generateOtherBiomeTypes() { } private void generateClimateAndVegetationTags() { - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_COLD) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD_OVERWORLD) .add(BiomeKeys.SNOWY_PLAINS) .add(BiomeKeys.SNOWY_SLOPES) .add(BiomeKeys.GROVE) @@ -180,9 +180,9 @@ private void generateClimateAndVegetationTags() { .add(BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA).add(BiomeKeys.OLD_GROWTH_PINE_TAIGA) .addOptionalTag(ConventionalBiomeTags.IS_ICY); getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD) - .addTag(ConventionalBiomeTags.OVERWORLD_IS_COLD); + .addTag(ConventionalBiomeTags.IS_COLD_OVERWORLD); - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_TEMPERATE) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD) .add(BiomeKeys.FOREST) .add(BiomeKeys.SUNFLOWER_PLAINS) .add(BiomeKeys.SWAMP) @@ -194,9 +194,9 @@ private void generateClimateAndVegetationTags() { .add(BiomeKeys.MEADOW) .add(BiomeKeys.PLAINS); getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE) - .addTag(ConventionalBiomeTags.OVERWORLD_IS_TEMPERATE); + .addTag(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD); - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_HOT) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT_OVERWORLD) .addOptionalTag(ConventionalBiomeTags.IS_JUNGLE) .addOptionalTag(ConventionalBiomeTags.IS_SAVANNA) .addOptionalTag(ConventionalBiomeTags.IS_DESERT) @@ -205,49 +205,49 @@ private void generateClimateAndVegetationTags() { .addOptionalTag(ConventionalBiomeTags.IS_MUSHROOM) .addOptionalTag(ConventionalBiomeTags.IS_NETHER); getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT) - .addTag(ConventionalBiomeTags.OVERWORLD_IS_HOT); + .addTag(ConventionalBiomeTags.IS_HOT_OVERWORLD); - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_WET) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET_OVERWORLD) .addOptionalTag(ConventionalBiomeTags.IS_AQUATIC) .addOptionalTag(ConventionalBiomeTags.IS_SWAMP) .add(BiomeKeys.LUSH_CAVES) .addOptionalTag(ConventionalBiomeTags.IS_JUNGLE); getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET) - .addTag(ConventionalBiomeTags.OVERWORLD_IS_WET); + .addTag(ConventionalBiomeTags.IS_WET_OVERWORLD); - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_DRY) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_DRY_OVERWORLD) .addOptionalTag(ConventionalBiomeTags.IS_NETHER) .addOptionalTag(ConventionalBiomeTags.IS_BADLANDS) .addOptionalTag(ConventionalBiomeTags.IS_DESERT) .addOptionalTag(ConventionalBiomeTags.IS_SAVANNA); getOrCreateTagBuilder(ConventionalBiomeTags.IS_DRY) - .addTag(ConventionalBiomeTags.OVERWORLD_IS_DRY); + .addTag(ConventionalBiomeTags.IS_DRY_OVERWORLD); - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_VEGETATION_DENSE) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD) .addOptionalTag(ConventionalBiomeTags.IS_JUNGLE) .add(BiomeKeys.DARK_FOREST); getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE) - .addOptionalTag(ConventionalBiomeTags.OVERWORLD_IS_VEGETATION_DENSE); - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_VEGETATION_SPARSE) + .addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD) .addOptionalTag(ConventionalBiomeTags.IS_SAVANNA) .addOptionalTag(ConventionalBiomeTags.IS_DESERT) .addOptionalTag(ConventionalBiomeTags.IS_DEAD) .addOptionalTag(ConventionalBiomeTags.IS_WASTELAND); getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE) - .addOptionalTag(ConventionalBiomeTags.OVERWORLD_IS_VEGETATION_SPARSE); - getOrCreateTagBuilder(ConventionalBiomeTags.CONIFEROUS_IS_TREE) + .addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_CONIFEROUS_TREE) .add(BiomeKeys.GROVE) .addOptionalTag(ConventionalBiomeTags.IS_TAIGA); - getOrCreateTagBuilder(ConventionalBiomeTags.DECIDUOUS_IS_TREE) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_DECIDUOUS_TREE) .add(BiomeKeys.FOREST) .add(BiomeKeys.WINDSWEPT_FOREST) .add(BiomeKeys.FLOWER_FOREST) .add(BiomeKeys.BIRCH_FOREST) .add(BiomeKeys.DARK_FOREST) .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST); - getOrCreateTagBuilder(ConventionalBiomeTags.JUNGLE_IS_TREE) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_JUNGLE_TREE) .addOptionalTag(ConventionalBiomeTags.IS_JUNGLE); - getOrCreateTagBuilder(ConventionalBiomeTags.SAVANNA_IS_TREE) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_SAVANNA_TREE) .addOptionalTag(ConventionalBiomeTags.IS_SAVANNA); getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLORAL) .add(BiomeKeys.SUNFLOWER_PLAINS) @@ -257,11 +257,11 @@ private void generateClimateAndVegetationTags() { } private void generateTerrainDescriptorTags() { - getOrCreateTagBuilder(ConventionalBiomeTags.PEAK_IS_MOUNTAIN) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_MOUNTAIN_PEAK) .add(BiomeKeys.FROZEN_PEAKS) .add(BiomeKeys.JAGGED_PEAKS) .add(BiomeKeys.STONY_PEAKS); - getOrCreateTagBuilder(ConventionalBiomeTags.SLOPE_IS_MOUNTAIN) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_MOUNTAIN_SLOPE) .add(BiomeKeys.SNOWY_SLOPES); getOrCreateTagBuilder(ConventionalBiomeTags.IS_AQUATIC) .addOptionalTag(ConventionalBiomeTags.IS_OCEAN) @@ -289,19 +289,19 @@ private void generateBackwardsCompatTags() { getOrCreateTagBuilder(ConventionalBiomeTags.IS_THE_END).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "in_the_end")); getOrCreateTagBuilder(ConventionalBiomeTags.IS_OVERWORLD).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "in_the_overworld")); getOrCreateTagBuilder(ConventionalBiomeTags.IS_CAVE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "caves")); - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_COLD).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_cold")); - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_TEMPERATE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_temperate")); - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_HOT).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_hot")); - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_WET).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_wet")); - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_DRY).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_dry")); - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_VEGETATION_DENSE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "vegetation_dense")); - getOrCreateTagBuilder(ConventionalBiomeTags.OVERWORLD_IS_VEGETATION_SPARSE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "vegetation_sparse")); - getOrCreateTagBuilder(ConventionalBiomeTags.CONIFEROUS_IS_TREE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_coniferous")); - getOrCreateTagBuilder(ConventionalBiomeTags.DECIDUOUS_IS_TREE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_deciduous")); - getOrCreateTagBuilder(ConventionalBiomeTags.JUNGLE_IS_TREE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_jungle")); - getOrCreateTagBuilder(ConventionalBiomeTags.SAVANNA_IS_TREE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_savanna")); - getOrCreateTagBuilder(ConventionalBiomeTags.PEAK_IS_MOUNTAIN).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "mountain_peak")); - getOrCreateTagBuilder(ConventionalBiomeTags.SLOPE_IS_MOUNTAIN).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "mountain_slope")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD_OVERWORLD).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_cold")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_temperate")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT_OVERWORLD).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_hot")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET_OVERWORLD).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_wet")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_DRY_OVERWORLD).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_dry")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "vegetation_dense")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "vegetation_sparse")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_CONIFEROUS_TREE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_coniferous")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_DECIDUOUS_TREE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_deciduous")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_JUNGLE_TREE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_jungle")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_SAVANNA_TREE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_savanna")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_MOUNTAIN_PEAK).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "mountain_peak")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_MOUNTAIN_SLOPE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "mountain_slope")); getOrCreateTagBuilder(ConventionalBiomeTags.IS_END_ISLAND).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "end_islands")); getOrCreateTagBuilder(ConventionalBiomeTags.IS_NETHER_FOREST).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "nether_forests")); getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLOWER_FOREST).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "flower_forests")); 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 5a1b4625b2..62e519b72a 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 @@ -108,39 +108,39 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { } private void generateSandstoneTags() { - getOrCreateTagBuilder(ConventionalBlockTags.BLOCKS_SANDSTONE) - .addOptionalTag(ConventionalBlockTags.UNCOLORED_BLOCKS_SANDSTONE) - .addOptionalTag(ConventionalBlockTags.RED_BLOCKS_SANDSTONE); - getOrCreateTagBuilder(ConventionalBlockTags.SLABS_SANDSTONE) - .addOptionalTag(ConventionalBlockTags.UNCOLORED_SLABS_SANDSTONE) - .addOptionalTag(ConventionalBlockTags.RED_SLABS_SANDSTONE); - getOrCreateTagBuilder(ConventionalBlockTags.STAIRS_SANDSTONE) - .addOptionalTag(ConventionalBlockTags.UNCOLORED_STAIRS_SANDSTONE) - .addOptionalTag(ConventionalBlockTags.RED_STAIRS_SANDSTONE); - - getOrCreateTagBuilder(ConventionalBlockTags.RED_BLOCKS_SANDSTONE) + getOrCreateTagBuilder(ConventionalBlockTags.SANDSTONE_BLOCKS) + .addOptionalTag(ConventionalBlockTags.UNCOLORED_SANDSTONE_BLOCKS) + .addOptionalTag(ConventionalBlockTags.RED_SANDSTONE_BLOCKS); + getOrCreateTagBuilder(ConventionalBlockTags.SANDSTONE_SLABS) + .addOptionalTag(ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS) + .addOptionalTag(ConventionalBlockTags.RED_SANDSTONE_SLABS); + getOrCreateTagBuilder(ConventionalBlockTags.SANDSTONE_STAIRS) + .addOptionalTag(ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS) + .addOptionalTag(ConventionalBlockTags.RED_SANDSTONE_STAIRS); + + getOrCreateTagBuilder(ConventionalBlockTags.RED_SANDSTONE_BLOCKS) .add(Blocks.RED_SANDSTONE) .add(Blocks.CUT_RED_SANDSTONE) .add(Blocks.SMOOTH_RED_SANDSTONE) .add(Blocks.CHISELED_RED_SANDSTONE); - getOrCreateTagBuilder(ConventionalBlockTags.RED_SLABS_SANDSTONE) + getOrCreateTagBuilder(ConventionalBlockTags.RED_SANDSTONE_SLABS) .add(Blocks.RED_SANDSTONE_SLAB) .add(Blocks.CUT_RED_SANDSTONE_SLAB) .add(Blocks.SMOOTH_RED_SANDSTONE_SLAB); - getOrCreateTagBuilder(ConventionalBlockTags.RED_STAIRS_SANDSTONE) + getOrCreateTagBuilder(ConventionalBlockTags.RED_SANDSTONE_STAIRS) .add(Blocks.RED_SANDSTONE_STAIRS) .add(Blocks.SMOOTH_RED_SANDSTONE_STAIRS); - getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_BLOCKS_SANDSTONE) + getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_SANDSTONE_BLOCKS) .add(Blocks.SANDSTONE) .add(Blocks.CUT_SANDSTONE) .add(Blocks.SMOOTH_SANDSTONE) .add(Blocks.CHISELED_SANDSTONE); - getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_SLABS_SANDSTONE) + getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS) .add(Blocks.SANDSTONE_SLAB) .add(Blocks.CUT_SANDSTONE_SLAB) .add(Blocks.SMOOTH_SANDSTONE_SLAB); - getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_STAIRS_SANDSTONE) + getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS) .add(Blocks.SANDSTONE_STAIRS) .add(Blocks.SMOOTH_SANDSTONE_STAIRS); } @@ -341,14 +341,14 @@ private void generateBackwardsCompatTags() { getOrCreateTagBuilder(ConventionalBlockTags.QUARTZ_ORES).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "quartz_ores")); getOrCreateTagBuilder(ConventionalBlockTags.WOODEN_BARRELS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "wooden_barrels")); getOrCreateTagBuilder(ConventionalBlockTags.WOODEN_CHESTS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "wooden_chests")); - getOrCreateTagBuilder(ConventionalBlockTags.BLOCKS_SANDSTONE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "sandstone_blocks")); - getOrCreateTagBuilder(ConventionalBlockTags.SLABS_SANDSTONE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "sandstone_slabs")); - getOrCreateTagBuilder(ConventionalBlockTags.STAIRS_SANDSTONE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "sandstone_stairs")); - getOrCreateTagBuilder(ConventionalBlockTags.RED_BLOCKS_SANDSTONE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "red_sandstone_blocks")); - getOrCreateTagBuilder(ConventionalBlockTags.RED_SLABS_SANDSTONE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "red_sandstone_slabs")); - getOrCreateTagBuilder(ConventionalBlockTags.RED_STAIRS_SANDSTONE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "red_sandstone_stairs")); - getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_BLOCKS_SANDSTONE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "uncolored_sandstone_blocks")); - getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_SLABS_SANDSTONE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "uncolored_sandstone_slabs")); - getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_STAIRS_SANDSTONE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "uncolored_sandstone_stairs")); + getOrCreateTagBuilder(ConventionalBlockTags.SANDSTONE_BLOCKS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "sandstone_blocks")); + getOrCreateTagBuilder(ConventionalBlockTags.SANDSTONE_SLABS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "sandstone_slabs")); + getOrCreateTagBuilder(ConventionalBlockTags.SANDSTONE_STAIRS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "sandstone_stairs")); + getOrCreateTagBuilder(ConventionalBlockTags.RED_SANDSTONE_BLOCKS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "red_sandstone_blocks")); + getOrCreateTagBuilder(ConventionalBlockTags.RED_SANDSTONE_SLABS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "red_sandstone_slabs")); + getOrCreateTagBuilder(ConventionalBlockTags.RED_SANDSTONE_STAIRS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "red_sandstone_stairs")); + getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_SANDSTONE_BLOCKS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "uncolored_sandstone_blocks")); + getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "uncolored_sandstone_slabs")); + getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "uncolored_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 39f6948c40..7f4384fc58 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 @@ -65,15 +65,15 @@ private void copyItemTags() { copy(ConventionalBlockTags.BUDS, ConventionalItemTags.BUDS); copy(ConventionalBlockTags.CLUSTERS, ConventionalItemTags.CLUSTERS); - copy(ConventionalBlockTags.BLOCKS_SANDSTONE, ConventionalItemTags.BLOCKS_SANDSTONE); - copy(ConventionalBlockTags.SLABS_SANDSTONE, ConventionalItemTags.SLABS_SANDSTONE); - copy(ConventionalBlockTags.STAIRS_SANDSTONE, ConventionalItemTags.STAIRS_SANDSTONE); - copy(ConventionalBlockTags.RED_BLOCKS_SANDSTONE, ConventionalItemTags.RED_BLOCKS_SANDSTONE); - copy(ConventionalBlockTags.RED_SLABS_SANDSTONE, ConventionalItemTags.RED_SLABS_SANDSTONE); - copy(ConventionalBlockTags.RED_STAIRS_SANDSTONE, ConventionalItemTags.RED_STAIRS_SANDSTONE); - copy(ConventionalBlockTags.UNCOLORED_BLOCKS_SANDSTONE, ConventionalItemTags.UNCOLORED_BLOCKS_SANDSTONE); - copy(ConventionalBlockTags.UNCOLORED_SLABS_SANDSTONE, ConventionalItemTags.UNCOLORED_SLABS_SANDSTONE); - copy(ConventionalBlockTags.UNCOLORED_STAIRS_SANDSTONE, ConventionalItemTags.UNCOLORED_STAIRS_SANDSTONE); + copy(ConventionalBlockTags.SANDSTONE_BLOCKS, ConventionalItemTags.SANDSTONE_BLOCKS); + copy(ConventionalBlockTags.SANDSTONE_SLABS, ConventionalItemTags.SANDSTONE_SLABS); + copy(ConventionalBlockTags.SANDSTONE_STAIRS, ConventionalItemTags.SANDSTONE_STAIRS); + copy(ConventionalBlockTags.RED_SANDSTONE_BLOCKS, ConventionalItemTags.RED_SANDSTONE_BLOCKS); + copy(ConventionalBlockTags.RED_SANDSTONE_SLABS, ConventionalItemTags.RED_SANDSTONE_SLABS); + copy(ConventionalBlockTags.RED_SANDSTONE_STAIRS, ConventionalItemTags.RED_SANDSTONE_STAIRS); + copy(ConventionalBlockTags.UNCOLORED_SANDSTONE_BLOCKS, ConventionalItemTags.UNCOLORED_SANDSTONE_BLOCKS); + copy(ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS, ConventionalItemTags.UNCOLORED_SANDSTONE_SLABS); + copy(ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS, ConventionalItemTags.UNCOLORED_SANDSTONE_STAIRS); } private void generateDyeTags() { 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 83131bc9c6..f0c5a90ca2 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 @@ -82,34 +82,34 @@ private ConventionalBiomeTags() { public static final TagKey IS_MOUNTAIN = register("is_mountain"); public static final TagKey IS_HOT = register("is_hot"); - public static final TagKey OVERWORLD_IS_HOT = register("is_hot/overworld"); + public static final TagKey IS_HOT_OVERWORLD = register("is_hot/overworld"); public static final TagKey IS_TEMPERATE = register("is_temperate"); - public static final TagKey OVERWORLD_IS_TEMPERATE = register("is_temperate/overworld"); + public static final TagKey IS_TEMPERATE_OVERWORLD = register("is_temperate/overworld"); public static final TagKey IS_COLD = register("is_cold"); - public static final TagKey OVERWORLD_IS_COLD = register("is_cold/overworld"); + public static final TagKey IS_COLD_OVERWORLD = register("is_cold/overworld"); public static final TagKey IS_WET = register("is_wet"); - public static final TagKey OVERWORLD_IS_WET = register("is_wet/overworld"); + public static final TagKey IS_WET_OVERWORLD = register("is_wet/overworld"); public static final TagKey IS_DRY = register("is_dry"); - public static final TagKey OVERWORLD_IS_DRY = register("is_dry/overworld"); + public static final TagKey IS_DRY_OVERWORLD = register("is_dry/overworld"); public static final TagKey IS_VEGETATION_SPARSE = register("is_sparse_vegetation"); - public static final TagKey OVERWORLD_IS_VEGETATION_SPARSE = register("is_sparse_vegetation/overworld"); + public static final TagKey IS_VEGETATION_SPARSE_OVERWORLD = register("is_sparse_vegetation/overworld"); public static final TagKey IS_VEGETATION_DENSE = register("is_dense_vegetation"); - public static final TagKey OVERWORLD_IS_VEGETATION_DENSE = register("is_dense_vegetation/overworld"); + public static final TagKey IS_VEGETATION_DENSE_OVERWORLD = register("is_dense_vegetation/overworld"); - public static final TagKey CONIFEROUS_IS_TREE = register("is_tree/coniferous"); - public static final TagKey SAVANNA_IS_TREE = register("is_tree/savanna"); - public static final TagKey JUNGLE_IS_TREE = register("is_tree/jungle"); - public static final TagKey DECIDUOUS_IS_TREE = register("is_tree/deciduous"); + public static final TagKey IS_CONIFEROUS_TREE = register("is_tree/coniferous"); + public static final TagKey IS_SAVANNA_TREE = register("is_tree/savanna"); + public static final TagKey IS_JUNGLE_TREE = register("is_tree/jungle"); + public static final TagKey IS_DECIDUOUS_TREE = register("is_tree/deciduous"); public static final TagKey IS_VOID = register("is_void"); - public static final TagKey PEAK_IS_MOUNTAIN = register("is_mountain/peak"); - public static final TagKey SLOPE_IS_MOUNTAIN = register("is_mountain/slope"); + public static final TagKey IS_MOUNTAIN_PEAK = register("is_mountain/peak"); + public static final TagKey IS_MOUNTAIN_SLOPE = register("is_mountain/slope"); /** * Biomes consisting primarily of water. */ 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 1589ce679c..830972f780 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 @@ -68,15 +68,15 @@ private ConventionalBlockTags() { public static final TagKey VILLAGER_JOB_SITES = register("villager_job_sites"); // Sandstone - public static final TagKey BLOCKS_SANDSTONE = register("sandstone/blocks"); - public static final TagKey SLABS_SANDSTONE = register("sandstone/slabs"); - public static final TagKey STAIRS_SANDSTONE = register("sandstone/stairs"); - public static final TagKey RED_BLOCKS_SANDSTONE = register("sandstone/red_blocks"); - public static final TagKey RED_SLABS_SANDSTONE = register("sandstone/red_slabs"); - public static final TagKey RED_STAIRS_SANDSTONE = register("sandstone/red_stairs"); - public static final TagKey UNCOLORED_BLOCKS_SANDSTONE = register("sandstone/uncolored_blocks"); - public static final TagKey UNCOLORED_SLABS_SANDSTONE = register("sandstone/uncolored_slabs"); - public static final TagKey UNCOLORED_STAIRS_SANDSTONE = register("sandstone/uncolored_stairs"); + public static final TagKey SANDSTONE_BLOCKS = register("sandstone/blocks"); + public static final TagKey SANDSTONE_SLABS = register("sandstone/slabs"); + public static final TagKey SANDSTONE_STAIRS = register("sandstone/stairs"); + public static final TagKey RED_SANDSTONE_BLOCKS = register("sandstone/red_blocks"); + public static final TagKey RED_SANDSTONE_SLABS = register("sandstone/red_slabs"); + public static final TagKey RED_SANDSTONE_STAIRS = register("sandstone/red_stairs"); + public static final TagKey UNCOLORED_SANDSTONE_BLOCKS = register("sandstone/uncolored_blocks"); + public static final TagKey UNCOLORED_SANDSTONE_SLABS = register("sandstone/uncolored_slabs"); + public static final TagKey UNCOLORED_SANDSTONE_STAIRS = register("sandstone/uncolored_stairs"); // Blocks created with dyes public static final TagKey DYED = register("dyed"); 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 a9f1acc23c..36deb24d42 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 @@ -117,15 +117,15 @@ private ConventionalItemTags() { public static final TagKey VILLAGER_JOB_SITES = register("villager_job_sites"); // Sandstone - public static final TagKey BLOCKS_SANDSTONE = register("sandstone/blocks"); - public static final TagKey SLABS_SANDSTONE = register("sandstone/slabs"); - public static final TagKey STAIRS_SANDSTONE = register("sandstone/stairs"); - public static final TagKey RED_BLOCKS_SANDSTONE = register("sandstone/red_blocks"); - public static final TagKey RED_SLABS_SANDSTONE = register("sandstone/red_slabs"); - public static final TagKey RED_STAIRS_SANDSTONE = register("sandstone/red_stairs"); - public static final TagKey UNCOLORED_BLOCKS_SANDSTONE = register("sandstone/uncolored_blocks"); - public static final TagKey UNCOLORED_SLABS_SANDSTONE = register("sandstone/uncolored_slabs"); - public static final TagKey UNCOLORED_STAIRS_SANDSTONE = register("sandstone/uncolored_stairs"); + public static final TagKey SANDSTONE_BLOCKS = register("sandstone/blocks"); + public static final TagKey SANDSTONE_SLABS = register("sandstone/slabs"); + public static final TagKey SANDSTONE_STAIRS = register("sandstone/stairs"); + public static final TagKey RED_SANDSTONE_BLOCKS = register("sandstone/red_blocks"); + public static final TagKey RED_SANDSTONE_SLABS = register("sandstone/red_slabs"); + public static final TagKey RED_SANDSTONE_STAIRS = register("sandstone/red_stairs"); + public static final TagKey UNCOLORED_SANDSTONE_BLOCKS = register("sandstone/uncolored_blocks"); + public static final TagKey UNCOLORED_SANDSTONE_SLABS = register("sandstone/uncolored_slabs"); + public static final TagKey UNCOLORED_SANDSTONE_STAIRS = register("sandstone/uncolored_stairs"); // Dyes public static final TagKey DYES = register("dyes"); From 1208f8c626332677c427502acd44b5cdf8bc3e4b Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 30 Sep 2023 12:04:00 -0400 Subject: [PATCH 056/123] Slight cleanup on biome tag datagen class --- .../datagen/generators/BiomeTagGenerator.java | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 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 210fceb7c2..a54202c2aa 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 @@ -63,28 +63,28 @@ private void generateDimensionTags() { // We avoid the vanilla group tags here as mods may add to them without actually spawning them in the overworld getOrCreateTagBuilder(ConventionalBiomeTags.IS_OVERWORLD) .addOptionalTag(BiomeTags.IS_OVERWORLD) - .add(BiomeKeys.RIVER).add(BiomeKeys.FROZEN_RIVER) - .add(BiomeKeys.COLD_OCEAN).add(BiomeKeys.DEEP_COLD_OCEAN) - .add(BiomeKeys.DEEP_FROZEN_OCEAN).add(BiomeKeys.DEEP_OCEAN) - .add(BiomeKeys.DEEP_LUKEWARM_OCEAN).add(BiomeKeys.WARM_OCEAN).add(BiomeKeys.LUKEWARM_OCEAN) - .add(BiomeKeys.FROZEN_OCEAN).add(BiomeKeys.OCEAN) - .add(BiomeKeys.BEACH).add(BiomeKeys.PLAINS) - .add(BiomeKeys.SUNFLOWER_PLAINS).add(BiomeKeys.SNOWY_PLAINS) - .add(BiomeKeys.ICE_SPIKES).add(BiomeKeys.DESERT) - .add(BiomeKeys.FOREST).add(BiomeKeys.FLOWER_FOREST) - .add(BiomeKeys.BIRCH_FOREST).add(BiomeKeys.DARK_FOREST) - .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST).add(BiomeKeys.OLD_GROWTH_PINE_TAIGA) - .add(BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA).add(BiomeKeys.TAIGA) - .add(BiomeKeys.SNOWY_TAIGA).add(BiomeKeys.SAVANNA) - .add(BiomeKeys.SAVANNA_PLATEAU).add(BiomeKeys.WINDSWEPT_HILLS) - .add(BiomeKeys.WINDSWEPT_GRAVELLY_HILLS).add(BiomeKeys.WINDSWEPT_FOREST) - .add(BiomeKeys.WINDSWEPT_SAVANNA).add(BiomeKeys.JUNGLE).add(BiomeKeys.SPARSE_JUNGLE) - .add(BiomeKeys.BAMBOO_JUNGLE).add(BiomeKeys.BADLANDS).add(BiomeKeys.ERODED_BADLANDS) - .add(BiomeKeys.WOODED_BADLANDS).add(BiomeKeys.MEADOW).add(BiomeKeys.GROVE) - .add(BiomeKeys.SNOWY_SLOPES).add(BiomeKeys.FROZEN_PEAKS).add(BiomeKeys.JAGGED_PEAKS) - .add(BiomeKeys.STONY_PEAKS).add(BiomeKeys.MUSHROOM_FIELDS).add(BiomeKeys.DRIPSTONE_CAVES) - .add(BiomeKeys.LUSH_CAVES).add(BiomeKeys.SNOWY_BEACH).add(BiomeKeys.SWAMP).add(BiomeKeys.STONY_SHORE) - .add(BiomeKeys.DEEP_DARK).add(BiomeKeys.MANGROVE_SWAMP) + .add(BiomeKeys.RIVER, BiomeKeys.FROZEN_RIVER) + .add(BiomeKeys.COLD_OCEAN, BiomeKeys.DEEP_COLD_OCEAN) + .add(BiomeKeys.DEEP_FROZEN_OCEAN, BiomeKeys.DEEP_OCEAN) + .add(BiomeKeys.DEEP_LUKEWARM_OCEAN, BiomeKeys.WARM_OCEAN, BiomeKeys.LUKEWARM_OCEAN) + .add(BiomeKeys.FROZEN_OCEAN, BiomeKeys.OCEAN) + .add(BiomeKeys.BEACH, BiomeKeys.PLAINS) + .add(BiomeKeys.SUNFLOWER_PLAINS, BiomeKeys.SNOWY_PLAINS) + .add(BiomeKeys.ICE_SPIKES, BiomeKeys.DESERT) + .add(BiomeKeys.FOREST, BiomeKeys.FLOWER_FOREST) + .add(BiomeKeys.BIRCH_FOREST, BiomeKeys.DARK_FOREST) + .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST, BiomeKeys.OLD_GROWTH_PINE_TAIGA) + .add(BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA, BiomeKeys.TAIGA) + .add(BiomeKeys.SNOWY_TAIGA, BiomeKeys.SAVANNA) + .add(BiomeKeys.SAVANNA_PLATEAU, BiomeKeys.WINDSWEPT_HILLS) + .add(BiomeKeys.WINDSWEPT_GRAVELLY_HILLS, BiomeKeys.WINDSWEPT_FOREST) + .add(BiomeKeys.WINDSWEPT_SAVANNA, BiomeKeys.JUNGLE, BiomeKeys.SPARSE_JUNGLE) + .add(BiomeKeys.BAMBOO_JUNGLE, BiomeKeys.BADLANDS, BiomeKeys.ERODED_BADLANDS) + .add(BiomeKeys.WOODED_BADLANDS, BiomeKeys.MEADOW, BiomeKeys.GROVE) + .add(BiomeKeys.SNOWY_SLOPES, BiomeKeys.FROZEN_PEAKS, BiomeKeys.JAGGED_PEAKS) + .add(BiomeKeys.STONY_PEAKS, BiomeKeys.MUSHROOM_FIELDS, BiomeKeys.DRIPSTONE_CAVES) + .add(BiomeKeys.LUSH_CAVES, BiomeKeys.SNOWY_BEACH, BiomeKeys.SWAMP, BiomeKeys.STONY_SHORE) + .add(BiomeKeys.DEEP_DARK, BiomeKeys.MANGROVE_SWAMP) .add(BiomeKeys.CHERRY_GROVE); } @@ -176,8 +176,8 @@ private void generateClimateAndVegetationTags() { .add(BiomeKeys.SNOWY_SLOPES) .add(BiomeKeys.GROVE) .add(BiomeKeys.JAGGED_PEAKS) - .add(BiomeKeys.TAIGA).add(BiomeKeys.SNOWY_TAIGA) - .add(BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA).add(BiomeKeys.OLD_GROWTH_PINE_TAIGA) + .add(BiomeKeys.TAIGA, BiomeKeys.SNOWY_TAIGA) + .add(BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA, BiomeKeys.OLD_GROWTH_PINE_TAIGA) .addOptionalTag(ConventionalBiomeTags.IS_ICY); getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD) .addTag(ConventionalBiomeTags.IS_COLD_OVERWORLD); From ed9a3008c51ad27314386ca12d61ed76becdf184 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 30 Sep 2023 12:14:59 -0400 Subject: [PATCH 057/123] javadoc for rods and sticks --- .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 7 +++++++ 1 file changed, 7 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 36deb24d42..7304076974 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 @@ -167,7 +167,14 @@ private ConventionalItemTags() { // Other public static final TagKey STRINGS = register("strings"); + /** + * For rod-like materials to be used in recipes. + */ public static final TagKey RODS = register("rods"); + /** + * For stick-like materials to be used in recipes. + * One example is a mod adds stick variants such as Spruce Sticks but would like stick recipes to be able to use it. + */ public static final TagKey WOODEN_RODS = register("rods/wooden"); public static final TagKey BLAZE_RODS = register("rods/blaze"); From c826101da13a4bf89b7fb21da0a58bedfcd8bffa Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 30 Sep 2023 14:48:15 -0400 Subject: [PATCH 058/123] Rename speed enchantment tag and made new one --- .../impl/tag/convention/ConventionLogWarnings.java | 1 + .../datagen/generators/EnchantmentTagGenerator.java | 11 ++++++++++- .../entity_auxiliary_movement_enhancement.json | 7 +++++++ .../enchantment/entity_movement_enhancement.json | 8 -------- .../c/tags/enchantment/entity_speed_enhancement.json | 12 ++++++++++++ .../convention/v2/ConventionalEnchantmentTags.java | 9 +++++++-- 6 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_auxiliary_movement_enhancement.json delete mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_movement_enhancement.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_speed_enhancement.json diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 5d316d5af0..bff3b3626c 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -107,6 +107,7 @@ public enum LOG_WARNING_MODES { createMapEntry(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.INCREASE_BLOCK_DROPS), createMapEntry(ConventionalEnchantmentTags.INCREASES_ENTITY_DROPS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.INCREASE_ENTITY_DROPS), + createMapEntry(ConventionalEnchantmentTags.ENTITY_MOVEMENT_ENHANCEMENT, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.ENTITY_SPEED_ENHANCEMENT), createMapEntry(ConventionalBiomeTags.IN_NETHER, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_NETHER), createMapEntry(ConventionalBiomeTags.IN_THE_END, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_THE_END), diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java index 1bcc41ffc1..e144c9f4a4 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java @@ -24,6 +24,7 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags; +import net.minecraft.util.Identifier; public final class EnchantmentTagGenerator extends FabricTagProvider.EnchantmentTagProvider { public EnchantmentTagGenerator(FabricDataOutput output, CompletableFuture registriesFuture) { @@ -42,10 +43,13 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { .add(Enchantments.SMITE) .add(Enchantments.POWER) .add(Enchantments.SHARPNESS); - getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_MOVEMENT_ENHANCEMENT) + getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_SPEED_ENHANCEMENT) .add(Enchantments.SWIFT_SNEAK) .add(Enchantments.DEPTH_STRIDER) .add(Enchantments.SOUL_SPEED); + getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENT) + .add(Enchantments.FEATHER_FALLING) + .add(Enchantments.FROST_WALKER); getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_DEFENSE_ENHANCEMENT) .add(Enchantments.FEATHER_FALLING) .add(Enchantments.PROTECTION) @@ -53,5 +57,10 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { .add(Enchantments.PROJECTILE_PROTECTION) .add(Enchantments.FIRE_PROTECTION) .add(Enchantments.RESPIRATION); + + // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. + // TODO: Remove backwards compat tag entries in 1.22 + getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_SPEED_ENHANCEMENT) + .addOptionalTag(new Identifier("c", "entity_movement_enhancement")); } } diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_auxiliary_movement_enhancement.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_auxiliary_movement_enhancement.json new file mode 100644 index 0000000000..6cc9b14404 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_auxiliary_movement_enhancement.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:feather_falling", + "minecraft:frost_walker" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_movement_enhancement.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_movement_enhancement.json deleted file mode 100644 index e398c6b107..0000000000 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_movement_enhancement.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:swift_sneak", - "minecraft:depth_strider", - "minecraft:soul_speed" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_speed_enhancement.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_speed_enhancement.json new file mode 100644 index 0000000000..eb38ea8670 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_speed_enhancement.json @@ -0,0 +1,12 @@ +{ + "replace": false, + "values": [ + "minecraft:swift_sneak", + "minecraft:depth_strider", + "minecraft:soul_speed", + { + "id": "#c:entity_movement_enhancement", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java index d6723cc0e0..045b5ccb73 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java @@ -40,9 +40,14 @@ private ConventionalEnchantmentTags() { */ public static final TagKey WEAPON_DAMAGE_ENHANCEMENT = register("weapon_damage_enhancement"); /** - * For enchantments that increase movement speed or otherwise benefit the entity wearing armor enchanted with it. + * For enchantments that increase movement speed for entity wearing armor enchanted with it. */ - public static final TagKey ENTITY_MOVEMENT_ENHANCEMENT = register("entity_movement_enhancement"); + public static final TagKey ENTITY_SPEED_ENHANCEMENT = register("entity_speed_enhancement"); + /** + * For enchantments that applies movement-based benefits unrelated to speed for the entity wearing armor enchanted with it. + * Example: Reducing falling speeds (Feather Falling) or allowing walking on water (Frost Walker) + */ + public static final TagKey ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENT = register("entity_auxiliary_movement_enhancement"); /** * For enchantments that decrease damage taken or otherwise benefit, in regard to damage, the entity wearing armor enchanted with it. */ From 03224106b93381d59184bdf6a936b156ba21dd88 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 30 Sep 2023 14:56:12 -0400 Subject: [PATCH 059/123] Added links to enchantment javadoc --- .../api/tag/convention/v2/ConventionalEnchantmentTags.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java index 045b5ccb73..3ce984bf60 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java @@ -45,7 +45,7 @@ private ConventionalEnchantmentTags() { public static final TagKey ENTITY_SPEED_ENHANCEMENT = register("entity_speed_enhancement"); /** * For enchantments that applies movement-based benefits unrelated to speed for the entity wearing armor enchanted with it. - * Example: Reducing falling speeds (Feather Falling) or allowing walking on water (Frost Walker) + * Example: Reducing falling speeds ({@link net.minecraft.enchantment.Enchantments#FEATHER_FALLING}) or allowing walking on water ({@link net.minecraft.enchantment.Enchantments#FROST_WALKER}) */ public static final TagKey ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENT = register("entity_auxiliary_movement_enhancement"); /** From b8a2a4b258e6e9646689a9e22ab26bf0b4d4b3e8 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 30 Sep 2023 15:25:32 -0400 Subject: [PATCH 060/123] reorder enchantment tag entries to be better representative --- .../generators/EnchantmentTagGenerator.java | 14 +++++++------- .../enchantment/entity_defense_enhancement.json | 4 ++-- .../tags/enchantment/entity_speed_enhancement.json | 2 +- .../enchantment/weapon_damage_enhancement.json | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java index e144c9f4a4..8892ed830f 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java @@ -38,25 +38,25 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { getOrCreateTagBuilder(ConventionalEnchantmentTags.INCREASE_ENTITY_DROPS) .add(Enchantments.LOOTING); getOrCreateTagBuilder(ConventionalEnchantmentTags.WEAPON_DAMAGE_ENHANCEMENT) - .add(Enchantments.BANE_OF_ARTHROPODS) - .add(Enchantments.IMPALING) + .add(Enchantments.SHARPNESS) .add(Enchantments.SMITE) + .add(Enchantments.BANE_OF_ARTHROPODS) .add(Enchantments.POWER) - .add(Enchantments.SHARPNESS); + .add(Enchantments.IMPALING); getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_SPEED_ENHANCEMENT) + .add(Enchantments.SOUL_SPEED) .add(Enchantments.SWIFT_SNEAK) - .add(Enchantments.DEPTH_STRIDER) - .add(Enchantments.SOUL_SPEED); + .add(Enchantments.DEPTH_STRIDER); getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENT) .add(Enchantments.FEATHER_FALLING) .add(Enchantments.FROST_WALKER); getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_DEFENSE_ENHANCEMENT) - .add(Enchantments.FEATHER_FALLING) .add(Enchantments.PROTECTION) .add(Enchantments.BLAST_PROTECTION) .add(Enchantments.PROJECTILE_PROTECTION) .add(Enchantments.FIRE_PROTECTION) - .add(Enchantments.RESPIRATION); + .add(Enchantments.RESPIRATION) + .add(Enchantments.FEATHER_FALLING); // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. // TODO: Remove backwards compat tag entries in 1.22 diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_defense_enhancement.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_defense_enhancement.json index b01fdddc4f..211c5ccd9d 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_defense_enhancement.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_defense_enhancement.json @@ -1,11 +1,11 @@ { "replace": false, "values": [ - "minecraft:feather_falling", "minecraft:protection", "minecraft:blast_protection", "minecraft:projectile_protection", "minecraft:fire_protection", - "minecraft:respiration" + "minecraft:respiration", + "minecraft:feather_falling" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_speed_enhancement.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_speed_enhancement.json index eb38ea8670..0a61372c0f 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_speed_enhancement.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_speed_enhancement.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ + "minecraft:soul_speed", "minecraft:swift_sneak", "minecraft:depth_strider", - "minecraft:soul_speed", { "id": "#c:entity_movement_enhancement", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/weapon_damage_enhancement.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/weapon_damage_enhancement.json index bdef43ba26..581b594c59 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/weapon_damage_enhancement.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/weapon_damage_enhancement.json @@ -1,10 +1,10 @@ { "replace": false, "values": [ - "minecraft:bane_of_arthropods", - "minecraft:impaling", + "minecraft:sharpness", "minecraft:smite", + "minecraft:bane_of_arthropods", "minecraft:power", - "minecraft:sharpness" + "minecraft:impaling" ] } \ No newline at end of file From cee94395634c1701b8e9c5b28af8b4adb5fd134b Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 30 Sep 2023 16:39:21 -0400 Subject: [PATCH 061/123] Fixed checkstyle complaints --- .../convention/datagen/generators/EnchantmentTagGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java index 8892ed830f..bf68c6055b 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java @@ -20,11 +20,11 @@ import net.minecraft.enchantment.Enchantments; import net.minecraft.registry.RegistryWrapper; +import net.minecraft.util.Identifier; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags; -import net.minecraft.util.Identifier; public final class EnchantmentTagGenerator extends FabricTagProvider.EnchantmentTagProvider { public EnchantmentTagGenerator(FabricDataOutput output, CompletableFuture registriesFuture) { From ba5f8c1d8599ec476b0213841eefee61b1dfee21 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 1 Oct 2023 07:22:07 -0400 Subject: [PATCH 062/123] Removed Relocation Entity Type tag and updated spear javadoc --- .../convention/datagen/DatagenEntrypoint.java | 2 - .../BlockEntityTypeTagGenerator.java | 36 ----------------- .../relocation_not_supported.json | 4 -- .../v2/ConventionalBlockEntityTypeTags.java | 39 ------------------- .../convention/v2/ConventionalBlockTags.java | 7 ++-- .../convention/v2/ConventionalItemTags.java | 4 +- 6 files changed, 5 insertions(+), 87 deletions(-) delete mode 100644 fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java delete mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block_entity_type/relocation_not_supported.json delete mode 100644 fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java index 54efc3041d..ef208e8cf0 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java @@ -19,7 +19,6 @@ import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; import net.fabricmc.fabric.impl.tag.convention.datagen.generators.BiomeTagGenerator; -import net.fabricmc.fabric.impl.tag.convention.datagen.generators.BlockEntityTypeTagGenerator; import net.fabricmc.fabric.impl.tag.convention.datagen.generators.BlockTagGenerator; import net.fabricmc.fabric.impl.tag.convention.datagen.generators.EnchantmentTagGenerator; import net.fabricmc.fabric.impl.tag.convention.datagen.generators.EntityTypeTagGenerator; @@ -37,6 +36,5 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { pack.addProvider(EnchantmentTagGenerator::new); pack.addProvider(BiomeTagGenerator::new); pack.addProvider(EntityTypeTagGenerator::new); - pack.addProvider(BlockEntityTypeTagGenerator::new); } } diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java deleted file mode 100644 index 6caebc91df..0000000000 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockEntityTypeTagGenerator.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.fabricmc.fabric.impl.tag.convention.datagen.generators; - -import java.util.concurrent.CompletableFuture; - -import net.minecraft.registry.RegistryWrapper; - -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockEntityTypeTags; - -public final class BlockEntityTypeTagGenerator extends FabricTagProvider.BlockEntityTypeTagProvider { - public BlockEntityTypeTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { - super(output, completableFuture); - } - - @Override - protected void configure(RegistryWrapper.WrapperLookup registries) { - getOrCreateTagBuilder(ConventionalBlockEntityTypeTags.RELOCATION_NOT_SUPPORTED); // Generate tag so others can see it exists through JSON. - } -} diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block_entity_type/relocation_not_supported.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block_entity_type/relocation_not_supported.json deleted file mode 100644 index 5e8aecc986..0000000000 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block_entity_type/relocation_not_supported.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java deleted file mode 100644 index 1285dc1f35..0000000000 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockEntityTypeTags.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.fabricmc.fabric.api.tag.convention.v2; - -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.registry.tag.TagKey; - -import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; - -public final class ConventionalBlockEntityTypeTags { - private ConventionalBlockEntityTypeTags() { - } - - /** - * Blocks should be included in this tag if their movement can cause serious issues such as world corruption - * upon being moved, such as chunk loaders or pipes, for mods that move block entities. - * - *

See also the equivalent block tag: {@link ConventionalBlockTags#RELOCATION_NOT_SUPPORTED} - */ - public static final TagKey> RELOCATION_NOT_SUPPORTED = register("relocation_not_supported"); - - private static TagKey> register(String tagId) { - return TagRegistration.BLOCK_ENTITY_TYPE_TAG.registerC(tagId); - } -} 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 830972f780..fd0f75a3a5 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 @@ -98,11 +98,10 @@ private ConventionalBlockTags() { public static final TagKey YELLOW_DYED = register("dyed/yellow"); /** - * Blocks should be included in this tag if their movement can cause serious issues such as world corruption - * upon being moved, such as chunk loaders or pipes, for mods that move blocks but do not respect + * Blocks should be included in this tag if their movement/relocation can cause serious issues such + * as world corruption upon being moved or for balance reason where the block should not be able to be relocated. + * Example: Chunk loaders or pipes where other mods that move blocks do not respect * {@link AbstractBlock.AbstractBlockState#getPistonBehavior}. - * - *

See also the equivalent block entity type tag: {@link ConventionalBlockEntityTypeTags#RELOCATION_NOT_SUPPORTED} */ public static final TagKey RELOCATION_NOT_SUPPORTED = register("relocation_not_supported"); 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 7304076974..68344d22da 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 @@ -38,8 +38,8 @@ private ConventionalItemTags() { public static final TagKey TOOLS = register("tools"); public static final TagKey SHEARS_TOOLS = register("tools/shears"); /** - * For throwable spear weapons, like Minecraft's tridents. - * Note, other throwable weapons like boomerangs and throwing knives are best put into their own tools tag. + * For spear tools, like Minecraft's tridents. + * Note, other weapons like boomerangs and throwing knives are best put into their own tools tag. */ public static final TagKey SPEARS_TOOLS = register("tools/spears"); public static final TagKey BOWS_TOOLS = register("tools/bows"); From 9236b79f7f5397f7b4394b9be02fef799da52943 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 1 Oct 2023 15:02:40 -0400 Subject: [PATCH 063/123] dyed tags javadoc --- .../api/tag/convention/v2/ConventionalBlockTags.java | 4 ++++ .../api/tag/convention/v2/ConventionalItemTags.java | 9 +++++++++ 2 files changed, 13 insertions(+) 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 fd0f75a3a5..8d6c0a07cc 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 @@ -79,6 +79,10 @@ private ConventionalBlockTags() { public static final TagKey UNCOLORED_SANDSTONE_STAIRS = register("sandstone/uncolored_stairs"); // Blocks created with dyes + /** + * Tag that holds all blocks that can be dyed a specific color. + * (Does not include color blending blocks that would behave similar to leather armor item) + */ public static final TagKey DYED = register("dyed"); public static final TagKey BLACK_DYED = register("dyed/black"); public static final TagKey BLUE_DYED = register("dyed/blue"); 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 68344d22da..f7902b8d15 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 @@ -147,6 +147,15 @@ private ConventionalItemTags() { public static final TagKey YELLOW_DYES = register("dyes/yellow"); // Items created with dyes + /** + * Tag that holds all blocks and items that can be dyed a specific color. + * (Does not include color blending items like leather armor) + *

+ * Note: Use custom ingredients in recipes to do tag intersections and/or tag exclusions + * to make more powerful recipes utilizing multiple tags such as dyed tags for an ingredient. + * See {@link net.fabricmc.fabric.api.recipe.v1.ingredient.DefaultCustomIngredients} + * children classes for various custom ingredients available that can also be used in data generation. + */ public static final TagKey DYED = register("dyed"); public static final TagKey BLACK_DYED = register("dyed/black"); public static final TagKey BLUE_DYED = register("dyed/blue"); From d048b46434b50f1ab414954e7009aa24dca30308 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 8 Oct 2023 09:51:58 -0400 Subject: [PATCH 064/123] Added weapon and mining tags (Will be fabric exclusive) --- .../datagen/generators/ItemTagGenerator.java | 32 ++++++++++++++++++- .../resources/data/c/tags/items/tools.json | 12 +++++++ .../c/tags/items/tools/melee_weapons.json | 17 ++++++++++ .../data/c/tags/items/tools/mining_tools.json | 11 +++++++ .../c/tags/items/tools/ranged_weapons.json | 8 +++++ .../convention/v2/ConventionalItemTags.java | 5 +++ 6 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/melee_weapons.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/mining_tools.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/ranged_weapons.json 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 7f4384fc58..bda3fe9b91 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 @@ -239,7 +239,10 @@ private void generateToolTags() { .addOptionalTag(ConventionalItemTags.FISHING_RODS_TOOLS) .addOptionalTag(ConventionalItemTags.SHEARS_TOOLS) .addOptionalTag(ConventionalItemTags.SHIELDS_TOOLS) - .addOptionalTag(ConventionalItemTags.SPEARS_TOOLS); + .addOptionalTag(ConventionalItemTags.SPEARS_TOOLS) + .addOptionalTag(ConventionalItemTags.MINING_TOOLS) + .addOptionalTag(ConventionalItemTags.MELEE_WEAPONS_TOOLS) + .addOptionalTag(ConventionalItemTags.RANGED_WEAPONS_TOOLS); getOrCreateTagBuilder(ConventionalItemTags.BOWS_TOOLS) .add(Items.BOW); @@ -253,6 +256,33 @@ private void generateToolTags() { .add(Items.TRIDENT); getOrCreateTagBuilder(ConventionalItemTags.FISHING_RODS_TOOLS) .add(Items.FISHING_ROD); + + getOrCreateTagBuilder(ConventionalItemTags.MINING_TOOLS) + .add(Items.WOODEN_PICKAXE) + .add(Items.STONE_PICKAXE) + .add(Items.GOLDEN_PICKAXE) + .add(Items.IRON_PICKAXE) + .add(Items.DIAMOND_PICKAXE) + .add(Items.NETHERITE_PICKAXE); + + getOrCreateTagBuilder(ConventionalItemTags.MELEE_WEAPONS_TOOLS) + .add(Items.WOODEN_SWORD) + .add(Items.STONE_SWORD) + .add(Items.GOLDEN_SWORD) + .add(Items.IRON_SWORD) + .add(Items.DIAMOND_SWORD) + .add(Items.NETHERITE_SWORD) + .add(Items.WOODEN_AXE) + .add(Items.STONE_AXE) + .add(Items.GOLDEN_AXE) + .add(Items.IRON_AXE) + .add(Items.DIAMOND_AXE) + .add(Items.NETHERITE_AXE); + + getOrCreateTagBuilder(ConventionalItemTags.RANGED_WEAPONS_TOOLS) + .add(Items.BOW) + .add(Items.CROSSBOW) + .add(Items.TRIDENT); } private void generateVillagerJobSites() { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools.json index 6ee2fc0a90..6b0ba7691a 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools.json @@ -24,6 +24,18 @@ { "id": "#c:tools/spears", "required": false + }, + { + "id": "#c:tools/mining_tools", + "required": false + }, + { + "id": "#c:tools/melee_weapons", + "required": false + }, + { + "id": "#c:tools/ranged_weapons", + "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/melee_weapons.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/melee_weapons.json new file mode 100644 index 0000000000..4e33f55a54 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/melee_weapons.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:wooden_sword", + "minecraft:stone_sword", + "minecraft:golden_sword", + "minecraft:iron_sword", + "minecraft:diamond_sword", + "minecraft:netherite_sword", + "minecraft:wooden_axe", + "minecraft:stone_axe", + "minecraft:golden_axe", + "minecraft:iron_axe", + "minecraft:diamond_axe", + "minecraft:netherite_axe" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/mining_tools.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/mining_tools.json new file mode 100644 index 0000000000..efe9b1bd29 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/mining_tools.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:wooden_pickaxe", + "minecraft:stone_pickaxe", + "minecraft:golden_pickaxe", + "minecraft:iron_pickaxe", + "minecraft:diamond_pickaxe", + "minecraft:netherite_pickaxe" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/ranged_weapons.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/ranged_weapons.json new file mode 100644 index 0000000000..36a0571e13 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/ranged_weapons.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "minecraft:bow", + "minecraft:crossbow", + "minecraft:trident" + ] +} \ No newline at end of file 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 f7902b8d15..46343e8b0c 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 @@ -47,6 +47,11 @@ private ConventionalItemTags() { public static final TagKey SHIELDS_TOOLS = register("tools/shields"); public static final TagKey FISHING_RODS_TOOLS = register("tools/fishing_rods"); + // Action-based tool tags + public static final TagKey MELEE_WEAPONS_TOOLS = register("tools/melee_weapons"); + public static final TagKey RANGED_WEAPONS_TOOLS = register("tools/ranged_weapons"); + public static final TagKey MINING_TOOLS = register("tools/mining_tools"); + // Ores and ingots - categories public static final TagKey DUSTS = register("dusts"); public static final TagKey GEMS = register("gems"); From d27a858f0b66a339eebf12453bc19641f15b27a2 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 8 Oct 2023 10:20:27 -0400 Subject: [PATCH 065/123] Ported over Storage Block tags to sync them between the two PRs --- .../datagen/generators/BlockTagGenerator.java | 71 +++++++++++++++++++ .../datagen/generators/ItemTagGenerator.java | 18 +++++ .../data/c/tags/blocks/storage_blocks.json | 21 ++++++ .../tags/blocks/storage_blocks/bonemeal.json | 6 ++ .../c/tags/blocks/storage_blocks/coal.json | 6 ++ .../c/tags/blocks/storage_blocks/copper.json | 6 ++ .../c/tags/blocks/storage_blocks/diamond.json | 6 ++ .../blocks/storage_blocks/dried_kelp.json | 6 ++ .../c/tags/blocks/storage_blocks/emerald.json | 6 ++ .../c/tags/blocks/storage_blocks/gold.json | 6 ++ .../c/tags/blocks/storage_blocks/iron.json | 6 ++ .../c/tags/blocks/storage_blocks/lapis.json | 6 ++ .../tags/blocks/storage_blocks/netherite.json | 6 ++ .../blocks/storage_blocks/raw_copper.json | 6 ++ .../tags/blocks/storage_blocks/raw_gold.json | 6 ++ .../tags/blocks/storage_blocks/raw_iron.json | 6 ++ .../tags/blocks/storage_blocks/redstone.json | 6 ++ .../c/tags/blocks/storage_blocks/slime.json | 6 ++ .../c/tags/blocks/storage_blocks/wheat.json | 6 ++ .../data/c/tags/items/storage_blocks.json | 21 ++++++ .../c/tags/items/storage_blocks/bonemeal.json | 6 ++ .../c/tags/items/storage_blocks/coal.json | 6 ++ .../c/tags/items/storage_blocks/copper.json | 6 ++ .../c/tags/items/storage_blocks/diamond.json | 6 ++ .../tags/items/storage_blocks/dried_kelp.json | 6 ++ .../c/tags/items/storage_blocks/emerald.json | 6 ++ .../c/tags/items/storage_blocks/gold.json | 6 ++ .../c/tags/items/storage_blocks/iron.json | 6 ++ .../c/tags/items/storage_blocks/lapis.json | 6 ++ .../tags/items/storage_blocks/netherite.json | 6 ++ .../tags/items/storage_blocks/raw_copper.json | 6 ++ .../c/tags/items/storage_blocks/raw_gold.json | 6 ++ .../c/tags/items/storage_blocks/raw_iron.json | 6 ++ .../c/tags/items/storage_blocks/redstone.json | 6 ++ .../c/tags/items/storage_blocks/slime.json | 6 ++ .../c/tags/items/storage_blocks/wheat.json | 6 ++ .../convention/v2/ConventionalBlockTags.java | 25 +++++++ .../convention/v2/ConventionalItemTags.java | 26 +++++++ 38 files changed, 374 insertions(+) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/bonemeal.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/coal.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/copper.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/diamond.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/dried_kelp.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/emerald.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/gold.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/iron.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/lapis.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/netherite.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/raw_copper.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/raw_gold.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/raw_iron.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/redstone.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/slime.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/wheat.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/bonemeal.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/coal.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/copper.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/diamond.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/dried_kelp.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/emerald.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/gold.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/iron.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/lapis.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/netherite.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_copper.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_gold.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_iron.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/redstone.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/slime.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/wheat.json 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 62e519b72a..b2bd920653 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 @@ -104,6 +104,9 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { getOrCreateTagBuilder(ConventionalBlockTags.RELOCATION_NOT_SUPPORTED); // Generate tag so others can see it exists through JSON. generateDyedTags(); + + generateStorageTags(); + generateBackwardsCompatTags(); } @@ -333,6 +336,74 @@ private void generateDyedTags() { .addTag(ConventionalBlockTags.BLACK_DYED); } + private void generateStorageTags() { + getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS) + .addTag(ConventionalBlockTags.STORAGE_BLOCKS_BONEMEAL) + .addTag(ConventionalBlockTags.STORAGE_BLOCKS_COAL) + .addTag(ConventionalBlockTags.STORAGE_BLOCKS_COPPER) + .addTag(ConventionalBlockTags.STORAGE_BLOCKS_DIAMOND) + .addTag(ConventionalBlockTags.STORAGE_BLOCKS_DRIED_KELP) + .addTag(ConventionalBlockTags.STORAGE_BLOCKS_EMERALD) + .addTag(ConventionalBlockTags.STORAGE_BLOCKS_GOLD) + .addTag(ConventionalBlockTags.STORAGE_BLOCKS_IRON) + .addTag(ConventionalBlockTags.STORAGE_BLOCKS_LAPIS) + .addTag(ConventionalBlockTags.STORAGE_BLOCKS_NETHERITE) + .addTag(ConventionalBlockTags.STORAGE_BLOCKS_RAW_COPPER) + .addTag(ConventionalBlockTags.STORAGE_BLOCKS_RAW_GOLD) + .addTag(ConventionalBlockTags.STORAGE_BLOCKS_RAW_IRON) + .addTag(ConventionalBlockTags.STORAGE_BLOCKS_REDSTONE) + .addTag(ConventionalBlockTags.STORAGE_BLOCKS_SLIME) + .addTag(ConventionalBlockTags.STORAGE_BLOCKS_WHEAT); + + getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_BONEMEAL) + .add(Blocks.BONE_BLOCK); + + getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_COAL) + .add(Blocks.COAL_BLOCK); + + getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_COPPER) + .add(Blocks.COPPER_BLOCK); + + getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_DIAMOND) + .add(Blocks.DIAMOND_BLOCK); + + getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_DRIED_KELP) + .add(Blocks.DRIED_KELP_BLOCK); + + getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_EMERALD) + .add(Blocks.EMERALD_BLOCK); + + getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_GOLD) + .add(Blocks.GOLD_BLOCK); + + getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_IRON) + .add(Blocks.IRON_BLOCK); + + getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_LAPIS) + .add(Blocks.LAPIS_BLOCK); + + getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_NETHERITE) + .add(Blocks.NETHERITE_BLOCK); + + getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_RAW_COPPER) + .add(Blocks.RAW_COPPER_BLOCK); + + getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_RAW_GOLD) + .add(Blocks.RAW_GOLD_BLOCK); + + getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_RAW_IRON) + .add(Blocks.RAW_IRON_BLOCK); + + getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_REDSTONE) + .add(Blocks.REDSTONE_BLOCK); + + getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_SLIME) + .add(Blocks.SLIME_BLOCK); + + getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_WHEAT) + .add(Blocks.HAY_BLOCK); + } + private void generateBackwardsCompatTags() { // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. // TODO: Remove backwards compat tag entries in 1.22 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 bda3fe9b91..c1d5cedd86 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 @@ -74,6 +74,24 @@ private void copyItemTags() { copy(ConventionalBlockTags.UNCOLORED_SANDSTONE_BLOCKS, ConventionalItemTags.UNCOLORED_SANDSTONE_BLOCKS); copy(ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS, ConventionalItemTags.UNCOLORED_SANDSTONE_SLABS); copy(ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS, ConventionalItemTags.UNCOLORED_SANDSTONE_STAIRS); + + copy(ConventionalBlockTags.STORAGE_BLOCKS, ConventionalItemTags.STORAGE_BLOCKS); + copy(ConventionalBlockTags.STORAGE_BLOCKS_BONEMEAL, ConventionalItemTags.STORAGE_BLOCKS_BONEMEAL); + copy(ConventionalBlockTags.STORAGE_BLOCKS_COAL, ConventionalItemTags.STORAGE_BLOCKS_COAL); + copy(ConventionalBlockTags.STORAGE_BLOCKS_COPPER, ConventionalItemTags.STORAGE_BLOCKS_COPPER); + copy(ConventionalBlockTags.STORAGE_BLOCKS_DIAMOND, ConventionalItemTags.STORAGE_BLOCKS_DIAMOND); + copy(ConventionalBlockTags.STORAGE_BLOCKS_DRIED_KELP, ConventionalItemTags.STORAGE_BLOCKS_DRIED_KELP); + copy(ConventionalBlockTags.STORAGE_BLOCKS_EMERALD, ConventionalItemTags.STORAGE_BLOCKS_EMERALD); + copy(ConventionalBlockTags.STORAGE_BLOCKS_GOLD, ConventionalItemTags.STORAGE_BLOCKS_GOLD); + copy(ConventionalBlockTags.STORAGE_BLOCKS_IRON, ConventionalItemTags.STORAGE_BLOCKS_IRON); + copy(ConventionalBlockTags.STORAGE_BLOCKS_LAPIS, ConventionalItemTags.STORAGE_BLOCKS_LAPIS); + copy(ConventionalBlockTags.STORAGE_BLOCKS_NETHERITE, ConventionalItemTags.STORAGE_BLOCKS_NETHERITE); + copy(ConventionalBlockTags.STORAGE_BLOCKS_RAW_COPPER, ConventionalItemTags.STORAGE_BLOCKS_RAW_COPPER); + copy(ConventionalBlockTags.STORAGE_BLOCKS_RAW_GOLD, ConventionalItemTags.STORAGE_BLOCKS_RAW_GOLD); + copy(ConventionalBlockTags.STORAGE_BLOCKS_RAW_IRON, ConventionalItemTags.STORAGE_BLOCKS_RAW_IRON); + 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); } private void generateDyeTags() { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks.json new file mode 100644 index 0000000000..b28be4113a --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "#c:storage_blocks/bonemeal", + "#c:storage_blocks/coal", + "#c:storage_blocks/copper", + "#c:storage_blocks/diamond", + "#c:storage_blocks/dried_kelp", + "#c:storage_blocks/emerald", + "#c:storage_blocks/gold", + "#c:storage_blocks/iron", + "#c:storage_blocks/lapis", + "#c:storage_blocks/netherite", + "#c:storage_blocks/raw_copper", + "#c:storage_blocks/raw_gold", + "#c:storage_blocks/raw_iron", + "#c:storage_blocks/redstone", + "#c:storage_blocks/slime", + "#c:storage_blocks/wheat" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/bonemeal.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/bonemeal.json new file mode 100644 index 0000000000..18fd367c3c --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/bonemeal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:bone_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/coal.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/coal.json new file mode 100644 index 0000000000..dbe07ace81 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/coal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:coal_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/copper.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/copper.json new file mode 100644 index 0000000000..1b51fad6c5 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:copper_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/diamond.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/diamond.json new file mode 100644 index 0000000000..bc19777550 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/diamond.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:diamond_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/dried_kelp.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/dried_kelp.json new file mode 100644 index 0000000000..a2d78ca7d1 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/dried_kelp.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:dried_kelp_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/emerald.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/emerald.json new file mode 100644 index 0000000000..30e292c558 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/emerald.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:emerald_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/gold.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/gold.json new file mode 100644 index 0000000000..863d47ad21 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:gold_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/iron.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/iron.json new file mode 100644 index 0000000000..f9e01c6a9b --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:iron_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/lapis.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/lapis.json new file mode 100644 index 0000000000..7de86cb6b5 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/lapis.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:lapis_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/netherite.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/netherite.json new file mode 100644 index 0000000000..11b9a7230d --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/netherite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:netherite_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/raw_copper.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/raw_copper.json new file mode 100644 index 0000000000..3a578a0277 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/raw_copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_copper_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/raw_gold.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/raw_gold.json new file mode 100644 index 0000000000..4ce9cc47d1 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/raw_gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_gold_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/raw_iron.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/raw_iron.json new file mode 100644 index 0000000000..14f551c592 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/raw_iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_iron_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/redstone.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/redstone.json new file mode 100644 index 0000000000..f20a3ced25 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/redstone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:redstone_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/slime.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/slime.json new file mode 100644 index 0000000000..f3c5414d36 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/slime.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:slime_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/wheat.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/wheat.json new file mode 100644 index 0000000000..339330363f --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/wheat.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:hay_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks.json new file mode 100644 index 0000000000..b28be4113a --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "#c:storage_blocks/bonemeal", + "#c:storage_blocks/coal", + "#c:storage_blocks/copper", + "#c:storage_blocks/diamond", + "#c:storage_blocks/dried_kelp", + "#c:storage_blocks/emerald", + "#c:storage_blocks/gold", + "#c:storage_blocks/iron", + "#c:storage_blocks/lapis", + "#c:storage_blocks/netherite", + "#c:storage_blocks/raw_copper", + "#c:storage_blocks/raw_gold", + "#c:storage_blocks/raw_iron", + "#c:storage_blocks/redstone", + "#c:storage_blocks/slime", + "#c:storage_blocks/wheat" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/bonemeal.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/bonemeal.json new file mode 100644 index 0000000000..18fd367c3c --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/bonemeal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:bone_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/coal.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/coal.json new file mode 100644 index 0000000000..dbe07ace81 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/coal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:coal_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/copper.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/copper.json new file mode 100644 index 0000000000..1b51fad6c5 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:copper_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/diamond.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/diamond.json new file mode 100644 index 0000000000..bc19777550 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/diamond.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:diamond_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/dried_kelp.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/dried_kelp.json new file mode 100644 index 0000000000..a2d78ca7d1 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/dried_kelp.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:dried_kelp_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/emerald.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/emerald.json new file mode 100644 index 0000000000..30e292c558 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/emerald.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:emerald_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/gold.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/gold.json new file mode 100644 index 0000000000..863d47ad21 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:gold_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/iron.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/iron.json new file mode 100644 index 0000000000..f9e01c6a9b --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:iron_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/lapis.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/lapis.json new file mode 100644 index 0000000000..7de86cb6b5 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/lapis.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:lapis_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/netherite.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/netherite.json new file mode 100644 index 0000000000..11b9a7230d --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/netherite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:netherite_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_copper.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_copper.json new file mode 100644 index 0000000000..3a578a0277 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_copper_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_gold.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_gold.json new file mode 100644 index 0000000000..4ce9cc47d1 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_gold_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_iron.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_iron.json new file mode 100644 index 0000000000..14f551c592 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_iron_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/redstone.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/redstone.json new file mode 100644 index 0000000000..f20a3ced25 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/redstone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:redstone_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/slime.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/slime.json new file mode 100644 index 0000000000..f3c5414d36 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/slime.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:slime_block" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/wheat.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/wheat.json new file mode 100644 index 0000000000..339330363f --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/wheat.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:hay_block" + ] +} \ No newline at end of file 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 8d6c0a07cc..36ef231fec 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 @@ -101,6 +101,31 @@ private ConventionalBlockTags() { public static final TagKey WHITE_DYED = register("dyed/white"); public static final TagKey YELLOW_DYED = register("dyed/yellow"); + /** + * A storage block is generally a block that has a recipe to craft a bulk of 1 kind of resource to a block + * and has a mirror recipe to reverse the crafting with no loss in resources. + *

+ * Honey Block is special in that the reversing recipe is not a perfect mirror of the crafting recipe + * and so, it is considered a special case and not given a storage block tag. + */ + public static final TagKey STORAGE_BLOCKS = register("storage_blocks"); + public static final TagKey STORAGE_BLOCKS_BONEMEAL = register("storage_blocks/bonemeal"); + public static final TagKey STORAGE_BLOCKS_COAL = register("storage_blocks/coal"); + public static final TagKey STORAGE_BLOCKS_COPPER = register("storage_blocks/copper"); + public static final TagKey STORAGE_BLOCKS_DIAMOND = register("storage_blocks/diamond"); + public static final TagKey STORAGE_BLOCKS_DRIED_KELP = register("storage_blocks/dried_kelp"); + public static final TagKey STORAGE_BLOCKS_EMERALD = register("storage_blocks/emerald"); + public static final TagKey STORAGE_BLOCKS_GOLD = register("storage_blocks/gold"); + public static final TagKey STORAGE_BLOCKS_IRON = register("storage_blocks/iron"); + public static final TagKey STORAGE_BLOCKS_LAPIS = register("storage_blocks/lapis"); + public static final TagKey STORAGE_BLOCKS_NETHERITE = register("storage_blocks/netherite"); + public static final TagKey STORAGE_BLOCKS_RAW_COPPER = register("storage_blocks/raw_copper"); + public static final TagKey STORAGE_BLOCKS_RAW_GOLD = register("storage_blocks/raw_gold"); + public static final TagKey STORAGE_BLOCKS_RAW_IRON = register("storage_blocks/raw_iron"); + public static final TagKey STORAGE_BLOCKS_REDSTONE = register("storage_blocks/redstone"); + public static final TagKey STORAGE_BLOCKS_SLIME = register("storage_blocks/slime"); + public static final TagKey STORAGE_BLOCKS_WHEAT = register("storage_blocks/wheat"); + /** * Blocks should be included in this tag if their movement/relocation can cause serious issues such * as world corruption upon being moved or for balance reason where the block should not be able to be relocated. 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 46343e8b0c..843c9e06cf 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 @@ -179,6 +179,32 @@ private ConventionalItemTags() { public static final TagKey WHITE_DYED = register("dyed/white"); public static final TagKey YELLOW_DYED = register("dyed/yellow"); + // Storage blocks - categories + /** + * A storage block is generally a block that has a recipe to craft a bulk of 1 kind of resource to a block + * and has a mirror recipe to reverse the crafting with no loss in resources. + *

+ * Honey Block is special in that the reversing recipe is not a perfect mirror of the crafting recipe + * and so, it is considered a special case and not given a storage block tag. + */ + public static final TagKey STORAGE_BLOCKS = register("storage_blocks"); + public static final TagKey STORAGE_BLOCKS_BONEMEAL = register("storage_blocks/bonemeal"); + public static final TagKey STORAGE_BLOCKS_COAL = register("storage_blocks/coal"); + public static final TagKey STORAGE_BLOCKS_COPPER = register("storage_blocks/copper"); + public static final TagKey STORAGE_BLOCKS_DIAMOND = register("storage_blocks/diamond"); + public static final TagKey STORAGE_BLOCKS_DRIED_KELP = register("storage_blocks/dried_kelp"); + public static final TagKey STORAGE_BLOCKS_EMERALD = register("storage_blocks/emerald"); + public static final TagKey STORAGE_BLOCKS_GOLD = register("storage_blocks/gold"); + public static final TagKey STORAGE_BLOCKS_IRON = register("storage_blocks/iron"); + public static final TagKey STORAGE_BLOCKS_LAPIS = register("storage_blocks/lapis"); + public static final TagKey STORAGE_BLOCKS_NETHERITE = register("storage_blocks/netherite"); + public static final TagKey STORAGE_BLOCKS_RAW_COPPER = register("storage_blocks/raw_copper"); + public static final TagKey STORAGE_BLOCKS_RAW_GOLD = register("storage_blocks/raw_gold"); + public static final TagKey STORAGE_BLOCKS_RAW_IRON = register("storage_blocks/raw_iron"); + public static final TagKey STORAGE_BLOCKS_REDSTONE = register("storage_blocks/redstone"); + public static final TagKey STORAGE_BLOCKS_SLIME = register("storage_blocks/slime"); + public static final TagKey STORAGE_BLOCKS_WHEAT = register("storage_blocks/wheat"); + // Other public static final TagKey STRINGS = register("strings"); /** From 3d9653c755693d9bc13d9a99a0e409f78b0e4958 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 8 Oct 2023 10:25:38 -0400 Subject: [PATCH 066/123] Fixed javadoc spacing --- .../fabric/api/tag/convention/v2/ConventionalBlockTags.java | 2 +- .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 36ef231fec..8ba9f50f72 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 @@ -104,7 +104,7 @@ private ConventionalBlockTags() { /** * A storage block is generally a block that has a recipe to craft a bulk of 1 kind of resource to a block * and has a mirror recipe to reverse the crafting with no loss in resources. - *

+ *

* Honey Block is special in that the reversing recipe is not a perfect mirror of the crafting recipe * and so, it is considered a special case and not given a storage block tag. */ 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 843c9e06cf..2e29e9217b 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 @@ -183,7 +183,7 @@ private ConventionalItemTags() { /** * A storage block is generally a block that has a recipe to craft a bulk of 1 kind of resource to a block * and has a mirror recipe to reverse the crafting with no loss in resources. - *

+ *

* Honey Block is special in that the reversing recipe is not a perfect mirror of the crafting recipe * and so, it is considered a special case and not given a storage block tag. */ From 03d4f249eeeb9f89287d85a1a591880b1ad5341d Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 11 Oct 2023 06:23:09 -0400 Subject: [PATCH 067/123] fixed bone meal storage block tag name --- .../tag/convention/datagen/generators/BlockTagGenerator.java | 4 ++-- .../tag/convention/datagen/generators/ItemTagGenerator.java | 2 +- .../resources/data/c/tags/blocks/storage_blocks.json | 2 +- .../blocks/storage_blocks/{bonemeal.json => bone_meal.json} | 0 .../generated/resources/data/c/tags/items/storage_blocks.json | 2 +- .../items/storage_blocks/{bonemeal.json => bone_meal.json} | 0 .../fabric/api/tag/convention/v2/ConventionalBlockTags.java | 2 +- .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/{bonemeal.json => bone_meal.json} (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/{bonemeal.json => bone_meal.json} (100%) 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 b2bd920653..28e5807c0b 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 @@ -338,7 +338,7 @@ private void generateDyedTags() { private void generateStorageTags() { getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS) - .addTag(ConventionalBlockTags.STORAGE_BLOCKS_BONEMEAL) + .addTag(ConventionalBlockTags.STORAGE_BLOCKS_BONE_MEAL) .addTag(ConventionalBlockTags.STORAGE_BLOCKS_COAL) .addTag(ConventionalBlockTags.STORAGE_BLOCKS_COPPER) .addTag(ConventionalBlockTags.STORAGE_BLOCKS_DIAMOND) @@ -355,7 +355,7 @@ private void generateStorageTags() { .addTag(ConventionalBlockTags.STORAGE_BLOCKS_SLIME) .addTag(ConventionalBlockTags.STORAGE_BLOCKS_WHEAT); - getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_BONEMEAL) + getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_BONE_MEAL) .add(Blocks.BONE_BLOCK); getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_COAL) 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 c1d5cedd86..f166388c5f 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 @@ -76,7 +76,7 @@ private void copyItemTags() { copy(ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS, ConventionalItemTags.UNCOLORED_SANDSTONE_STAIRS); copy(ConventionalBlockTags.STORAGE_BLOCKS, ConventionalItemTags.STORAGE_BLOCKS); - copy(ConventionalBlockTags.STORAGE_BLOCKS_BONEMEAL, ConventionalItemTags.STORAGE_BLOCKS_BONEMEAL); + copy(ConventionalBlockTags.STORAGE_BLOCKS_BONE_MEAL, ConventionalItemTags.STORAGE_BLOCKS_BONE_MEAL); copy(ConventionalBlockTags.STORAGE_BLOCKS_COAL, ConventionalItemTags.STORAGE_BLOCKS_COAL); copy(ConventionalBlockTags.STORAGE_BLOCKS_COPPER, ConventionalItemTags.STORAGE_BLOCKS_COPPER); copy(ConventionalBlockTags.STORAGE_BLOCKS_DIAMOND, ConventionalItemTags.STORAGE_BLOCKS_DIAMOND); diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks.json index b28be4113a..771bb44c2f 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "#c:storage_blocks/bonemeal", + "#c:storage_blocks/bone_meal", "#c:storage_blocks/coal", "#c:storage_blocks/copper", "#c:storage_blocks/diamond", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/bonemeal.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/bone_meal.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/bonemeal.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/bone_meal.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks.json index b28be4113a..771bb44c2f 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "#c:storage_blocks/bonemeal", + "#c:storage_blocks/bone_meal", "#c:storage_blocks/coal", "#c:storage_blocks/copper", "#c:storage_blocks/diamond", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/bonemeal.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/bone_meal.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/bonemeal.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/bone_meal.json 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 8ba9f50f72..3b92386c41 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 @@ -109,7 +109,7 @@ private ConventionalBlockTags() { * and so, it is considered a special case and not given a storage block tag. */ public static final TagKey STORAGE_BLOCKS = register("storage_blocks"); - public static final TagKey STORAGE_BLOCKS_BONEMEAL = register("storage_blocks/bonemeal"); + public static final TagKey STORAGE_BLOCKS_BONE_MEAL = register("storage_blocks/bone_meal"); public static final TagKey STORAGE_BLOCKS_COAL = register("storage_blocks/coal"); public static final TagKey STORAGE_BLOCKS_COPPER = register("storage_blocks/copper"); public static final TagKey STORAGE_BLOCKS_DIAMOND = register("storage_blocks/diamond"); 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 2e29e9217b..41e112bd1a 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 @@ -188,7 +188,7 @@ private ConventionalItemTags() { * and so, it is considered a special case and not given a storage block tag. */ public static final TagKey STORAGE_BLOCKS = register("storage_blocks"); - public static final TagKey STORAGE_BLOCKS_BONEMEAL = register("storage_blocks/bonemeal"); + public static final TagKey STORAGE_BLOCKS_BONE_MEAL = register("storage_blocks/bone_meal"); public static final TagKey STORAGE_BLOCKS_COAL = register("storage_blocks/coal"); public static final TagKey STORAGE_BLOCKS_COPPER = register("storage_blocks/copper"); public static final TagKey STORAGE_BLOCKS_DIAMOND = register("storage_blocks/diamond"); From bc07573e11ae84b10eac7748f13526f3d2284446 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 14 Oct 2023 23:24:05 -0400 Subject: [PATCH 068/123] Added cobblestones tag due to mod usages Also matches neo's base cobblestones tag --- .../impl/tag/convention/ConventionLogWarnings.java | 8 ++++++-- .../convention/datagen/generators/BlockTagGenerator.java | 5 +++++ .../convention/datagen/generators/ItemTagGenerator.java | 1 + .../resources/data/c/tags/blocks/cobblestones.json | 9 +++++++++ .../resources/data/c/tags/items/cobblestones.json | 9 +++++++++ .../api/tag/convention/v2/ConventionalBlockTags.java | 1 + .../api/tag/convention/v2/ConventionalItemTags.java | 1 + 7 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/cobblestones.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/cobblestones.json diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index bff3b3626c..79c38a5399 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -51,8 +51,10 @@ public enum LOG_WARNING_MODES { public static final Logger LOGGER = LoggerFactory.getLogger(ConventionLogWarnings.class); - // Old `c` tags that we migrated to a new tag under a new convention. - // May also contain commonly used `c` tags that are not following convention. + /** + * Old `c` tags that we migrated to a new tag under a new convention. + * May also contain commonly used `c` tags that are not following convention. + */ private static final Map, TagKey> LEGACY_C_TAGS = Map., TagKey>ofEntries( // Old v1 tags that are discouraged createMapEntry(ConventionalBlockTags.MOVEMENT_RESTRICTED, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.RELOCATION_NOT_SUPPORTED), @@ -138,6 +140,7 @@ public enum LOG_WARNING_MODES { createMapEntry(RegistryKeys.BLOCK, "glass_pane", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.GLASS_PANES), createMapEntry(RegistryKeys.BLOCK, "immobile", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.RELOCATION_NOT_SUPPORTED), createMapEntry(RegistryKeys.BLOCK, "stone", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.STONES), + createMapEntry(RegistryKeys.BLOCK, "cobblestone", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.COBBLESTONES), createMapEntry(RegistryKeys.BLOCK, "workbench", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.VILLAGER_JOB_SITES), createMapEntry(RegistryKeys.BLOCK, "workbenches", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.VILLAGER_JOB_SITES), createMapEntry(RegistryKeys.BLOCK, "workstation", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.VILLAGER_JOB_SITES), @@ -148,6 +151,7 @@ public enum LOG_WARNING_MODES { createMapEntry(RegistryKeys.ITEM, "hoes", ItemTags.HOES), createMapEntry(RegistryKeys.ITEM, "shovels", ItemTags.SHOVELS), createMapEntry(RegistryKeys.ITEM, "swords", ItemTags.SWORDS), + createMapEntry(RegistryKeys.ITEM, "wrenches", "tools/wrenches"), createMapEntry(createTagKeyUnderFabric(RegistryKeys.ITEM, "axes"), ItemTags.AXES), createMapEntry(createTagKeyUnderFabric(RegistryKeys.ITEM, "pickaxes"), ItemTags.PICKAXES), createMapEntry(createTagKeyUnderFabric(RegistryKeys.ITEM, "hoes"), ItemTags.HOES), 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 28e5807c0b..3ced4721d2 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,6 +63,11 @@ 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) + .add(Blocks.INFESTED_COBBLESTONE); getOrCreateTagBuilder(ConventionalBlockTags.QUARTZ_ORES) .add(Blocks.NETHER_QUARTZ_ORE); 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 f166388c5f..3def2a5f7e 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 @@ -52,6 +52,7 @@ protected void configure(RegistryWrapper.WrapperLookup arg) { private void copyItemTags() { copy(ConventionalBlockTags.STONES, ConventionalItemTags.STONES); + copy(ConventionalBlockTags.COBBLESTONES, ConventionalItemTags.COBBLESTONES); copy(ConventionalBlockTags.BARRELS, ConventionalItemTags.BARRELS); copy(ConventionalBlockTags.WOODEN_BARRELS, ConventionalItemTags.WOODEN_BARRELS); copy(ConventionalBlockTags.BOOKSHELVES, ConventionalItemTags.BOOKSHELVES); diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/cobblestones.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/cobblestones.json new file mode 100644 index 0000000000..6812611eac --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/cobblestones.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "minecraft:cobblestone", + "minecraft:mossy_cobblestone", + "minecraft:cobbled_deepslate", + "minecraft:infested_cobblestone" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/cobblestones.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/cobblestones.json new file mode 100644 index 0000000000..6812611eac --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/cobblestones.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "minecraft:cobblestone", + "minecraft:mossy_cobblestone", + "minecraft:cobbled_deepslate", + "minecraft:infested_cobblestone" + ] +} \ No newline at end of file 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 3b92386c41..ec7efd382e 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 @@ -34,6 +34,7 @@ private ConventionalBlockTags() { * Natural stone-like blocks that can be used as a base ingredient in recipes that take stone. */ public static final TagKey STONES = register("stones"); + public static final TagKey COBBLESTONES = register("cobblestones"); // Ores - broad categories public static final TagKey ORES = register("ores"); 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 41e112bd1a..314b885a95 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 @@ -33,6 +33,7 @@ private ConventionalItemTags() { * Natural stone-like blocks that can be used as a base ingredient in recipes that take stone. */ public static final TagKey STONES = register("stones"); + public static final TagKey COBBLESTONES = register("cobblestones"); // Tool tags public static final TagKey TOOLS = register("tools"); From 92338a5c27e11f455e4d588a61cf8834ff93e6ca Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Tue, 24 Oct 2023 11:01:52 -0400 Subject: [PATCH 069/123] Added brushes tag --- .../tag/convention/datagen/generators/ItemTagGenerator.java | 3 +++ .../src/generated/resources/data/c/tags/items/tools.json | 4 ++++ .../resources/data/c/tags/items/tools/brushes.json | 6 ++++++ .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 1 + 4 files changed, 14 insertions(+) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/brushes.json 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 3def2a5f7e..ea7b5e1d8b 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 @@ -255,6 +255,7 @@ private void generateToolTags() { getOrCreateTagBuilder(ConventionalItemTags.TOOLS) .addOptionalTag(ConventionalItemTags.BOWS_TOOLS) .addOptionalTag(ConventionalItemTags.CROSSBOWS_TOOLS) + .addOptionalTag(ConventionalItemTags.BRUSHES_TOOLS) .addOptionalTag(ConventionalItemTags.FISHING_RODS_TOOLS) .addOptionalTag(ConventionalItemTags.SHEARS_TOOLS) .addOptionalTag(ConventionalItemTags.SHIELDS_TOOLS) @@ -275,6 +276,8 @@ private void generateToolTags() { .add(Items.TRIDENT); getOrCreateTagBuilder(ConventionalItemTags.FISHING_RODS_TOOLS) .add(Items.FISHING_ROD); + getOrCreateTagBuilder(ConventionalItemTags.BRUSHES_TOOLS) + .add(Items.BRUSH); getOrCreateTagBuilder(ConventionalItemTags.MINING_TOOLS) .add(Items.WOODEN_PICKAXE) diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools.json index 6b0ba7691a..1df6e2bff9 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools.json @@ -9,6 +9,10 @@ "id": "#c:tools/crossbows", "required": false }, + { + "id": "#c:tools/brushes", + "required": false + }, { "id": "#c:tools/fishing_rods", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/brushes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/brushes.json new file mode 100644 index 0000000000..ad68ac36e3 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/brushes.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:brush" + ] +} \ No newline at end of file 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 314b885a95..a8b53a7a33 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 @@ -47,6 +47,7 @@ private ConventionalItemTags() { public static final TagKey CROSSBOWS_TOOLS = register("tools/crossbows"); public static final TagKey SHIELDS_TOOLS = register("tools/shields"); public static final TagKey FISHING_RODS_TOOLS = register("tools/fishing_rods"); + public static final TagKey BRUSHES_TOOLS = register("tools/brushes"); // Action-based tool tags public static final TagKey MELEE_WEAPONS_TOOLS = register("tools/melee_weapons"); From ac4eac319a70d4f819e38eb7d7b8fd119c2c643c Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Tue, 24 Oct 2023 12:09:59 -0400 Subject: [PATCH 070/123] Added heads tag --- .../datagen/generators/BlockTagGenerator.java | 20 +++++++++++++++++++ .../datagen/generators/ItemTagGenerator.java | 8 ++++++++ .../resources/data/c/tags/blocks/heads.json | 19 ++++++++++++++++++ .../resources/data/c/tags/items/heads.json | 12 +++++++++++ .../convention/v2/ConventionalBlockTags.java | 6 ++++++ .../convention/v2/ConventionalItemTags.java | 8 ++++++++ 6 files changed, 73 insertions(+) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/heads.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/heads.json 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 3ced4721d2..0bf4130620 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 @@ -112,6 +112,8 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { generateStorageTags(); + generateHeadTags(); + generateBackwardsCompatTags(); } @@ -409,6 +411,24 @@ private void generateStorageTags() { .add(Blocks.HAY_BLOCK); } + private void generateHeadTags() { + getOrCreateTagBuilder(ConventionalBlockTags.HEADS) + .add(Blocks.SKELETON_SKULL) + .add(Blocks.SKELETON_WALL_SKULL) + .add(Blocks.WITHER_SKELETON_SKULL) + .add(Blocks.WITHER_SKELETON_WALL_SKULL) + .add(Blocks.PLAYER_HEAD) + .add(Blocks.PLAYER_WALL_HEAD) + .add(Blocks.ZOMBIE_HEAD) + .add(Blocks.ZOMBIE_WALL_HEAD) + .add(Blocks.CREEPER_HEAD) + .add(Blocks.CREEPER_WALL_HEAD) + .add(Blocks.PIGLIN_HEAD) + .add(Blocks.PIGLIN_WALL_HEAD) + .add(Blocks.DRAGON_HEAD) + .add(Blocks.DRAGON_WALL_HEAD); + } + private void generateBackwardsCompatTags() { // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. // TODO: Remove backwards compat tag entries in 1.22 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 ea7b5e1d8b..0eb8d12d4b 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 @@ -324,6 +324,14 @@ private void generateOtherTags() { getOrCreateTagBuilder(ConventionalItemTags.RODS) .addOptionalTag(ConventionalItemTags.WOODEN_RODS) .addOptionalTag(ConventionalItemTags.BLAZE_RODS); + getOrCreateTagBuilder(ConventionalItemTags.HEADS) + .add(Items.SKELETON_SKULL) + .add(Items.WITHER_SKELETON_SKULL) + .add(Items.PLAYER_HEAD) + .add(Items.ZOMBIE_HEAD) + .add(Items.CREEPER_HEAD) + .add(Items.PIGLIN_HEAD) + .add(Items.DRAGON_HEAD); } private void generateDyedTags() { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/heads.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/heads.json new file mode 100644 index 0000000000..93646eb7ac --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/heads.json @@ -0,0 +1,19 @@ +{ + "replace": false, + "values": [ + "minecraft:skeleton_skull", + "minecraft:skeleton_wall_skull", + "minecraft:wither_skeleton_skull", + "minecraft:wither_skeleton_wall_skull", + "minecraft:player_head", + "minecraft:player_wall_head", + "minecraft:zombie_head", + "minecraft:zombie_wall_head", + "minecraft:creeper_head", + "minecraft:creeper_wall_head", + "minecraft:piglin_head", + "minecraft:piglin_wall_head", + "minecraft:dragon_head", + "minecraft:dragon_wall_head" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/heads.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/heads.json new file mode 100644 index 0000000000..c3e8b29ba9 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/heads.json @@ -0,0 +1,12 @@ +{ + "replace": false, + "values": [ + "minecraft:skeleton_skull", + "minecraft:wither_skeleton_skull", + "minecraft:player_head", + "minecraft:zombie_head", + "minecraft:creeper_head", + "minecraft:piglin_head", + "minecraft:dragon_head" + ] +} \ No newline at end of file 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 ec7efd382e..6cad8c19c3 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 @@ -102,6 +102,7 @@ private ConventionalBlockTags() { public static final TagKey WHITE_DYED = register("dyed/white"); public static final TagKey YELLOW_DYED = register("dyed/yellow"); + // Blocks that are for storing resources /** * A storage block is generally a block that has a recipe to craft a bulk of 1 kind of resource to a block * and has a mirror recipe to reverse the crafting with no loss in resources. @@ -127,6 +128,7 @@ private ConventionalBlockTags() { public static final TagKey STORAGE_BLOCKS_SLIME = register("storage_blocks/slime"); public static final TagKey STORAGE_BLOCKS_WHEAT = register("storage_blocks/wheat"); + // Misc /** * Blocks should be included in this tag if their movement/relocation can cause serious issues such * as world corruption upon being moved or for balance reason where the block should not be able to be relocated. @@ -134,6 +136,10 @@ private ConventionalBlockTags() { * {@link AbstractBlock.AbstractBlockState#getPistonBehavior}. */ public static final TagKey RELOCATION_NOT_SUPPORTED = register("relocation_not_supported"); + /** + * Tag that holds all head based blocks such as Skeleton Skull or Player Head. + */ + public static final TagKey HEADS = register("heads"); private static TagKey register(String tagId) { return TagRegistration.BLOCK_TAG.registerC(tagId); 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 a8b53a7a33..7af94c27e5 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 @@ -219,6 +219,14 @@ private ConventionalItemTags() { */ public static final TagKey WOODEN_RODS = register("rods/wooden"); public static final TagKey BLAZE_RODS = register("rods/blaze"); + /** + * Tag that holds all head based blocks such as Skeleton Skull or Player Head. + *

+ * Note: If you don't want Player Head in recipe, use custom ingredients to do tag exclusions to exclude Player Head. + * See {@link net.fabricmc.fabric.api.recipe.v1.ingredient.DefaultCustomIngredients} + * children classes for various custom ingredients available that can also be used in data generation. + */ + public static final TagKey HEADS = register("heads"); private static TagKey register(String tagId) { return TagRegistration.ITEM_TAG.registerC(tagId); From 55a416df6b767cf6ee30f5c32e68584a19dcb245 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Fri, 27 Oct 2023 09:33:33 -0400 Subject: [PATCH 071/123] Added minecraft's tool tags to c:tools for completeness --- .../datagen/generators/ItemTagGenerator.java | 7 +++++- .../resources/data/c/tags/items/tools.json | 24 +++++++++++++++++-- 2 files changed, 28 insertions(+), 3 deletions(-) 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 0eb8d12d4b..d821ba03c8 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 @@ -253,9 +253,14 @@ private void generateOreAndRelatedTags() { private void generateToolTags() { getOrCreateTagBuilder(ConventionalItemTags.TOOLS) + .addOptionalTag(ItemTags.AXES) + .addOptionalTag(ItemTags.HOES) + .addOptionalTag(ItemTags.PICKAXES) + .addOptionalTag(ItemTags.SHOVELS) + .addOptionalTag(ItemTags.SWORDS) .addOptionalTag(ConventionalItemTags.BOWS_TOOLS) - .addOptionalTag(ConventionalItemTags.CROSSBOWS_TOOLS) .addOptionalTag(ConventionalItemTags.BRUSHES_TOOLS) + .addOptionalTag(ConventionalItemTags.CROSSBOWS_TOOLS) .addOptionalTag(ConventionalItemTags.FISHING_RODS_TOOLS) .addOptionalTag(ConventionalItemTags.SHEARS_TOOLS) .addOptionalTag(ConventionalItemTags.SHIELDS_TOOLS) diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools.json index 1df6e2bff9..b78f093f9b 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools.json @@ -2,17 +2,37 @@ "replace": false, "values": [ { - "id": "#c:tools/bows", + "id": "#minecraft:axes", "required": false }, { - "id": "#c:tools/crossbows", + "id": "#minecraft:hoes", + "required": false + }, + { + "id": "#minecraft:pickaxes", + "required": false + }, + { + "id": "#minecraft:shovels", + "required": false + }, + { + "id": "#minecraft:swords", + "required": false + }, + { + "id": "#c:tools/bows", "required": false }, { "id": "#c:tools/brushes", "required": false }, + { + "id": "#c:tools/crossbows", + "required": false + }, { "id": "#c:tools/fishing_rods", "required": false From 523470b8b69732e2f6458ddaabbafb2de96856fa Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 11 Nov 2023 09:49:39 -0500 Subject: [PATCH 072/123] Added no_default_monsters biome tag --- .../convention/datagen/generators/BiomeTagGenerator.java | 3 +++ .../api/tag/convention/v2/ConventionalBiomeTags.java | 7 +++++++ 2 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 a54202c2aa..0aee9416b0 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 @@ -168,6 +168,9 @@ private void generateOtherBiomeTypes() { .add(BiomeKeys.FROZEN_OCEAN) .add(BiomeKeys.COLD_OCEAN) .add(BiomeKeys.WARM_OCEAN); + getOrCreateTagBuilder(ConventionalBiomeTags.NO_DEFAULT_MONSTERS) + .add(BiomeKeys.MUSHROOM_FIELDS) + .add(BiomeKeys.DEEP_DARK); } private void generateClimateAndVegetationTags() { 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 f0c5a90ca2..2744684049 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 @@ -149,6 +149,13 @@ private ConventionalBiomeTags() { public static final TagKey IS_DEEP_OCEAN = register("is_deep_ocean"); public static final TagKey IS_SHALLOW_OCEAN = register("is_shallow_ocean"); + /** + * For biomes that should not spawn monsters over time the normal way. + * In other words, their Spawners and Spawn Cost entries have the monster category empty. + * Example: Mushroom Biomes not having Zombies, Creepers, Skeleton, nor any other normal monsters. + */ + public static final TagKey NO_DEFAULT_MONSTERS = register("no_default_monsters"); + private static TagKey register(String tagId) { return TagRegistration.BIOME_TAG.registerC(tagId); } From 1827679586ea0dab67a6193428110482d667b6ad Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 11 Nov 2023 10:26:11 -0500 Subject: [PATCH 073/123] added fish and meat food tags --- .../tag/convention/ConventionLogWarnings.java | 1 + .../datagen/generators/ItemTagGenerator.java | 42 ++++++++++++++++--- .../convention/v2/ConventionalItemTags.java | 9 +++- 3 files changed, 46 insertions(+), 6 deletions(-) diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 79c38a5399..f5ed96f596 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -70,6 +70,7 @@ public enum LOG_WARNING_MODES { createMapEntry(ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS), createMapEntry(ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS), + createMapEntry(ConventionalItemTags.FOODS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.FOOD), createMapEntry(ConventionalItemTags.QUARTZ_ORES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.QUARTZ_ORES), createMapEntry(ConventionalItemTags.WOODEN_BARRELS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WOODEN_BARRELS), createMapEntry(ConventionalItemTags.SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SANDSTONE_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 d821ba03c8..ff6cff438c 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 @@ -42,6 +42,7 @@ protected void configure(RegistryWrapper.WrapperLookup arg) { generateBucketTags(); generateOreAndRelatedTags(); generateConsumableTags(); + generateFoodTags(); generateDyeTags(); generateDyedTags(); generateVillagerJobSites(); @@ -148,17 +149,48 @@ private void generateDyeTags() { } private void generateConsumableTags() { - Registries.ITEM.forEach(item -> { - if (item.getFoodComponent() != null) { - getOrCreateTagBuilder(ConventionalItemTags.FOODS).add(item); - } - }); getOrCreateTagBuilder(ConventionalItemTags.POTIONS) .add(Items.POTION) .add(Items.SPLASH_POTION) .add(Items.LINGERING_POTION); } + private void generateFoodTags() { + getOrCreateTagBuilder(ConventionalItemTags.RAW_MEAT_FOOD) + .add(Items.BEEF) + .add(Items.CHICKEN) + .add(Items.RABBIT) + .add(Items.MUTTON); + + getOrCreateTagBuilder(ConventionalItemTags.RAW_FISH_FOOD) + .add(Items.COD) + .add(Items.SALMON) + .add(Items.TROPICAL_FISH) + .add(Items.PUFFERFISH); + + getOrCreateTagBuilder(ConventionalItemTags.COOKED_MEAT_FOOD) + .add(Items.COOKED_BEEF) + .add(Items.COOKED_CHICKEN) + .add(Items.COOKED_RABBIT) + .add(Items.COOKED_MUTTON); + + getOrCreateTagBuilder(ConventionalItemTags.COOKED_FISH_FOOD) + .add(Items.COOKED_COD) + .add(Items.COOKED_SALMON); + + Registries.ITEM.forEach(item -> { + if (item.getFoodComponent() != null) { + getOrCreateTagBuilder(ConventionalItemTags.FOOD).add(item); + } + }); + + getOrCreateTagBuilder(ConventionalItemTags.FOOD) + .addOptionalTag(ConventionalItemTags.RAW_MEAT_FOOD) + .addOptionalTag(ConventionalItemTags.RAW_FISH_FOOD) + .addOptionalTag(ConventionalItemTags.COOKED_MEAT_FOOD) + .addOptionalTag(ConventionalItemTags.COOKED_FISH_FOOD); + } + private void generateBucketTags() { getOrCreateTagBuilder(ConventionalItemTags.EMPTY_BUCKETS) .add(Items.BUCKET); 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 7af94c27e5..e242dd0743 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 @@ -95,8 +95,15 @@ private ConventionalItemTags() { public static final TagKey COAL = register("coal"); // Consumables - public static final TagKey FOODS = register("foods"); public static final TagKey POTIONS = register("potions"); + + // Foods + public static final TagKey FOOD = register("food"); + public static final TagKey RAW_MEAT_FOOD = register("food/raw_meat"); + public static final TagKey COOKED_MEAT_FOOD = register("food/cooked_meat"); + public static final TagKey RAW_FISH_FOOD = register("food/raw_fish"); + public static final TagKey COOKED_FISH_FOOD = register("food/cooked_fish"); + // Buckets /** * Does not include entity water buckets. From 3540155c885eeca344ed09867492671e6ebb25b6 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 11 Nov 2023 17:55:59 -0500 Subject: [PATCH 074/123] datagen new tags --- .../c/tags/items/{foods.json => food.json} | 18 +++++++++++++++++- .../data/c/tags/items/food/cooked_fish.json | 7 +++++++ .../data/c/tags/items/food/cooked_meat.json | 9 +++++++++ .../data/c/tags/items/food/raw_fish.json | 9 +++++++++ .../data/c/tags/items/food/raw_meat.json | 9 +++++++++ .../worldgen/biome/no_default_monsters.json | 7 +++++++ 6 files changed, 58 insertions(+), 1 deletion(-) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{foods.json => food.json} (78%) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/cooked_fish.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/cooked_meat.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/raw_fish.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/raw_meat.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/no_default_monsters.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food.json similarity index 78% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food.json index a9bb5716de..5e2e450c69 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food.json @@ -40,6 +40,22 @@ "minecraft:suspicious_stew", "minecraft:sweet_berries", "minecraft:glow_berries", - "minecraft:honey_bottle" + "minecraft:honey_bottle", + { + "id": "#c:food/raw_meat", + "required": false + }, + { + "id": "#c:food/raw_fish", + "required": false + }, + { + "id": "#c:food/cooked_meat", + "required": false + }, + { + "id": "#c:food/cooked_fish", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/cooked_fish.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/cooked_fish.json new file mode 100644 index 0000000000..0c095564aa --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/cooked_fish.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:cooked_cod", + "minecraft:cooked_salmon" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/cooked_meat.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/cooked_meat.json new file mode 100644 index 0000000000..8d18cc5ce3 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/cooked_meat.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "minecraft:cooked_beef", + "minecraft:cooked_chicken", + "minecraft:cooked_rabbit", + "minecraft:cooked_mutton" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/raw_fish.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/raw_fish.json new file mode 100644 index 0000000000..bfbe799fca --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/raw_fish.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "minecraft:cod", + "minecraft:salmon", + "minecraft:tropical_fish", + "minecraft:pufferfish" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/raw_meat.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/raw_meat.json new file mode 100644 index 0000000000..67485e8338 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/raw_meat.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "minecraft:beef", + "minecraft:chicken", + "minecraft:rabbit", + "minecraft:mutton" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/no_default_monsters.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/no_default_monsters.json new file mode 100644 index 0000000000..4f47046888 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/no_default_monsters.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:mushroom_fields", + "minecraft:deep_dark" + ] +} \ No newline at end of file From 1d0a2e8060655585add77d36fa28ced824cd3a95 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 11 Nov 2023 18:00:51 -0500 Subject: [PATCH 075/123] better sort food tag --- .../datagen/generators/ItemTagGenerator.java | 8 +-- .../resources/data/c/tags/items/food.json | 56 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) 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 ff6cff438c..1b8b88b2bd 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 @@ -16,8 +16,10 @@ package net.fabricmc.fabric.impl.tag.convention.datagen.generators; +import java.util.Comparator; import java.util.concurrent.CompletableFuture; +import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; import net.minecraft.item.Items; import net.minecraft.registry.Registries; @@ -178,10 +180,8 @@ private void generateFoodTags() { .add(Items.COOKED_COD) .add(Items.COOKED_SALMON); - Registries.ITEM.forEach(item -> { - if (item.getFoodComponent() != null) { - getOrCreateTagBuilder(ConventionalItemTags.FOOD).add(item); - } + Registries.ITEM.stream().filter(Item::isFood).sorted(Comparator.comparing(i -> i.getName().getString())).forEach(item -> { + getOrCreateTagBuilder(ConventionalItemTags.FOOD).add(item); }); getOrCreateTagBuilder(ConventionalItemTags.FOOD) diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food.json index 5e2e450c69..d7e456f464 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food.json @@ -2,45 +2,45 @@ "replace": false, "values": [ "minecraft:apple", - "minecraft:mushroom_stew", + "minecraft:baked_potato", + "minecraft:beetroot", + "minecraft:beetroot_soup", "minecraft:bread", - "minecraft:porkchop", - "minecraft:cooked_porkchop", - "minecraft:golden_apple", - "minecraft:enchanted_golden_apple", - "minecraft:cod", - "minecraft:salmon", - "minecraft:tropical_fish", - "minecraft:pufferfish", + "minecraft:carrot", + "minecraft:chorus_fruit", + "minecraft:cooked_chicken", "minecraft:cooked_cod", + "minecraft:cooked_mutton", + "minecraft:cooked_porkchop", + "minecraft:cooked_rabbit", "minecraft:cooked_salmon", "minecraft:cookie", - "minecraft:melon_slice", "minecraft:dried_kelp", - "minecraft:beef", - "minecraft:cooked_beef", - "minecraft:chicken", - "minecraft:cooked_chicken", - "minecraft:rotten_flesh", - "minecraft:spider_eye", - "minecraft:carrot", - "minecraft:potato", - "minecraft:baked_potato", - "minecraft:poisonous_potato", + "minecraft:enchanted_golden_apple", + "minecraft:glow_berries", + "minecraft:golden_apple", "minecraft:golden_carrot", + "minecraft:honey_bottle", + "minecraft:melon_slice", + "minecraft:mushroom_stew", + "minecraft:poisonous_potato", + "minecraft:potato", + "minecraft:pufferfish", "minecraft:pumpkin_pie", - "minecraft:rabbit", - "minecraft:cooked_rabbit", "minecraft:rabbit_stew", + "minecraft:beef", + "minecraft:chicken", + "minecraft:cod", "minecraft:mutton", - "minecraft:cooked_mutton", - "minecraft:chorus_fruit", - "minecraft:beetroot", - "minecraft:beetroot_soup", + "minecraft:porkchop", + "minecraft:rabbit", + "minecraft:salmon", + "minecraft:rotten_flesh", + "minecraft:spider_eye", + "minecraft:cooked_beef", "minecraft:suspicious_stew", "minecraft:sweet_berries", - "minecraft:glow_berries", - "minecraft:honey_bottle", + "minecraft:tropical_fish", { "id": "#c:food/raw_meat", "required": false From 5455ca53da9b31f1d4837ec790ea7954ddc17b2c Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 11 Nov 2023 18:02:47 -0500 Subject: [PATCH 076/123] warn for more old tag names --- .../impl/tag/convention/ConventionLogWarnings.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index f5ed96f596..8bb7232524 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -167,7 +167,15 @@ public enum LOG_WARNING_MODES { createMapEntry(RegistryKeys.ITEM, "stone", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.STONES), createMapEntry(RegistryKeys.ITEM, "string", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.STRINGS), createMapEntry(RegistryKeys.ITEM, "sticks", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WOODEN_RODS), - createMapEntry(RegistryKeys.ITEM, "wooden_rods", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WOODEN_RODS) + createMapEntry(RegistryKeys.ITEM, "wooden_rods", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WOODEN_RODS), + createMapEntry(RegistryKeys.ITEM, "raw_meat", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_MEAT_FOOD), + createMapEntry(RegistryKeys.ITEM, "raw_meats", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_MEAT_FOOD), + createMapEntry(RegistryKeys.ITEM, "raw_fish", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_FISH_FOOD), + createMapEntry(RegistryKeys.ITEM, "raw_fishes", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_FISH_FOOD), + createMapEntry(RegistryKeys.ITEM, "cooked_meat", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_MEAT_FOOD), + createMapEntry(RegistryKeys.ITEM, "cooked_meats", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_MEAT_FOOD), + createMapEntry(RegistryKeys.ITEM, "cooked_fish", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_FISH_FOOD), + createMapEntry(RegistryKeys.ITEM, "cooked_fishes", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_FISH_FOOD) ); From 5c71cd8cc0b8b8d843feab63ebba23450fc913bf Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 11 Nov 2023 18:39:31 -0500 Subject: [PATCH 077/123] sort food tag better and remove redundant entries --- .../datagen/generators/ItemTagGenerator.java | 28 +++++++++-- .../resources/data/c/tags/items/food.json | 50 +++++++------------ 2 files changed, 41 insertions(+), 37 deletions(-) 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 1b8b88b2bd..3151fb7934 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 @@ -180,11 +180,31 @@ private void generateFoodTags() { .add(Items.COOKED_COD) .add(Items.COOKED_SALMON); - Registries.ITEM.stream().filter(Item::isFood).sorted(Comparator.comparing(i -> i.getName().getString())).forEach(item -> { - getOrCreateTagBuilder(ConventionalItemTags.FOOD).add(item); - }); - getOrCreateTagBuilder(ConventionalItemTags.FOOD) + .add(Items.APPLE) + .add(Items.GOLDEN_APPLE) + .add(Items.ENCHANTED_GOLDEN_APPLE) + .add(Items.CARROT) + .add(Items.GOLDEN_CARROT) + .add(Items.POTATO) + .add(Items.POISONOUS_POTATO) + .add(Items.BAKED_POTATO) + .add(Items.MELON_SLICE) + .add(Items.GLISTERING_MELON_SLICE) + .add(Items.PUMPKIN_PIE) + .add(Items.SWEET_BERRIES) + .add(Items.GLOW_BERRIES) + .add(Items.DRIED_KELP) + .add(Items.BREAD) + .add(Items.COOKIE) + .add(Items.BEETROOT) + .add(Items.BEETROOT_SOUP) + .add(Items.RABBIT_STEW) + .add(Items.MUSHROOM_STEW) + .add(Items.SUSPICIOUS_STEW) + .add(Items.HONEY_BOTTLE) + .add(Items.SPIDER_EYE) + .add(Items.ROTTEN_FLESH) .addOptionalTag(ConventionalItemTags.RAW_MEAT_FOOD) .addOptionalTag(ConventionalItemTags.RAW_FISH_FOOD) .addOptionalTag(ConventionalItemTags.COOKED_MEAT_FOOD) diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food.json index d7e456f464..7025bc8695 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food.json @@ -2,45 +2,29 @@ "replace": false, "values": [ "minecraft:apple", - "minecraft:baked_potato", - "minecraft:beetroot", - "minecraft:beetroot_soup", - "minecraft:bread", - "minecraft:carrot", - "minecraft:chorus_fruit", - "minecraft:cooked_chicken", - "minecraft:cooked_cod", - "minecraft:cooked_mutton", - "minecraft:cooked_porkchop", - "minecraft:cooked_rabbit", - "minecraft:cooked_salmon", - "minecraft:cookie", - "minecraft:dried_kelp", - "minecraft:enchanted_golden_apple", - "minecraft:glow_berries", "minecraft:golden_apple", + "minecraft:enchanted_golden_apple", + "minecraft:carrot", "minecraft:golden_carrot", - "minecraft:honey_bottle", - "minecraft:melon_slice", - "minecraft:mushroom_stew", - "minecraft:poisonous_potato", "minecraft:potato", - "minecraft:pufferfish", + "minecraft:poisonous_potato", + "minecraft:baked_potato", + "minecraft:melon_slice", + "minecraft:glistering_melon_slice", "minecraft:pumpkin_pie", + "minecraft:sweet_berries", + "minecraft:glow_berries", + "minecraft:dried_kelp", + "minecraft:bread", + "minecraft:cookie", + "minecraft:beetroot", + "minecraft:beetroot_soup", "minecraft:rabbit_stew", - "minecraft:beef", - "minecraft:chicken", - "minecraft:cod", - "minecraft:mutton", - "minecraft:porkchop", - "minecraft:rabbit", - "minecraft:salmon", - "minecraft:rotten_flesh", - "minecraft:spider_eye", - "minecraft:cooked_beef", + "minecraft:mushroom_stew", "minecraft:suspicious_stew", - "minecraft:sweet_berries", - "minecraft:tropical_fish", + "minecraft:honey_bottle", + "minecraft:spider_eye", + "minecraft:rotten_flesh", { "id": "#c:food/raw_meat", "required": false From a35e975a95ae370fb1bf180357b1aaa16fa42f13 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 12 Nov 2023 07:35:39 -0500 Subject: [PATCH 078/123] Match vanilla fishes format --- .../tag/convention/ConventionLogWarnings.java | 17 +++++++-------- .../datagen/generators/ItemTagGenerator.java | 21 ++++++++----------- .../c/tags/items/{food.json => foods.json} | 8 +++---- .../cooked_fishes.json} | 0 .../cooked_meats.json} | 0 .../raw_fish.json => foods/raw_fishes.json} | 0 .../raw_meat.json => foods/raw_meats.json} | 0 .../convention/v2/ConventionalItemTags.java | 10 ++++----- 8 files changed, 26 insertions(+), 30 deletions(-) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{food.json => foods.json} (86%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{food/cooked_fish.json => foods/cooked_fishes.json} (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{food/cooked_meat.json => foods/cooked_meats.json} (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{food/raw_fish.json => foods/raw_fishes.json} (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{food/raw_meat.json => foods/raw_meats.json} (100%) diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 8bb7232524..6992290cd7 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -70,7 +70,6 @@ public enum LOG_WARNING_MODES { createMapEntry(ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS), createMapEntry(ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS), - createMapEntry(ConventionalItemTags.FOODS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.FOOD), createMapEntry(ConventionalItemTags.QUARTZ_ORES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.QUARTZ_ORES), createMapEntry(ConventionalItemTags.WOODEN_BARRELS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WOODEN_BARRELS), createMapEntry(ConventionalItemTags.SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SANDSTONE_BLOCKS), @@ -168,14 +167,14 @@ public enum LOG_WARNING_MODES { createMapEntry(RegistryKeys.ITEM, "string", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.STRINGS), createMapEntry(RegistryKeys.ITEM, "sticks", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WOODEN_RODS), createMapEntry(RegistryKeys.ITEM, "wooden_rods", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WOODEN_RODS), - createMapEntry(RegistryKeys.ITEM, "raw_meat", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_MEAT_FOOD), - createMapEntry(RegistryKeys.ITEM, "raw_meats", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_MEAT_FOOD), - createMapEntry(RegistryKeys.ITEM, "raw_fish", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_FISH_FOOD), - createMapEntry(RegistryKeys.ITEM, "raw_fishes", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_FISH_FOOD), - createMapEntry(RegistryKeys.ITEM, "cooked_meat", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_MEAT_FOOD), - createMapEntry(RegistryKeys.ITEM, "cooked_meats", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_MEAT_FOOD), - createMapEntry(RegistryKeys.ITEM, "cooked_fish", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_FISH_FOOD), - createMapEntry(RegistryKeys.ITEM, "cooked_fishes", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_FISH_FOOD) + createMapEntry(RegistryKeys.ITEM, "raw_meat", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_MEATS_FOODS), + createMapEntry(RegistryKeys.ITEM, "raw_meats", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_MEATS_FOODS), + createMapEntry(RegistryKeys.ITEM, "raw_fish", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_FISHES_FOODS), + createMapEntry(RegistryKeys.ITEM, "raw_fishes", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_FISHES_FOODS), + createMapEntry(RegistryKeys.ITEM, "cooked_meat", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_MEATS_FOODS), + createMapEntry(RegistryKeys.ITEM, "cooked_meats", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_MEATS_FOODS), + createMapEntry(RegistryKeys.ITEM, "cooked_fish", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_FISHES_FOODS), + createMapEntry(RegistryKeys.ITEM, "cooked_fishes", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_FISHES_FOODS) ); 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 3151fb7934..1330a632bc 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 @@ -16,13 +16,10 @@ package net.fabricmc.fabric.impl.tag.convention.datagen.generators; -import java.util.Comparator; import java.util.concurrent.CompletableFuture; -import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; import net.minecraft.item.Items; -import net.minecraft.registry.Registries; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.ItemTags; import net.minecraft.util.Identifier; @@ -158,29 +155,29 @@ private void generateConsumableTags() { } private void generateFoodTags() { - getOrCreateTagBuilder(ConventionalItemTags.RAW_MEAT_FOOD) + getOrCreateTagBuilder(ConventionalItemTags.RAW_MEATS_FOODS) .add(Items.BEEF) .add(Items.CHICKEN) .add(Items.RABBIT) .add(Items.MUTTON); - getOrCreateTagBuilder(ConventionalItemTags.RAW_FISH_FOOD) + getOrCreateTagBuilder(ConventionalItemTags.RAW_FISHES_FOODS) .add(Items.COD) .add(Items.SALMON) .add(Items.TROPICAL_FISH) .add(Items.PUFFERFISH); - getOrCreateTagBuilder(ConventionalItemTags.COOKED_MEAT_FOOD) + getOrCreateTagBuilder(ConventionalItemTags.COOKED_MEATS_FOODS) .add(Items.COOKED_BEEF) .add(Items.COOKED_CHICKEN) .add(Items.COOKED_RABBIT) .add(Items.COOKED_MUTTON); - getOrCreateTagBuilder(ConventionalItemTags.COOKED_FISH_FOOD) + getOrCreateTagBuilder(ConventionalItemTags.COOKED_FISHES_FOODS) .add(Items.COOKED_COD) .add(Items.COOKED_SALMON); - getOrCreateTagBuilder(ConventionalItemTags.FOOD) + getOrCreateTagBuilder(ConventionalItemTags.FOODS) .add(Items.APPLE) .add(Items.GOLDEN_APPLE) .add(Items.ENCHANTED_GOLDEN_APPLE) @@ -205,10 +202,10 @@ private void generateFoodTags() { .add(Items.HONEY_BOTTLE) .add(Items.SPIDER_EYE) .add(Items.ROTTEN_FLESH) - .addOptionalTag(ConventionalItemTags.RAW_MEAT_FOOD) - .addOptionalTag(ConventionalItemTags.RAW_FISH_FOOD) - .addOptionalTag(ConventionalItemTags.COOKED_MEAT_FOOD) - .addOptionalTag(ConventionalItemTags.COOKED_FISH_FOOD); + .addOptionalTag(ConventionalItemTags.RAW_MEATS_FOODS) + .addOptionalTag(ConventionalItemTags.RAW_FISHES_FOODS) + .addOptionalTag(ConventionalItemTags.COOKED_MEATS_FOODS) + .addOptionalTag(ConventionalItemTags.COOKED_FISHES_FOODS); } private void generateBucketTags() { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json similarity index 86% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json index 7025bc8695..bed4dd0bea 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json @@ -26,19 +26,19 @@ "minecraft:spider_eye", "minecraft:rotten_flesh", { - "id": "#c:food/raw_meat", + "id": "#c:foods/raw_meats", "required": false }, { - "id": "#c:food/raw_fish", + "id": "#c:foods/raw_fishes", "required": false }, { - "id": "#c:food/cooked_meat", + "id": "#c:foods/cooked_meats", "required": false }, { - "id": "#c:food/cooked_fish", + "id": "#c:foods/cooked_fishes", "required": false } ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/cooked_fish.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cooked_fishes.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/cooked_fish.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cooked_fishes.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/cooked_meat.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cooked_meats.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/cooked_meat.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cooked_meats.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/raw_fish.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/raw_fishes.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/raw_fish.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/raw_fishes.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/raw_meat.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/raw_meats.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/food/raw_meat.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/raw_meats.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 e242dd0743..e05997f88e 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 @@ -98,11 +98,11 @@ private ConventionalItemTags() { public static final TagKey POTIONS = register("potions"); // Foods - public static final TagKey FOOD = register("food"); - public static final TagKey RAW_MEAT_FOOD = register("food/raw_meat"); - public static final TagKey COOKED_MEAT_FOOD = register("food/cooked_meat"); - public static final TagKey RAW_FISH_FOOD = register("food/raw_fish"); - public static final TagKey COOKED_FISH_FOOD = register("food/cooked_fish"); + public static final TagKey FOODS = register("foods"); + public static final TagKey RAW_MEATS_FOODS = register("foods/raw_meats"); + public static final TagKey COOKED_MEATS_FOODS = register("foods/cooked_meats"); + public static final TagKey RAW_FISHES_FOODS = register("foods/raw_fishes"); + public static final TagKey COOKED_FISHES_FOODS = register("foods/cooked_fishes"); // Buckets /** From cb6b171cad1abaf55e800da785af61a48a0e0cc2 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 12 Nov 2023 11:08:44 -0500 Subject: [PATCH 079/123] bread and cookie tags --- .../tag/convention/ConventionLogWarnings.java | 18 +++++- .../datagen/generators/ItemTagGenerator.java | 57 ++++++++++++------- .../convention/v2/ConventionalItemTags.java | 18 ++++++ 3 files changed, 72 insertions(+), 21 deletions(-) diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 6992290cd7..1b3ffabd05 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -168,13 +168,29 @@ public enum LOG_WARNING_MODES { createMapEntry(RegistryKeys.ITEM, "sticks", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WOODEN_RODS), createMapEntry(RegistryKeys.ITEM, "wooden_rods", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WOODEN_RODS), createMapEntry(RegistryKeys.ITEM, "raw_meat", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_MEATS_FOODS), + createMapEntry(RegistryKeys.ITEM, "food", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.FOODS), + createMapEntry(RegistryKeys.ITEM, "fruit", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.FRUITS_FOODS), + createMapEntry(RegistryKeys.ITEM, "fruits", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.FRUITS_FOODS), + createMapEntry(RegistryKeys.ITEM, "vegetable", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.VEGETABLES_FOODS), + createMapEntry(RegistryKeys.ITEM, "vegetables", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.VEGETABLES_FOODS), + createMapEntry(RegistryKeys.ITEM, "berry", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BERRIES_FOODS), + createMapEntry(RegistryKeys.ITEM, "berries", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BERRIES_FOODS), + createMapEntry(RegistryKeys.ITEM, "bread", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BREADS_FOODS), + createMapEntry(RegistryKeys.ITEM, "breads", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BREADS_FOODS), + createMapEntry(RegistryKeys.ITEM, "cookie", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKIES_FOODS), + createMapEntry(RegistryKeys.ITEM, "cookies", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKIES_FOODS), + createMapEntry(RegistryKeys.ITEM, "raw_meat", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_MEATS_FOODS), createMapEntry(RegistryKeys.ITEM, "raw_meats", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_MEATS_FOODS), createMapEntry(RegistryKeys.ITEM, "raw_fish", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_FISHES_FOODS), createMapEntry(RegistryKeys.ITEM, "raw_fishes", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_FISHES_FOODS), createMapEntry(RegistryKeys.ITEM, "cooked_meat", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_MEATS_FOODS), createMapEntry(RegistryKeys.ITEM, "cooked_meats", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_MEATS_FOODS), createMapEntry(RegistryKeys.ITEM, "cooked_fish", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_FISHES_FOODS), - createMapEntry(RegistryKeys.ITEM, "cooked_fishes", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_FISHES_FOODS) + createMapEntry(RegistryKeys.ITEM, "cooked_fishes", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_FISHES_FOODS), + createMapEntry(RegistryKeys.ITEM, "soup", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUPS_FOODS), + createMapEntry(RegistryKeys.ITEM, "soups", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUPS_FOODS), + createMapEntry(RegistryKeys.ITEM, "stew", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUPS_FOODS), + createMapEntry(RegistryKeys.ITEM, "stews", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUPS_FOODS) ); 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 1330a632bc..024fa7784e 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 @@ -155,6 +155,29 @@ private void generateConsumableTags() { } private void generateFoodTags() { + getOrCreateTagBuilder(ConventionalItemTags.FRUITS_FOODS) + .add(Items.APPLE) + .add(Items.GOLDEN_APPLE) + .add(Items.ENCHANTED_GOLDEN_APPLE); + + getOrCreateTagBuilder(ConventionalItemTags.VEGETABLES_FOODS) + .add(Items.CARROT) + .add(Items.GOLDEN_CARROT) + .add(Items.POTATO) + .add(Items.POISONOUS_POTATO) + .add(Items.MELON_SLICE) + .add(Items.BEETROOT); + + getOrCreateTagBuilder(ConventionalItemTags.BERRIES_FOODS) + .add(Items.SWEET_BERRIES) + .add(Items.GLOW_BERRIES); + + getOrCreateTagBuilder(ConventionalItemTags.BREADS_FOODS) + .add(Items.BREAD); + + getOrCreateTagBuilder(ConventionalItemTags.COOKIES_FOODS) + .add(Items.COOKIE); + getOrCreateTagBuilder(ConventionalItemTags.RAW_MEATS_FOODS) .add(Items.BEEF) .add(Items.CHICKEN) @@ -177,35 +200,29 @@ private void generateFoodTags() { .add(Items.COOKED_COD) .add(Items.COOKED_SALMON); + getOrCreateTagBuilder(ConventionalItemTags.SOUPS_FOODS) + .add(Items.BEETROOT_SOUP) + .add(Items.MUSHROOM_STEW) + .add(Items.RABBIT_STEW) + .add(Items.SUSPICIOUS_STEW); + getOrCreateTagBuilder(ConventionalItemTags.FOODS) - .add(Items.APPLE) - .add(Items.GOLDEN_APPLE) - .add(Items.ENCHANTED_GOLDEN_APPLE) - .add(Items.CARROT) - .add(Items.GOLDEN_CARROT) - .add(Items.POTATO) - .add(Items.POISONOUS_POTATO) .add(Items.BAKED_POTATO) - .add(Items.MELON_SLICE) - .add(Items.GLISTERING_MELON_SLICE) .add(Items.PUMPKIN_PIE) - .add(Items.SWEET_BERRIES) - .add(Items.GLOW_BERRIES) - .add(Items.DRIED_KELP) - .add(Items.BREAD) - .add(Items.COOKIE) - .add(Items.BEETROOT) - .add(Items.BEETROOT_SOUP) - .add(Items.RABBIT_STEW) - .add(Items.MUSHROOM_STEW) - .add(Items.SUSPICIOUS_STEW) .add(Items.HONEY_BOTTLE) + .add(Items.DRIED_KELP) .add(Items.SPIDER_EYE) .add(Items.ROTTEN_FLESH) + .addOptionalTag(ConventionalItemTags.FRUITS_FOODS) + .addOptionalTag(ConventionalItemTags.VEGETABLES_FOODS) + .addOptionalTag(ConventionalItemTags.BERRIES_FOODS) + .addOptionalTag(ConventionalItemTags.BREADS_FOODS) + .addOptionalTag(ConventionalItemTags.COOKIES_FOODS) .addOptionalTag(ConventionalItemTags.RAW_MEATS_FOODS) .addOptionalTag(ConventionalItemTags.RAW_FISHES_FOODS) .addOptionalTag(ConventionalItemTags.COOKED_MEATS_FOODS) - .addOptionalTag(ConventionalItemTags.COOKED_FISHES_FOODS); + .addOptionalTag(ConventionalItemTags.COOKED_FISHES_FOODS) + .addOptionalTag(ConventionalItemTags.SOUPS_FOODS); } private void generateBucketTags() { 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 e05997f88e..745579e0c5 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 @@ -99,10 +99,28 @@ private ConventionalItemTags() { // Foods public static final TagKey FOODS = register("foods"); + /** + * Apples and other foods that are considered fruits in the culinary field belong in this tag. + */ + public static final TagKey FRUITS_FOODS = register("foods/fruits"); + /** + * Tomatoes and other foods that are considered vegetables in the culinary field belong in this tag. + */ + public static final TagKey VEGETABLES_FOODS = register("foods/vegetables"); + /** + * Strawberries, raspberries, and other berry foods belong in this tag. + */ + public static final TagKey BERRIES_FOODS = register("foods/berries"); + public static final TagKey BREADS_FOODS = register("foods/breads"); + public static final TagKey COOKIES_FOODS = register("foods/cookies"); public static final TagKey RAW_MEATS_FOODS = register("foods/raw_meats"); public static final TagKey COOKED_MEATS_FOODS = register("foods/cooked_meats"); public static final TagKey RAW_FISHES_FOODS = register("foods/raw_fishes"); public static final TagKey COOKED_FISHES_FOODS = register("foods/cooked_fishes"); + /** + * Soups, stews, and other liquid food in bowls belongs in this tag. + */ + public static final TagKey SOUPS_FOODS = register("foods/soups"); // Buckets /** From 7528e9313aada2731eae49ee7f186b84e3e65666 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 12 Nov 2023 11:31:08 -0500 Subject: [PATCH 080/123] added edible when placed --- .../tag/convention/datagen/generators/ItemTagGenerator.java | 6 +++++- .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) 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 024fa7784e..23ab8703dd 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 @@ -206,6 +206,9 @@ private void generateFoodTags() { .add(Items.RABBIT_STEW) .add(Items.SUSPICIOUS_STEW); + getOrCreateTagBuilder(ConventionalItemTags.EDIBLE_WHEN_PLACED_FOODS) + .add(Items.CAKE); + getOrCreateTagBuilder(ConventionalItemTags.FOODS) .add(Items.BAKED_POTATO) .add(Items.PUMPKIN_PIE) @@ -222,7 +225,8 @@ private void generateFoodTags() { .addOptionalTag(ConventionalItemTags.RAW_FISHES_FOODS) .addOptionalTag(ConventionalItemTags.COOKED_MEATS_FOODS) .addOptionalTag(ConventionalItemTags.COOKED_FISHES_FOODS) - .addOptionalTag(ConventionalItemTags.SOUPS_FOODS); + .addOptionalTag(ConventionalItemTags.SOUPS_FOODS) + .addOptionalTag(ConventionalItemTags.EDIBLE_WHEN_PLACED_FOODS); } private void generateBucketTags() { 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 745579e0c5..b6138c3114 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 @@ -121,6 +121,10 @@ private ConventionalItemTags() { * Soups, stews, and other liquid food in bowls belongs in this tag. */ public static final TagKey SOUPS_FOODS = register("foods/soups"); + /** + * Foods like cake that can be eaten when placed in the world belong in this tag. + */ + public static final TagKey EDIBLE_WHEN_PLACED_FOODS = register("foods/edible_when_placed"); // Buckets /** From 63724575002b602c4cab414a708c454c86c099a4 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 12 Nov 2023 13:33:55 -0500 Subject: [PATCH 081/123] candies tag --- .../fabric/impl/tag/convention/ConventionLogWarnings.java | 4 +++- .../tag/convention/datagen/generators/ItemTagGenerator.java | 3 +++ .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 1b3ffabd05..5bc6af8923 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -190,7 +190,9 @@ public enum LOG_WARNING_MODES { createMapEntry(RegistryKeys.ITEM, "soup", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUPS_FOODS), createMapEntry(RegistryKeys.ITEM, "soups", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUPS_FOODS), createMapEntry(RegistryKeys.ITEM, "stew", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUPS_FOODS), - createMapEntry(RegistryKeys.ITEM, "stews", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUPS_FOODS) + createMapEntry(RegistryKeys.ITEM, "stews", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUPS_FOODS), + createMapEntry(RegistryKeys.ITEM, "candy", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.CANDIES_FOODS), + createMapEntry(RegistryKeys.ITEM, "candies", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.CANDIES_FOODS) ); 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 23ab8703dd..9a0f3b1d19 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 @@ -206,6 +206,8 @@ private void generateFoodTags() { .add(Items.RABBIT_STEW) .add(Items.SUSPICIOUS_STEW); + getOrCreateTagBuilder(ConventionalItemTags.CANDIES_FOODS); + getOrCreateTagBuilder(ConventionalItemTags.EDIBLE_WHEN_PLACED_FOODS) .add(Items.CAKE); @@ -226,6 +228,7 @@ private void generateFoodTags() { .addOptionalTag(ConventionalItemTags.COOKED_MEATS_FOODS) .addOptionalTag(ConventionalItemTags.COOKED_FISHES_FOODS) .addOptionalTag(ConventionalItemTags.SOUPS_FOODS) + .addOptionalTag(ConventionalItemTags.CANDIES_FOODS) .addOptionalTag(ConventionalItemTags.EDIBLE_WHEN_PLACED_FOODS); } 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 b6138c3114..5384d38798 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 @@ -121,6 +121,10 @@ private ConventionalItemTags() { * Soups, stews, and other liquid food in bowls belongs in this tag. */ public static final TagKey SOUPS_FOODS = register("foods/soups"); + /** + * Sweets and candies like lollipops or chocolate belong in this tag. + */ + public static final TagKey CANDIES_FOODS = register("foods/candies"); /** * Foods like cake that can be eaten when placed in the world belong in this tag. */ From 9e807f734ef0e726fc812ee5289e93b7ea7f2dc2 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 12 Nov 2023 18:36:23 -0500 Subject: [PATCH 082/123] rerun datagen for foods --- .../resources/data/c/tags/items/foods.json | 52 ++++++++++++------- .../data/c/tags/items/foods/berries.json | 7 +++ .../data/c/tags/items/foods/breads.json | 6 +++ .../data/c/tags/items/foods/candies.json | 4 ++ .../data/c/tags/items/foods/cookies.json | 6 +++ .../tags/items/foods/edible_when_placed.json | 6 +++ .../data/c/tags/items/foods/fruits.json | 8 +++ .../data/c/tags/items/foods/soups.json | 9 ++++ .../data/c/tags/items/foods/vegetables.json | 11 ++++ 9 files changed, 90 insertions(+), 19 deletions(-) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/berries.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/breads.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/candies.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cookies.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/edible_when_placed.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/fruits.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/soups.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/vegetables.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json index bed4dd0bea..71f45d3f56 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json @@ -1,30 +1,32 @@ { "replace": false, "values": [ - "minecraft:apple", - "minecraft:golden_apple", - "minecraft:enchanted_golden_apple", - "minecraft:carrot", - "minecraft:golden_carrot", - "minecraft:potato", - "minecraft:poisonous_potato", "minecraft:baked_potato", - "minecraft:melon_slice", - "minecraft:glistering_melon_slice", "minecraft:pumpkin_pie", - "minecraft:sweet_berries", - "minecraft:glow_berries", - "minecraft:dried_kelp", - "minecraft:bread", - "minecraft:cookie", - "minecraft:beetroot", - "minecraft:beetroot_soup", - "minecraft:rabbit_stew", - "minecraft:mushroom_stew", - "minecraft:suspicious_stew", "minecraft:honey_bottle", + "minecraft:dried_kelp", "minecraft:spider_eye", "minecraft:rotten_flesh", + { + "id": "#c:foods/fruits", + "required": false + }, + { + "id": "#c:foods/vegetables", + "required": false + }, + { + "id": "#c:foods/berries", + "required": false + }, + { + "id": "#c:foods/breads", + "required": false + }, + { + "id": "#c:foods/cookies", + "required": false + }, { "id": "#c:foods/raw_meats", "required": false @@ -40,6 +42,18 @@ { "id": "#c:foods/cooked_fishes", "required": false + }, + { + "id": "#c:foods/soups", + "required": false + }, + { + "id": "#c:foods/candies", + "required": false + }, + { + "id": "#c:foods/edible_when_placed", + "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/berries.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/berries.json new file mode 100644 index 0000000000..ba24344c2e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/berries.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:sweet_berries", + "minecraft:glow_berries" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/breads.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/breads.json new file mode 100644 index 0000000000..7ba13a5eed --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/breads.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:bread" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/candies.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/candies.json new file mode 100644 index 0000000000..5e8aecc986 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/candies.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": [] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cookies.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cookies.json new file mode 100644 index 0000000000..a06d2ae8ad --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cookies.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:cookie" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/edible_when_placed.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/edible_when_placed.json new file mode 100644 index 0000000000..a49f1d194c --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/edible_when_placed.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:cake" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/fruits.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/fruits.json new file mode 100644 index 0000000000..ce7de785a4 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/fruits.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "minecraft:apple", + "minecraft:golden_apple", + "minecraft:enchanted_golden_apple" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/soups.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/soups.json new file mode 100644 index 0000000000..d7a5d6c6d4 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/soups.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "minecraft:beetroot_soup", + "minecraft:mushroom_stew", + "minecraft:rabbit_stew", + "minecraft:suspicious_stew" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/vegetables.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/vegetables.json new file mode 100644 index 0000000000..e2231c494b --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/vegetables.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:carrot", + "minecraft:golden_carrot", + "minecraft:potato", + "minecraft:poisonous_potato", + "minecraft:melon_slice", + "minecraft:beetroot" + ] +} \ No newline at end of file From 1d940ffb6a1479573240c16c64f7914727b16b2d Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 12 Nov 2023 19:46:51 -0500 Subject: [PATCH 083/123] ropes and chains tag added on request seems to be used by supplementaries, Comforts, Farmer's Delight, Mine Cells, Connectable Chains, and Charm in past. --- .../datagen/generators/BlockTagGenerator.java | 17 +++++++++++++---- .../datagen/generators/ItemTagGenerator.java | 9 +++++++++ .../resources/data/c/tags/blocks/chains.json | 6 ++++++ .../resources/data/c/tags/blocks/ropes.json | 4 ++++ .../resources/data/c/tags/items/chains.json | 6 ++++++ .../resources/data/c/tags/items/ropes.json | 4 ++++ .../convention/v2/ConventionalBlockTags.java | 3 +++ .../tag/convention/v2/ConventionalItemTags.java | 2 ++ 8 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chains.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ropes.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chains.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ropes.json 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 0bf4130620..dde3c81e8e 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 @@ -102,21 +102,30 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { generateBuddingTags(); - VILLAGER_JOB_SITE_BLOCKS.forEach(getOrCreateTagBuilder(ConventionalBlockTags.VILLAGER_JOB_SITES)::add); - generateSandstoneTags(); - getOrCreateTagBuilder(ConventionalBlockTags.RELOCATION_NOT_SUPPORTED); // Generate tag so others can see it exists through JSON. - generateDyedTags(); generateStorageTags(); generateHeadTags(); + generateMiscTags(); + generateBackwardsCompatTags(); } + private void generateMiscTags() { + VILLAGER_JOB_SITE_BLOCKS.forEach(getOrCreateTagBuilder(ConventionalBlockTags.VILLAGER_JOB_SITES)::add); + + getOrCreateTagBuilder(ConventionalBlockTags.RELOCATION_NOT_SUPPORTED); // Generate tag so others can see it exists through JSON. + + getOrCreateTagBuilder(ConventionalBlockTags.ROPES); // Generate tag so others can see it exists through JSON. + + getOrCreateTagBuilder(ConventionalBlockTags.CHAINS) + .add(Blocks.CHAIN); + } + private void generateSandstoneTags() { getOrCreateTagBuilder(ConventionalBlockTags.SANDSTONE_BLOCKS) .addOptionalTag(ConventionalBlockTags.UNCOLORED_SANDSTONE_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 9a0f3b1d19..62877701fd 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 @@ -395,13 +395,17 @@ private void generateVillagerJobSites() { private void generateOtherTags() { getOrCreateTagBuilder(ConventionalItemTags.STRINGS) .add(Items.STRING); + getOrCreateTagBuilder(ConventionalItemTags.WOODEN_RODS) .add(Items.STICK); + getOrCreateTagBuilder(ConventionalItemTags.BLAZE_RODS) .add(Items.BLAZE_ROD); + getOrCreateTagBuilder(ConventionalItemTags.RODS) .addOptionalTag(ConventionalItemTags.WOODEN_RODS) .addOptionalTag(ConventionalItemTags.BLAZE_RODS); + getOrCreateTagBuilder(ConventionalItemTags.HEADS) .add(Items.SKELETON_SKULL) .add(Items.WITHER_SKELETON_SKULL) @@ -410,6 +414,11 @@ private void generateOtherTags() { .add(Items.CREEPER_HEAD) .add(Items.PIGLIN_HEAD) .add(Items.DRAGON_HEAD); + + getOrCreateTagBuilder(ConventionalItemTags.ROPES); // Generate tag so others can see it exists through JSON. + + getOrCreateTagBuilder(ConventionalItemTags.CHAINS) + .add(Items.CHAIN); } private void generateDyedTags() { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chains.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chains.json new file mode 100644 index 0000000000..5cae040a79 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chains.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:chain" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ropes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ropes.json new file mode 100644 index 0000000000..5e8aecc986 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ropes.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": [] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chains.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chains.json new file mode 100644 index 0000000000..5cae040a79 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chains.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:chain" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ropes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ropes.json new file mode 100644 index 0000000000..5e8aecc986 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ropes.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": [] +} \ No newline at end of file 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 6cad8c19c3..209de40c76 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 @@ -18,6 +18,7 @@ import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.registry.tag.TagKey; import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; @@ -140,6 +141,8 @@ private ConventionalBlockTags() { * Tag that holds all head based blocks such as Skeleton Skull or Player Head. */ public static final TagKey HEADS = register("heads"); + public static final TagKey ROPES = register("ropes"); + public static final TagKey CHAINS = register("chains"); private static TagKey register(String tagId) { return TagRegistration.BLOCK_TAG.registerC(tagId); 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 5384d38798..06e911d12e 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 @@ -260,6 +260,8 @@ private ConventionalItemTags() { * children classes for various custom ingredients available that can also be used in data generation. */ public static final TagKey HEADS = register("heads"); + public static final TagKey ROPES = register("ropes"); + public static final TagKey CHAINS = register("chains"); private static TagKey register(String tagId) { return TagRegistration.ITEM_TAG.registerC(tagId); From 414a53431e5053d63f0af60b7cc23d9109531b42 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Mon, 13 Nov 2023 09:39:13 -0500 Subject: [PATCH 084/123] moved poisonous potato out of vegetables tag --- .../tag/convention/datagen/generators/ItemTagGenerator.java | 2 +- .../src/generated/resources/data/c/tags/items/foods.json | 1 + .../generated/resources/data/c/tags/items/foods/vegetables.json | 1 - .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 2 ++ 4 files changed, 4 insertions(+), 2 deletions(-) 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 62877701fd..099ee8cad5 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 @@ -164,7 +164,6 @@ private void generateFoodTags() { .add(Items.CARROT) .add(Items.GOLDEN_CARROT) .add(Items.POTATO) - .add(Items.POISONOUS_POTATO) .add(Items.MELON_SLICE) .add(Items.BEETROOT); @@ -213,6 +212,7 @@ private void generateFoodTags() { getOrCreateTagBuilder(ConventionalItemTags.FOODS) .add(Items.BAKED_POTATO) + .add(Items.POISONOUS_POTATO) .add(Items.PUMPKIN_PIE) .add(Items.HONEY_BOTTLE) .add(Items.DRIED_KELP) diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json index 71f45d3f56..d92a064c90 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "minecraft:baked_potato", + "minecraft:poisonous_potato", "minecraft:pumpkin_pie", "minecraft:honey_bottle", "minecraft:dried_kelp", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/vegetables.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/vegetables.json index e2231c494b..0665641a7a 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/vegetables.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/vegetables.json @@ -4,7 +4,6 @@ "minecraft:carrot", "minecraft:golden_carrot", "minecraft:potato", - "minecraft:poisonous_potato", "minecraft:melon_slice", "minecraft:beetroot" ] 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 06e911d12e..17ee28e249 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 @@ -101,6 +101,7 @@ private ConventionalItemTags() { public static final TagKey FOODS = register("foods"); /** * Apples and other foods that are considered fruits in the culinary field belong in this tag. + * Cherries would go here as they are considered a "stone fruit" within culinary fields. */ public static final TagKey FRUITS_FOODS = register("foods/fruits"); /** @@ -109,6 +110,7 @@ private ConventionalItemTags() { public static final TagKey VEGETABLES_FOODS = register("foods/vegetables"); /** * Strawberries, raspberries, and other berry foods belong in this tag. + * Cherries would NOT go here as they are considered a "stone fruit" within culinary fields. */ public static final TagKey BERRIES_FOODS = register("foods/berries"); public static final TagKey BREADS_FOODS = register("foods/breads"); From ec2f9949ad5d2f39fd3649e5c9d9c831b2222ee9 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Mon, 13 Nov 2023 10:40:13 -0500 Subject: [PATCH 085/123] food poisoning tag --- .../datagen/generators/ItemTagGenerator.java | 12 ++++++++---- .../api/tag/convention/v2/ConventionalItemTags.java | 5 +++++ 2 files changed, 13 insertions(+), 4 deletions(-) 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 099ee8cad5..0e26501d24 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 @@ -210,14 +210,17 @@ private void generateFoodTags() { getOrCreateTagBuilder(ConventionalItemTags.EDIBLE_WHEN_PLACED_FOODS) .add(Items.CAKE); + getOrCreateTagBuilder(ConventionalItemTags.FOOD_POISONING_FOODS) + .add(Items.POISONOUS_POTATO) + .add(Items.ROTTEN_FLESH) + .add(Items.SPIDER_EYE) + .add(Items.PUFFERFISH); + getOrCreateTagBuilder(ConventionalItemTags.FOODS) .add(Items.BAKED_POTATO) - .add(Items.POISONOUS_POTATO) .add(Items.PUMPKIN_PIE) .add(Items.HONEY_BOTTLE) .add(Items.DRIED_KELP) - .add(Items.SPIDER_EYE) - .add(Items.ROTTEN_FLESH) .addOptionalTag(ConventionalItemTags.FRUITS_FOODS) .addOptionalTag(ConventionalItemTags.VEGETABLES_FOODS) .addOptionalTag(ConventionalItemTags.BERRIES_FOODS) @@ -229,7 +232,8 @@ private void generateFoodTags() { .addOptionalTag(ConventionalItemTags.COOKED_FISHES_FOODS) .addOptionalTag(ConventionalItemTags.SOUPS_FOODS) .addOptionalTag(ConventionalItemTags.CANDIES_FOODS) - .addOptionalTag(ConventionalItemTags.EDIBLE_WHEN_PLACED_FOODS); + .addOptionalTag(ConventionalItemTags.EDIBLE_WHEN_PLACED_FOODS) + .addOptionalTag(ConventionalItemTags.FOOD_POISONING_FOODS); } private void generateBucketTags() { 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 17ee28e249..bd29c07f13 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 @@ -131,6 +131,11 @@ private ConventionalItemTags() { * Foods like cake that can be eaten when placed in the world belong in this tag. */ public static final TagKey EDIBLE_WHEN_PLACED_FOODS = register("foods/edible_when_placed"); + /** + * For foods that inflict food poisoning-like effects. + * Examples are Rotten Flesh's Hunger or Pufferfish's Nausea, or Poisonous Potato's Poison. + */ + public static final TagKey FOOD_POISONING_FOODS = register("foods/food_poisoning"); // Buckets /** From 6c2ee70c2a5695eda35a0fc0c147d825052b0575 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Mon, 13 Nov 2023 10:53:32 -0500 Subject: [PATCH 086/123] added chicken to food poisoning --- .../datagen/generators/ItemTagGenerator.java | 5 +++-- .../generated/resources/data/c/tags/items/foods.json | 7 ++++--- .../data/c/tags/items/foods/food_poisoning.json | 10 ++++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/food_poisoning.json 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 0e26501d24..e64c8603ab 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 @@ -212,9 +212,10 @@ private void generateFoodTags() { getOrCreateTagBuilder(ConventionalItemTags.FOOD_POISONING_FOODS) .add(Items.POISONOUS_POTATO) - .add(Items.ROTTEN_FLESH) + .add(Items.PUFFERFISH) .add(Items.SPIDER_EYE) - .add(Items.PUFFERFISH); + .add(Items.CHICKEN) + .add(Items.ROTTEN_FLESH); getOrCreateTagBuilder(ConventionalItemTags.FOODS) .add(Items.BAKED_POTATO) diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json index d92a064c90..917e349859 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json @@ -2,12 +2,9 @@ "replace": false, "values": [ "minecraft:baked_potato", - "minecraft:poisonous_potato", "minecraft:pumpkin_pie", "minecraft:honey_bottle", "minecraft:dried_kelp", - "minecraft:spider_eye", - "minecraft:rotten_flesh", { "id": "#c:foods/fruits", "required": false @@ -55,6 +52,10 @@ { "id": "#c:foods/edible_when_placed", "required": false + }, + { + "id": "#c:foods/food_poisoning", + "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/food_poisoning.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/food_poisoning.json new file mode 100644 index 0000000000..47ba33cc5e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/food_poisoning.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:poisonous_potato", + "minecraft:pufferfish", + "minecraft:spider_eye", + "minecraft:chicken", + "minecraft:rotten_flesh" + ] +} \ No newline at end of file From d07240f0913f8bf59a8663f464cfe6a7d91b4234 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Fri, 17 Nov 2023 10:47:39 -0500 Subject: [PATCH 087/123] pluralize some tag names properly --- .../fabric/impl/tag/convention/ConventionLogWarnings.java | 2 +- .../datagen/generators/EnchantmentTagGenerator.java | 8 ++++---- ...t.json => entity_auxiliary_movement_enhancements.json} | 0 ...ed_enhancement.json => entity_speed_enhancements.json} | 0 ...e_enhancement.json => weapon_damage_enhancements.json} | 0 .../tag/convention/v2/ConventionalEnchantmentTags.java | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/{entity_auxiliary_movement_enhancement.json => entity_auxiliary_movement_enhancements.json} (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/{entity_speed_enhancement.json => entity_speed_enhancements.json} (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/{weapon_damage_enhancement.json => weapon_damage_enhancements.json} (100%) diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 5bc6af8923..231b2c9112 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -109,7 +109,7 @@ public enum LOG_WARNING_MODES { createMapEntry(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.INCREASE_BLOCK_DROPS), createMapEntry(ConventionalEnchantmentTags.INCREASES_ENTITY_DROPS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.INCREASE_ENTITY_DROPS), - createMapEntry(ConventionalEnchantmentTags.ENTITY_MOVEMENT_ENHANCEMENT, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.ENTITY_SPEED_ENHANCEMENT), + createMapEntry(ConventionalEnchantmentTags.ENTITY_MOVEMENT_ENHANCEMENT, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.ENTITY_SPEED_ENHANCEMENTS), createMapEntry(ConventionalBiomeTags.IN_NETHER, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_NETHER), createMapEntry(ConventionalBiomeTags.IN_THE_END, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_THE_END), diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java index bf68c6055b..dc43c542d3 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java @@ -37,17 +37,17 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { .add(Enchantments.FORTUNE); getOrCreateTagBuilder(ConventionalEnchantmentTags.INCREASE_ENTITY_DROPS) .add(Enchantments.LOOTING); - getOrCreateTagBuilder(ConventionalEnchantmentTags.WEAPON_DAMAGE_ENHANCEMENT) + getOrCreateTagBuilder(ConventionalEnchantmentTags.WEAPON_DAMAGE_ENHANCEMENTS) .add(Enchantments.SHARPNESS) .add(Enchantments.SMITE) .add(Enchantments.BANE_OF_ARTHROPODS) .add(Enchantments.POWER) .add(Enchantments.IMPALING); - getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_SPEED_ENHANCEMENT) + getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_SPEED_ENHANCEMENTS) .add(Enchantments.SOUL_SPEED) .add(Enchantments.SWIFT_SNEAK) .add(Enchantments.DEPTH_STRIDER); - getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENT) + getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS) .add(Enchantments.FEATHER_FALLING) .add(Enchantments.FROST_WALKER); getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_DEFENSE_ENHANCEMENT) @@ -60,7 +60,7 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. // TODO: Remove backwards compat tag entries in 1.22 - getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_SPEED_ENHANCEMENT) + getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_SPEED_ENHANCEMENTS) .addOptionalTag(new Identifier("c", "entity_movement_enhancement")); } } diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_auxiliary_movement_enhancement.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_auxiliary_movement_enhancements.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_auxiliary_movement_enhancement.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_auxiliary_movement_enhancements.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_speed_enhancement.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_speed_enhancements.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_speed_enhancement.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_speed_enhancements.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/weapon_damage_enhancement.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/weapon_damage_enhancements.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/weapon_damage_enhancement.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/weapon_damage_enhancements.json diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java index 3ce984bf60..dc6104fe7a 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java @@ -38,16 +38,16 @@ private ConventionalEnchantmentTags() { /** * For enchantments that increase the damage dealt by an item. */ - public static final TagKey WEAPON_DAMAGE_ENHANCEMENT = register("weapon_damage_enhancement"); + public static final TagKey WEAPON_DAMAGE_ENHANCEMENTS = register("weapon_damage_enhancements"); /** * For enchantments that increase movement speed for entity wearing armor enchanted with it. */ - public static final TagKey ENTITY_SPEED_ENHANCEMENT = register("entity_speed_enhancement"); + public static final TagKey ENTITY_SPEED_ENHANCEMENTS = register("entity_speed_enhancements"); /** * For enchantments that applies movement-based benefits unrelated to speed for the entity wearing armor enchanted with it. * Example: Reducing falling speeds ({@link net.minecraft.enchantment.Enchantments#FEATHER_FALLING}) or allowing walking on water ({@link net.minecraft.enchantment.Enchantments#FROST_WALKER}) */ - public static final TagKey ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENT = register("entity_auxiliary_movement_enhancement"); + public static final TagKey ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS = register("entity_auxiliary_movement_enhancements"); /** * For enchantments that decrease damage taken or otherwise benefit, in regard to damage, the entity wearing armor enchanted with it. */ From 1ce3d654314532c90eca25519eeaa131025f2902 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Fri, 17 Nov 2023 12:40:53 -0500 Subject: [PATCH 088/123] plural fluids. Added bricks. Parent tags uses sub tags properly --- .../tag/convention/ConventionLogWarnings.java | 6 ++++ .../datagen/generators/FluidTagGenerator.java | 8 ++--- .../datagen/generators/ItemTagGenerator.java | 32 +++++++++++++++---- .../c/tags/fluids/{honey.json => honeys.json} | 0 .../c/tags/fluids/{lava.json => lavas.json} | 0 .../c/tags/fluids/{milk.json => milks.json} | 0 .../c/tags/fluids/{water.json => waters.json} | 0 .../resources/data/c/tags/items/bricks.json | 13 ++++++++ .../data/c/tags/items/bricks/nether.json | 6 ++++ .../data/c/tags/items/bricks/normal.json | 6 ++++ .../resources/data/c/tags/items/dusts.json | 10 ++++-- .../resources/data/c/tags/items/gems.json | 28 +++++++++++++--- .../resources/data/c/tags/items/ingots.json | 20 +++++++++--- .../data/c/tags/items/raw_blocks.json | 15 +++++++-- .../data/c/tags/items/raw_materials.json | 15 +++++++-- .../convention/v2/ConventionalFluidTags.java | 8 ++--- .../convention/v2/ConventionalItemTags.java | 5 +++ 17 files changed, 142 insertions(+), 30 deletions(-) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/{honey.json => honeys.json} (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/{lava.json => lavas.json} (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/{milk.json => milks.json} (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/{water.json => waters.json} (100%) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bricks.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bricks/nether.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bricks/normal.json diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 231b2c9112..8e53f45e99 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -37,6 +37,7 @@ import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBiomeTags; import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags; import net.fabricmc.fabric.api.tag.convention.v1.ConventionalEnchantmentTags; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalFluidTags; import net.fabricmc.fabric.api.tag.convention.v1.ConventionalItemTags; import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; import net.fabricmc.loader.api.FabricLoader; @@ -107,6 +108,11 @@ public enum LOG_WARNING_MODES { createMapEntry(ConventionalItemTags.BOWS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BOWS_TOOLS), createMapEntry(ConventionalItemTags.SHIELDS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SHIELDS_TOOLS), + createMapEntry(ConventionalFluidTags.WATER, net.fabricmc.fabric.api.tag.convention.v2.ConventionalFluidTags.WATERS), + createMapEntry(ConventionalFluidTags.LAVA, net.fabricmc.fabric.api.tag.convention.v2.ConventionalFluidTags.LAVAS), + createMapEntry(ConventionalFluidTags.MILK, net.fabricmc.fabric.api.tag.convention.v2.ConventionalFluidTags.MILKS), + createMapEntry(ConventionalFluidTags.HONEY, net.fabricmc.fabric.api.tag.convention.v2.ConventionalFluidTags.HONEYS), + createMapEntry(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.INCREASE_BLOCK_DROPS), createMapEntry(ConventionalEnchantmentTags.INCREASES_ENTITY_DROPS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.INCREASE_ENTITY_DROPS), createMapEntry(ConventionalEnchantmentTags.ENTITY_MOVEMENT_ENHANCEMENT, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.ENTITY_SPEED_ENHANCEMENTS), diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java index b175fccd20..775beda433 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java @@ -32,11 +32,11 @@ public FluidTagGenerator(FabricDataOutput output, CompletableFuture LAVA = register("lava"); - public static final TagKey WATER = register("water"); - public static final TagKey MILK = register("milk"); - public static final TagKey HONEY = register("honey"); + public static final TagKey LAVAS = register("lavas"); + public static final TagKey WATERS = register("waters"); + public static final TagKey MILKS = register("milks"); + public static final TagKey HONEYS = register("honeys"); private static TagKey register(String tagId) { return TagRegistration.FLUID_TAG.registerC(tagId); 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 bd29c07f13..1f8e79a250 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 @@ -55,6 +55,7 @@ private ConventionalItemTags() { public static final TagKey MINING_TOOLS = register("tools/mining_tools"); // Ores and ingots - categories + public static final TagKey BRICKS = register("bricks"); public static final TagKey DUSTS = register("dusts"); public static final TagKey GEMS = register("gems"); public static final TagKey INGOTS = register("ingots"); @@ -71,6 +72,10 @@ private ConventionalItemTags() { public static final TagKey GOLD_RAW_BLOCKS = register("raw_blocks/gold"); public static final TagKey COPPER_RAW_BLOCKS = register("raw_blocks/copper"); + // Bricks - vanilla instances + public static final TagKey NORMAL_BRICKS = register("bricks/normal"); + public static final TagKey NETHER_BRICKS = register("bricks/nether"); + // Ingots - vanilla instances public static final TagKey IRON_INGOTS = register("ingots/iron"); public static final TagKey GOLD_INGOTS = register("ingots/gold"); From 9034040686eaa9d28fe39ae4ee97c467bcf78ce1 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Fri, 17 Nov 2023 13:03:01 -0500 Subject: [PATCH 089/123] unplurarize fluid tag --- .../impl/tag/convention/ConventionLogWarnings.java | 8 ++++---- .../datagen/generators/FluidTagGenerator.java | 8 ++++---- .../data/c/tags/fluids/{honeys.json => honey.json} | 0 .../data/c/tags/fluids/{lavas.json => lava.json} | 0 .../data/c/tags/fluids/{milks.json => milk.json} | 0 .../data/c/tags/fluids/{waters.json => water.json} | 0 .../api/tag/convention/v2/ConventionalFluidTags.java | 11 +++++++---- 7 files changed, 15 insertions(+), 12 deletions(-) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/{honeys.json => honey.json} (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/{lavas.json => lava.json} (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/{milks.json => milk.json} (100%) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/{waters.json => water.json} (100%) diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 8e53f45e99..3c1dd7ff85 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -108,10 +108,10 @@ public enum LOG_WARNING_MODES { createMapEntry(ConventionalItemTags.BOWS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BOWS_TOOLS), createMapEntry(ConventionalItemTags.SHIELDS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SHIELDS_TOOLS), - createMapEntry(ConventionalFluidTags.WATER, net.fabricmc.fabric.api.tag.convention.v2.ConventionalFluidTags.WATERS), - createMapEntry(ConventionalFluidTags.LAVA, net.fabricmc.fabric.api.tag.convention.v2.ConventionalFluidTags.LAVAS), - createMapEntry(ConventionalFluidTags.MILK, net.fabricmc.fabric.api.tag.convention.v2.ConventionalFluidTags.MILKS), - createMapEntry(ConventionalFluidTags.HONEY, net.fabricmc.fabric.api.tag.convention.v2.ConventionalFluidTags.HONEYS), + createMapEntry(ConventionalFluidTags.WATER, net.fabricmc.fabric.api.tag.convention.v2.ConventionalFluidTags.WATER), + createMapEntry(ConventionalFluidTags.LAVA, net.fabricmc.fabric.api.tag.convention.v2.ConventionalFluidTags.LAVA), + createMapEntry(ConventionalFluidTags.MILK, net.fabricmc.fabric.api.tag.convention.v2.ConventionalFluidTags.MILK), + createMapEntry(ConventionalFluidTags.HONEY, net.fabricmc.fabric.api.tag.convention.v2.ConventionalFluidTags.HONEY), createMapEntry(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.INCREASE_BLOCK_DROPS), createMapEntry(ConventionalEnchantmentTags.INCREASES_ENTITY_DROPS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.INCREASE_ENTITY_DROPS), diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java index 775beda433..b175fccd20 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java @@ -32,11 +32,11 @@ public FluidTagGenerator(FabricDataOutput output, CompletableFuture

+ * Note, fluid tags should not be plural to match the vanilla standard. + * This is the only tag category exempted from many-different-types plural rule. */ public final class ConventionalFluidTags { private ConventionalFluidTags() { } - public static final TagKey LAVAS = register("lavas"); - public static final TagKey WATERS = register("waters"); - public static final TagKey MILKS = register("milks"); - public static final TagKey HONEYS = register("honeys"); + public static final TagKey LAVA = register("lava"); + public static final TagKey WATER = register("water"); + public static final TagKey MILK = register("milk"); + public static final TagKey HONEY = register("honey"); private static TagKey register(String tagId) { return TagRegistration.FLUID_TAG.registerC(tagId); From 47b7c46ac0ea7ef924d19d298f1d9cd5ab084e8b Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 20 Dec 2023 18:50:47 -0500 Subject: [PATCH 090/123] Added hidden_from_recipe_viewers tag --- .../convention/datagen/generators/BlockTagGenerator.java | 2 ++ .../convention/datagen/generators/FluidTagGenerator.java | 1 + .../tag/convention/datagen/generators/ItemTagGenerator.java | 2 ++ .../data/c/tags/blocks/hidden_from_recipe_viewers.json | 4 ++++ .../data/c/tags/fluids/hidden_from_recipe_viewers.json | 4 ++++ .../data/c/tags/items/hidden_from_recipe_viewers.json | 4 ++++ .../fabric/api/tag/convention/v2/ConventionalBlockTags.java | 6 +++++- .../fabric/api/tag/convention/v2/ConventionalFluidTags.java | 4 ++++ .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 5 +++++ 9 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/hidden_from_recipe_viewers.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/hidden_from_recipe_viewers.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/hidden_from_recipe_viewers.json 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 dde3c81e8e..3c084ff6f2 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 @@ -124,6 +124,8 @@ private void generateMiscTags() { getOrCreateTagBuilder(ConventionalBlockTags.CHAINS) .add(Blocks.CHAIN); + + getOrCreateTagBuilder(ConventionalBlockTags.HIDDEN_FROM_RECIPE_VIEWERS); // Generate tag so others can see it exists through JSON. } private void generateSandstoneTags() { diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java index b175fccd20..057258cb7c 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/FluidTagGenerator.java @@ -38,5 +38,6 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { .addOptionalTag(FluidTags.LAVA); getOrCreateTagBuilder(ConventionalFluidTags.MILK); getOrCreateTagBuilder(ConventionalFluidTags.HONEY); + getOrCreateTagBuilder(ConventionalFluidTags.HIDDEN_FROM_RECIPE_VIEWERS); } } 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 80f328aebc..7e3fd230d0 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 @@ -444,6 +444,8 @@ private void generateOtherTags() { getOrCreateTagBuilder(ConventionalItemTags.CHAINS) .add(Items.CHAIN); + + getOrCreateTagBuilder(ConventionalItemTags.HIDDEN_FROM_RECIPE_VIEWERS); // Generate tag so others can see it exists through JSON. } private void generateDyedTags() { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/hidden_from_recipe_viewers.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/hidden_from_recipe_viewers.json new file mode 100644 index 0000000000..5e8aecc986 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/hidden_from_recipe_viewers.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": [] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/hidden_from_recipe_viewers.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/hidden_from_recipe_viewers.json new file mode 100644 index 0000000000..5e8aecc986 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/hidden_from_recipe_viewers.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": [] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/hidden_from_recipe_viewers.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/hidden_from_recipe_viewers.json new file mode 100644 index 0000000000..5e8aecc986 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/hidden_from_recipe_viewers.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": [] +} \ No newline at end of file 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 209de40c76..a7ff4c4496 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 @@ -18,7 +18,6 @@ import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; -import net.minecraft.item.Item; import net.minecraft.registry.tag.TagKey; import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; @@ -144,6 +143,11 @@ private ConventionalBlockTags() { public static final TagKey ROPES = register("ropes"); public static final TagKey CHAINS = register("chains"); + /** + * Tag that holds all blocks that recipe viewers should not show to users. + */ + public static final TagKey HIDDEN_FROM_RECIPE_VIEWERS = register("hidden_from_recipe_viewers"); + private static TagKey register(String tagId) { return TagRegistration.BLOCK_TAG.registerC(tagId); } diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalFluidTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalFluidTags.java index 36cc766a58..170bd5d360 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalFluidTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalFluidTags.java @@ -36,6 +36,10 @@ private ConventionalFluidTags() { public static final TagKey WATER = register("water"); public static final TagKey MILK = register("milk"); public static final TagKey HONEY = register("honey"); + /** + * Tag that holds all fluids that recipe viewers should not show to users. + */ + public static final TagKey HIDDEN_FROM_RECIPE_VIEWERS = register("hidden_from_recipe_viewers"); private static TagKey register(String tagId) { return TagRegistration.FLUID_TAG.registerC(tagId); 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 1f8e79a250..e70d443d3a 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 @@ -275,6 +275,11 @@ private ConventionalItemTags() { public static final TagKey ROPES = register("ropes"); public static final TagKey CHAINS = register("chains"); + /** + * Tag that holds all items that recipe viewers should not show to users. + */ + public static final TagKey HIDDEN_FROM_RECIPE_VIEWERS = register("hidden_from_recipe_viewers"); + private static TagKey register(String tagId) { return TagRegistration.ITEM_TAG.registerC(tagId); } From 569f71c0cab3d1afe191cf349e2a08116af75e29 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 20 Dec 2023 19:21:03 -0500 Subject: [PATCH 091/123] Fix merge issues --- .../fabric/api/tag/convention/v1/TagUtil.java | 2 +- .../tag/convention/ConventionLogWarnings.java | 4 +- .../datagen/generators/BiomeTagGenerator.java | 265 ------------------ .../tag/convention/v2/TagRegistration.java | 6 +- 4 files changed, 6 insertions(+), 271 deletions(-) delete mode 100644 fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java index 3283376598..9ad7108e98 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java @@ -18,8 +18,8 @@ import org.jetbrains.annotations.Nullable; -import net.minecraft.registry.tag.TagKey; import net.minecraft.registry.DynamicRegistryManager; +import net.minecraft.registry.tag.TagKey; /** * @deprecated Please use {@link net.fabricmc.fabric.api.tag.convention.v2.TagUtil} diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 3c1dd7ff85..82c9adb772 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -25,11 +25,11 @@ import org.slf4j.LoggerFactory; import net.minecraft.registry.DynamicRegistryManager; -import net.minecraft.registry.tag.ItemTags; -import net.minecraft.registry.tag.TagKey; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.tag.ItemTags; +import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; import net.fabricmc.api.ModInitializer; diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java deleted file mode 100644 index 52d671a53e..0000000000 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java +++ /dev/null @@ -1,265 +0,0 @@ -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.fabricmc.fabric.impl.tag.convention.datagen.generators; - -import java.util.concurrent.CompletableFuture; - -import net.minecraft.registry.RegistryKeys; -import net.minecraft.registry.RegistryWrapper; -import net.minecraft.registry.tag.BiomeTags; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.biome.BiomeKeys; - -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBiomeTags; - -public class BiomeTagGenerator extends FabricTagProvider { - public BiomeTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { - super(output, RegistryKeys.BIOME, completableFuture); - } - - @Override - protected void configure(RegistryWrapper.WrapperLookup arg) { - generateDimensionTags(); - generateCategoryTags(); - generateOtherBiomeTypes(); - generateClimateAndVegetationTags(); - generateTerrainDescriptorTags(); - } - - private void generateDimensionTags() { - getOrCreateTagBuilder(ConventionalBiomeTags.IN_NETHER) - .addOptionalTag(BiomeTags.IS_NETHER) - .add(BiomeKeys.CRIMSON_FOREST) - .add(BiomeKeys.WARPED_FOREST) - .add(BiomeKeys.NETHER_WASTES) - .add(BiomeKeys.SOUL_SAND_VALLEY) - .add(BiomeKeys.BASALT_DELTAS); - getOrCreateTagBuilder(ConventionalBiomeTags.IN_THE_END) - .addOptionalTag(BiomeTags.IS_END) - .add(BiomeKeys.END_BARRENS) - .add(BiomeKeys.END_MIDLANDS) - .add(BiomeKeys.END_HIGHLANDS) - .add(BiomeKeys.THE_END) - .add(BiomeKeys.SMALL_END_ISLANDS); - // We avoid the vanilla group tags here as mods may add to them without actually spawning them in the overworld - getOrCreateTagBuilder(ConventionalBiomeTags.IN_OVERWORLD) - .addOptionalTag(BiomeTags.IS_OVERWORLD) - .add(BiomeKeys.RIVER).add(BiomeKeys.FROZEN_RIVER) - .add(BiomeKeys.COLD_OCEAN).add(BiomeKeys.DEEP_COLD_OCEAN) - .add(BiomeKeys.DEEP_FROZEN_OCEAN).add(BiomeKeys.DEEP_OCEAN) - .add(BiomeKeys.DEEP_LUKEWARM_OCEAN).add(BiomeKeys.WARM_OCEAN).add(BiomeKeys.LUKEWARM_OCEAN) - .add(BiomeKeys.FROZEN_OCEAN).add(BiomeKeys.OCEAN) - .add(BiomeKeys.BEACH).add(BiomeKeys.PLAINS) - .add(BiomeKeys.SUNFLOWER_PLAINS).add(BiomeKeys.SNOWY_PLAINS) - .add(BiomeKeys.ICE_SPIKES).add(BiomeKeys.DESERT) - .add(BiomeKeys.FOREST).add(BiomeKeys.FLOWER_FOREST) - .add(BiomeKeys.BIRCH_FOREST).add(BiomeKeys.DARK_FOREST) - .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST).add(BiomeKeys.OLD_GROWTH_PINE_TAIGA) - .add(BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA).add(BiomeKeys.TAIGA) - .add(BiomeKeys.SNOWY_TAIGA).add(BiomeKeys.SAVANNA) - .add(BiomeKeys.SAVANNA_PLATEAU).add(BiomeKeys.WINDSWEPT_HILLS) - .add(BiomeKeys.WINDSWEPT_GRAVELLY_HILLS).add(BiomeKeys.WINDSWEPT_FOREST) - .add(BiomeKeys.WINDSWEPT_SAVANNA).add(BiomeKeys.JUNGLE).add(BiomeKeys.SPARSE_JUNGLE) - .add(BiomeKeys.BAMBOO_JUNGLE).add(BiomeKeys.BADLANDS).add(BiomeKeys.ERODED_BADLANDS) - .add(BiomeKeys.WOODED_BADLANDS).add(BiomeKeys.MEADOW).add(BiomeKeys.GROVE) - .add(BiomeKeys.SNOWY_SLOPES).add(BiomeKeys.FROZEN_PEAKS).add(BiomeKeys.JAGGED_PEAKS) - .add(BiomeKeys.STONY_PEAKS).add(BiomeKeys.MUSHROOM_FIELDS).add(BiomeKeys.DRIPSTONE_CAVES) - .add(BiomeKeys.LUSH_CAVES).add(BiomeKeys.SNOWY_BEACH).add(BiomeKeys.SWAMP).add(BiomeKeys.STONY_SHORE) - .add(BiomeKeys.DEEP_DARK).add(BiomeKeys.MANGROVE_SWAMP) - .add(BiomeKeys.CHERRY_GROVE); - } - - private void generateCategoryTags() { - getOrCreateTagBuilder(ConventionalBiomeTags.TAIGA) - .addOptionalTag(BiomeTags.IS_TAIGA); - getOrCreateTagBuilder(ConventionalBiomeTags.EXTREME_HILLS) - .add(BiomeKeys.WINDSWEPT_GRAVELLY_HILLS) - .add(BiomeKeys.WINDSWEPT_HILLS); - getOrCreateTagBuilder(ConventionalBiomeTags.WINDSWEPT) - .add(BiomeKeys.WINDSWEPT_HILLS) - .add(BiomeKeys.WINDSWEPT_GRAVELLY_HILLS) - .add(BiomeKeys.WINDSWEPT_FOREST) - .add(BiomeKeys.WINDSWEPT_SAVANNA); - getOrCreateTagBuilder(ConventionalBiomeTags.JUNGLE) - .addOptionalTag(BiomeTags.IS_JUNGLE); - getOrCreateTagBuilder(ConventionalBiomeTags.MESA) - .add(BiomeKeys.WOODED_BADLANDS) - .add(BiomeKeys.ERODED_BADLANDS) - .add(BiomeKeys.BADLANDS); - getOrCreateTagBuilder(ConventionalBiomeTags.PLAINS) - .add(BiomeKeys.SUNFLOWER_PLAINS) - .add(BiomeKeys.PLAINS); - getOrCreateTagBuilder(ConventionalBiomeTags.SAVANNA) - .addOptionalTag(BiomeTags.IS_SAVANNA) - .add(BiomeKeys.SAVANNA_PLATEAU) - .add(BiomeKeys.WINDSWEPT_SAVANNA) - .add(BiomeKeys.SAVANNA); - getOrCreateTagBuilder(ConventionalBiomeTags.ICY) - .add(BiomeKeys.FROZEN_PEAKS) - .add(BiomeKeys.ICE_SPIKES); - getOrCreateTagBuilder(ConventionalBiomeTags.AQUATIC_ICY) - .add(BiomeKeys.FROZEN_RIVER) - .add(BiomeKeys.DEEP_FROZEN_OCEAN) - .add(BiomeKeys.FROZEN_OCEAN); - getOrCreateTagBuilder(ConventionalBiomeTags.SNOWY) - .add(BiomeKeys.SNOWY_BEACH) - .add(BiomeKeys.SNOWY_PLAINS) - .add(BiomeKeys.SNOWY_SLOPES) - .add(BiomeKeys.SNOWY_TAIGA); - getOrCreateTagBuilder(ConventionalBiomeTags.BEACH) - .addOptionalTag(BiomeTags.IS_BEACH) - .add(BiomeKeys.STONY_SHORE); - getOrCreateTagBuilder(ConventionalBiomeTags.FOREST) - .addOptionalTag(BiomeTags.IS_FOREST); - getOrCreateTagBuilder(ConventionalBiomeTags.BIRCH_FOREST) - .add(BiomeKeys.BIRCH_FOREST) - .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST); - getOrCreateTagBuilder(ConventionalBiomeTags.OCEAN) - .addOptionalTag(ConventionalBiomeTags.DEEP_OCEAN) - .addOptionalTag(ConventionalBiomeTags.SHALLOW_OCEAN) - .addOptionalTag(BiomeTags.IS_OCEAN); - getOrCreateTagBuilder(ConventionalBiomeTags.DESERT) - .add(BiomeKeys.DESERT); - getOrCreateTagBuilder(ConventionalBiomeTags.RIVER) - .addOptionalTag(BiomeTags.IS_RIVER); - getOrCreateTagBuilder(ConventionalBiomeTags.SWAMP) - .add(BiomeKeys.MANGROVE_SWAMP) - .add(BiomeKeys.SWAMP); - getOrCreateTagBuilder(ConventionalBiomeTags.MUSHROOM) - .add(BiomeKeys.MUSHROOM_FIELDS); - getOrCreateTagBuilder(ConventionalBiomeTags.UNDERGROUND) - .addOptionalTag(ConventionalBiomeTags.CAVES); - getOrCreateTagBuilder(ConventionalBiomeTags.MOUNTAIN) - .addOptionalTag(BiomeTags.IS_MOUNTAIN); - } - - private void generateOtherBiomeTypes() { - getOrCreateTagBuilder(ConventionalBiomeTags.BADLANDS) - .addOptionalTag(ConventionalBiomeTags.MESA) - .addOptionalTag(BiomeTags.IS_BADLANDS); - getOrCreateTagBuilder(ConventionalBiomeTags.CAVES) - .add(BiomeKeys.DEEP_DARK) - .add(BiomeKeys.DRIPSTONE_CAVES) - .add(BiomeKeys.LUSH_CAVES); - getOrCreateTagBuilder(ConventionalBiomeTags.VOID) - .add(BiomeKeys.THE_VOID); - getOrCreateTagBuilder(ConventionalBiomeTags.DEEP_OCEAN) - .add(BiomeKeys.DEEP_FROZEN_OCEAN) - .add(BiomeKeys.DEEP_LUKEWARM_OCEAN) - .add(BiomeKeys.DEEP_COLD_OCEAN) - .add(BiomeKeys.DEEP_OCEAN); - getOrCreateTagBuilder(ConventionalBiomeTags.SHALLOW_OCEAN) - .add(BiomeKeys.OCEAN) - .add(BiomeKeys.LUKEWARM_OCEAN) - .add(BiomeKeys.FROZEN_OCEAN) - .add(BiomeKeys.COLD_OCEAN) - .add(BiomeKeys.WARM_OCEAN); - } - - private void generateClimateAndVegetationTags() { - getOrCreateTagBuilder(ConventionalBiomeTags.CLIMATE_COLD) - .add(BiomeKeys.SNOWY_PLAINS) - .add(BiomeKeys.GROVE) - .add(BiomeKeys.JAGGED_PEAKS) - .add(BiomeKeys.TAIGA).add(BiomeKeys.SNOWY_TAIGA) - .add(BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA).add(BiomeKeys.OLD_GROWTH_PINE_TAIGA) - .addOptionalTag(ConventionalBiomeTags.ICY); - getOrCreateTagBuilder(ConventionalBiomeTags.CLIMATE_TEMPERATE) - .add(BiomeKeys.FOREST) - .add(BiomeKeys.SUNFLOWER_PLAINS) - .add(BiomeKeys.SWAMP) - .add(BiomeKeys.STONY_SHORE) - .add(BiomeKeys.DARK_FOREST) - .add(BiomeKeys.WINDSWEPT_FOREST) - .add(BiomeKeys.BIRCH_FOREST) - .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST) - .add(BiomeKeys.MEADOW) - .add(BiomeKeys.PLAINS); - getOrCreateTagBuilder(ConventionalBiomeTags.CLIMATE_HOT) - .addOptionalTag(ConventionalBiomeTags.JUNGLE) - .addOptionalTag(ConventionalBiomeTags.SAVANNA) - .addOptionalTag(ConventionalBiomeTags.DESERT) - .addOptionalTag(ConventionalBiomeTags.BADLANDS) - .add(BiomeKeys.STONY_PEAKS) - .addOptionalTag(ConventionalBiomeTags.MUSHROOM) - .addOptionalTag(ConventionalBiomeTags.IN_NETHER); - getOrCreateTagBuilder(ConventionalBiomeTags.CLIMATE_WET) - .addOptionalTag(ConventionalBiomeTags.AQUATIC) - .addOptionalTag(ConventionalBiomeTags.SWAMP) - .add(BiomeKeys.LUSH_CAVES) - .addOptionalTag(ConventionalBiomeTags.JUNGLE); - getOrCreateTagBuilder(ConventionalBiomeTags.CLIMATE_DRY) - .addOptionalTag(ConventionalBiomeTags.IN_NETHER) - .addOptionalTag(ConventionalBiomeTags.BADLANDS) - .addOptionalTag(ConventionalBiomeTags.DESERT) - .addOptionalTag(ConventionalBiomeTags.SAVANNA); - getOrCreateTagBuilder(ConventionalBiomeTags.VEGETATION_DENSE) - .addOptionalTag(ConventionalBiomeTags.JUNGLE) - .add(BiomeKeys.SUNFLOWER_PLAINS); - getOrCreateTagBuilder(ConventionalBiomeTags.VEGETATION_SPARSE) - .addOptionalTag(ConventionalBiomeTags.SAVANNA) - .addOptionalTag(ConventionalBiomeTags.DESERT) - .addOptionalTag(ConventionalBiomeTags.DEAD) - .add(BiomeKeys.LUSH_CAVES) - .addOptionalTag(ConventionalBiomeTags.WASTELAND); - getOrCreateTagBuilder(ConventionalBiomeTags.TREE_CONIFEROUS) - .add(BiomeKeys.GROVE) - .addOptionalTag(ConventionalBiomeTags.TAIGA); - getOrCreateTagBuilder(ConventionalBiomeTags.TREE_DECIDUOUS) - .add(BiomeKeys.FOREST) - .add(BiomeKeys.WINDSWEPT_FOREST) - .add(BiomeKeys.FLOWER_FOREST) - .add(BiomeKeys.BIRCH_FOREST) - .add(BiomeKeys.DARK_FOREST) - .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST); - getOrCreateTagBuilder(ConventionalBiomeTags.TREE_JUNGLE) - .addOptionalTag(ConventionalBiomeTags.JUNGLE); - getOrCreateTagBuilder(ConventionalBiomeTags.TREE_SAVANNA) - .addOptionalTag(ConventionalBiomeTags.SAVANNA); - getOrCreateTagBuilder(ConventionalBiomeTags.FLORAL) - .add(BiomeKeys.SUNFLOWER_PLAINS) - .add(BiomeKeys.MEADOW) - .add(BiomeKeys.CHERRY_GROVE) - .addOptionalTag(ConventionalBiomeTags.FLOWER_FORESTS); - } - - private void generateTerrainDescriptorTags() { - getOrCreateTagBuilder(ConventionalBiomeTags.MOUNTAIN_PEAK) - .add(BiomeKeys.FROZEN_PEAKS) - .add(BiomeKeys.JAGGED_PEAKS) - .add(BiomeKeys.STONY_PEAKS); - getOrCreateTagBuilder(ConventionalBiomeTags.MOUNTAIN_SLOPE) - .add(BiomeKeys.SNOWY_SLOPES); - getOrCreateTagBuilder(ConventionalBiomeTags.AQUATIC) - .addOptionalTag(ConventionalBiomeTags.OCEAN) - .addOptionalTag(ConventionalBiomeTags.RIVER); - getOrCreateTagBuilder(ConventionalBiomeTags.DEAD); - getOrCreateTagBuilder(ConventionalBiomeTags.WASTELAND); - getOrCreateTagBuilder(ConventionalBiomeTags.END_ISLANDS); - getOrCreateTagBuilder(ConventionalBiomeTags.NETHER_FORESTS) - .add(BiomeKeys.WARPED_FOREST) - .add(BiomeKeys.CRIMSON_FOREST); - getOrCreateTagBuilder(ConventionalBiomeTags.SNOWY_PLAINS) - .add(BiomeKeys.SNOWY_PLAINS); - getOrCreateTagBuilder(ConventionalBiomeTags.STONY_SHORES) - .add(BiomeKeys.STONY_SHORE); - getOrCreateTagBuilder(ConventionalBiomeTags.FLOWER_FORESTS) - .add(BiomeKeys.FLOWER_FOREST); - } -} diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java index 2a2d2a8d44..4924d585a0 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java @@ -18,15 +18,15 @@ import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.registry.RegistryKeys; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.EntityType; import net.minecraft.fluid.Fluid; import net.minecraft.item.Item; -import net.minecraft.registry.tag.TagKey; -import net.minecraft.util.Identifier; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; import net.minecraft.world.biome.Biome; import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; From d4c0a1532c1f896a3963acd5da96f3b9d804a023 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 20 Dec 2023 19:30:47 -0500 Subject: [PATCH 092/123] removed duplicate warning entry --- .../fabric/impl/tag/convention/ConventionLogWarnings.java | 1 - 1 file changed, 1 deletion(-) diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 82c9adb772..967d05ff3e 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -173,7 +173,6 @@ public enum LOG_WARNING_MODES { createMapEntry(RegistryKeys.ITEM, "string", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.STRINGS), createMapEntry(RegistryKeys.ITEM, "sticks", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WOODEN_RODS), createMapEntry(RegistryKeys.ITEM, "wooden_rods", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WOODEN_RODS), - createMapEntry(RegistryKeys.ITEM, "raw_meat", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_MEATS_FOODS), createMapEntry(RegistryKeys.ITEM, "food", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.FOODS), createMapEntry(RegistryKeys.ITEM, "fruit", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.FRUITS_FOODS), createMapEntry(RegistryKeys.ITEM, "fruits", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.FRUITS_FOODS), From cd779bc6fc0db79c36021338890e006d68f9de45 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 20 Dec 2023 19:37:20 -0500 Subject: [PATCH 093/123] Fixed fabric loader expected value --- fabric-convention-tags-v2/src/main/resources/fabric.mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fabric-convention-tags-v2/src/main/resources/fabric.mod.json b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json index a3b5c9c119..aea2fdc22b 100644 --- a/fabric-convention-tags-v2/src/main/resources/fabric.mod.json +++ b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.14.22", + "fabricloader": ">=0.15.1", "minecraft": ">=1.20.1", "fabric-lifecycle-events-v1": "*" }, From fd7a93006a3c54378bee309d52483abdf6780166 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Tue, 16 Jan 2024 18:12:05 -0500 Subject: [PATCH 094/123] Add crafting table and furnace tag --- .../convention/datagen/generators/BlockTagGenerator.java | 5 +++++ .../tag/convention/datagen/generators/ItemTagGenerator.java | 6 ++++++ .../c/tags/blocks/player_workstations/crafting_tables.json | 6 ++++++ .../data/c/tags/blocks/player_workstations/furnaces.json | 6 ++++++ .../c/tags/items/player_workstations/crafting_tables.json | 6 ++++++ .../data/c/tags/items/player_workstations/furnaces.json | 6 ++++++ .../fabric/api/tag/convention/v2/ConventionalBlockTags.java | 2 ++ .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 2 ++ .../fabric/impl/tag/convention/v2/TagRegistration.java | 1 - 9 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/player_workstations/crafting_tables.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/player_workstations/furnaces.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/player_workstations/crafting_tables.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/player_workstations/furnaces.json 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 3c084ff6f2..a29d03e54c 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 @@ -116,6 +116,11 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { } private void generateMiscTags() { + getOrCreateTagBuilder(ConventionalBlockTags.PLAYER_WORKSTATIONS_CRAFTING_TABLES) + .add(Blocks.CRAFTING_TABLE); + getOrCreateTagBuilder(ConventionalBlockTags.PLAYER_WORKSTATIONS_FURNACES) + .add(Blocks.FURNACE); + VILLAGER_JOB_SITE_BLOCKS.forEach(getOrCreateTagBuilder(ConventionalBlockTags.VILLAGER_JOB_SITES)::add); getOrCreateTagBuilder(ConventionalBlockTags.RELOCATION_NOT_SUPPORTED); // Generate tag so others can see it exists through JSON. 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 7e3fd230d0..eec397a6ab 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 @@ -418,6 +418,12 @@ private void generateVillagerJobSites() { } private void generateOtherTags() { + getOrCreateTagBuilder(ConventionalItemTags.PLAYER_WORKSTATIONS_CRAFTING_TABLES) + .add(Items.CRAFTING_TABLE); + + getOrCreateTagBuilder(ConventionalItemTags.PLAYER_WORKSTATIONS_FURNACES) + .add(Items.FURNACE); + getOrCreateTagBuilder(ConventionalItemTags.STRINGS) .add(Items.STRING); diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/player_workstations/crafting_tables.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/player_workstations/crafting_tables.json new file mode 100644 index 0000000000..9019c8810a --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/player_workstations/crafting_tables.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:crafting_table" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/player_workstations/furnaces.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/player_workstations/furnaces.json new file mode 100644 index 0000000000..469e57c08e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/player_workstations/furnaces.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:furnace" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/player_workstations/crafting_tables.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/player_workstations/crafting_tables.json new file mode 100644 index 0000000000..9019c8810a --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/player_workstations/crafting_tables.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:crafting_table" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/player_workstations/furnaces.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/player_workstations/furnaces.json new file mode 100644 index 0000000000..469e57c08e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/player_workstations/furnaces.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:furnace" + ] +} \ No newline at end of file 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 a7ff4c4496..eefa39eb00 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 @@ -129,6 +129,8 @@ private ConventionalBlockTags() { public static final TagKey STORAGE_BLOCKS_WHEAT = register("storage_blocks/wheat"); // Misc + public static final TagKey PLAYER_WORKSTATIONS_CRAFTING_TABLES = register("player_workstations/crafting_tables"); + public static final TagKey PLAYER_WORKSTATIONS_FURNACES = register("player_workstations/furnaces"); /** * Blocks should be included in this tag if their movement/relocation can cause serious issues such * as world corruption upon being moved or for balance reason where the block should not be able to be relocated. 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 e70d443d3a..e1463f0662 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 @@ -253,6 +253,8 @@ private ConventionalItemTags() { public static final TagKey STORAGE_BLOCKS_WHEAT = register("storage_blocks/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"); public static final TagKey STRINGS = register("strings"); /** * For rod-like materials to be used in recipes. diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java index 4924d585a0..7a5ba7d2d3 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java @@ -34,7 +34,6 @@ public record TagRegistration(RegistryKey> registryKey) { public static final TagRegistration ITEM_TAG = new TagRegistration<>(RegistryKeys.ITEM); public static final TagRegistration BLOCK_TAG = new TagRegistration<>(RegistryKeys.BLOCK); - public static final TagRegistration> BLOCK_ENTITY_TYPE_TAG = new TagRegistration<>(RegistryKeys.BLOCK_ENTITY_TYPE); public static final TagRegistration BIOME_TAG = new TagRegistration<>(RegistryKeys.BIOME); public static final TagRegistration FLUID_TAG = new TagRegistration<>(RegistryKeys.FLUID); public static final TagRegistration> ENTITY_TYPE_TAG = new TagRegistration<>(RegistryKeys.ENTITY_TYPE); From bc9aed8ad306ede9638f5a7cff7f8593579db1dc Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Tue, 16 Jan 2024 18:22:20 -0500 Subject: [PATCH 095/123] spotless and warn about old crafting table/furnace tags --- .../fabric/impl/tag/convention/ConventionLogWarnings.java | 4 ++++ .../fabric/impl/tag/convention/v2/TagRegistration.java | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 967d05ff3e..a5228ae7b0 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -151,6 +151,10 @@ public enum LOG_WARNING_MODES { createMapEntry(RegistryKeys.BLOCK, "workbenches", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.VILLAGER_JOB_SITES), createMapEntry(RegistryKeys.BLOCK, "workstation", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.VILLAGER_JOB_SITES), createMapEntry(RegistryKeys.BLOCK, "workstations", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.VILLAGER_JOB_SITES), + createMapEntry(RegistryKeys.BLOCK, "crafting_table", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.PLAYER_WORKSTATIONS_CRAFTING_TABLES), + createMapEntry(RegistryKeys.BLOCK, "crafting_tables", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.PLAYER_WORKSTATIONS_CRAFTING_TABLES), + createMapEntry(RegistryKeys.BLOCK, "furnace", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.PLAYER_WORKSTATIONS_FURNACES), + createMapEntry(RegistryKeys.BLOCK, "furnaces", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.PLAYER_WORKSTATIONS_FURNACES), createMapEntry(RegistryKeys.ITEM, "axes", ItemTags.AXES), createMapEntry(RegistryKeys.ITEM, "pickaxes", ItemTags.PICKAXES), diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java index 7a5ba7d2d3..d611e3b029 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java @@ -17,7 +17,6 @@ package net.fabricmc.fabric.impl.tag.convention.v2; import net.minecraft.block.Block; -import net.minecraft.block.entity.BlockEntityType; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.EntityType; import net.minecraft.fluid.Fluid; From 243e7cb7d9af066a50a2f9e29d73b07ba66ddb25 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Mon, 22 Jan 2024 18:20:29 -0500 Subject: [PATCH 096/123] Add old growth tag for old growth named biomes --- .../datagen/generators/BiomeTagGenerator.java | 10 +++++++--- .../data/c/tags/worldgen/biome/is_old_growth.json | 8 ++++++++ .../api/tag/convention/v2/ConventionalBiomeTags.java | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_old_growth.json 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 0aee9416b0..e87e0d9ae5 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 @@ -257,6 +257,13 @@ private void generateClimateAndVegetationTags() { .add(BiomeKeys.MEADOW) .add(BiomeKeys.CHERRY_GROVE) .addOptionalTag(ConventionalBiomeTags.IS_FLOWER_FOREST); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLOWER_FOREST) + .add(BiomeKeys.FLOWER_FOREST) + .addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "flower_forests")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_OLD_GROWTH) + .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST) + .add(BiomeKeys.OLD_GROWTH_PINE_TAIGA) + .add(BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA); } private void generateTerrainDescriptorTags() { @@ -279,9 +286,6 @@ private void generateTerrainDescriptorTags() { .add(BiomeKeys.SNOWY_PLAINS); getOrCreateTagBuilder(ConventionalBiomeTags.IS_STONY_SHORES) .add(BiomeKeys.STONY_SHORE); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLOWER_FOREST) - .add(BiomeKeys.FLOWER_FOREST) - .addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "flower_forests")); } private void generateBackwardsCompatTags() { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_old_growth.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_old_growth.json new file mode 100644 index 0000000000..b11724242a --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_old_growth.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "minecraft:old_growth_birch_forest", + "minecraft:old_growth_pine_taiga", + "minecraft:old_growth_spruce_taiga" + ] +} \ No newline at end of file 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 2744684049..f96f81c472 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 @@ -146,6 +146,7 @@ private ConventionalBiomeTags() { public static final TagKey IS_SNOWY_PLAINS = register("is_snowy_plains"); public static final TagKey IS_STONY_SHORES = register("is_stony_shores"); public static final TagKey IS_FLOWER_FOREST = register("is_flower_forest"); + public static final TagKey IS_OLD_GROWTH = register("is_old_growth"); public static final TagKey IS_DEEP_OCEAN = register("is_deep_ocean"); public static final TagKey IS_SHALLOW_OCEAN = register("is_shallow_ocean"); From 8fbf306a70c6a0b8f8f92f0df66ac43c0a02f3c6 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Tue, 23 Jan 2024 20:08:41 -0500 Subject: [PATCH 097/123] removed heads item tag due to mojang adding one --- .../datagen/generators/BlockTagGenerator.java | 2 +- .../datagen/generators/ItemTagGenerator.java | 9 --------- .../data/c/tags/blocks/{heads.json => skulls.json} | 0 .../generated/resources/data/c/tags/items/heads.json | 12 ------------ .../api/tag/convention/v2/ConventionalBlockTags.java | 4 ++-- .../api/tag/convention/v2/ConventionalItemTags.java | 8 -------- 6 files changed, 3 insertions(+), 32 deletions(-) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/{heads.json => skulls.json} (100%) delete mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/heads.json 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 a29d03e54c..a37a3ab3e8 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 @@ -428,7 +428,7 @@ private void generateStorageTags() { } private void generateHeadTags() { - getOrCreateTagBuilder(ConventionalBlockTags.HEADS) + getOrCreateTagBuilder(ConventionalBlockTags.SKULLS) .add(Blocks.SKELETON_SKULL) .add(Blocks.SKELETON_WALL_SKULL) .add(Blocks.WITHER_SKELETON_SKULL) 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 eec397a6ab..82cfe4ce2f 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 @@ -437,15 +437,6 @@ private void generateOtherTags() { .addOptionalTag(ConventionalItemTags.WOODEN_RODS) .addOptionalTag(ConventionalItemTags.BLAZE_RODS); - getOrCreateTagBuilder(ConventionalItemTags.HEADS) - .add(Items.SKELETON_SKULL) - .add(Items.WITHER_SKELETON_SKULL) - .add(Items.PLAYER_HEAD) - .add(Items.ZOMBIE_HEAD) - .add(Items.CREEPER_HEAD) - .add(Items.PIGLIN_HEAD) - .add(Items.DRAGON_HEAD); - getOrCreateTagBuilder(ConventionalItemTags.ROPES); // Generate tag so others can see it exists through JSON. getOrCreateTagBuilder(ConventionalItemTags.CHAINS) diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/heads.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/skulls.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/heads.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/skulls.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/heads.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/heads.json deleted file mode 100644 index c3e8b29ba9..0000000000 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/heads.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:skeleton_skull", - "minecraft:wither_skeleton_skull", - "minecraft:player_head", - "minecraft:zombie_head", - "minecraft:creeper_head", - "minecraft:piglin_head", - "minecraft:dragon_head" - ] -} \ No newline at end of file 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 eefa39eb00..0620794b34 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 @@ -139,9 +139,9 @@ private ConventionalBlockTags() { */ public static final TagKey RELOCATION_NOT_SUPPORTED = register("relocation_not_supported"); /** - * Tag that holds all head based blocks such as Skeleton Skull or Player Head. + * Tag that holds all head based blocks such as Skeleton Skull or Player Head. (Named skulls to match minecraft:skulls item tag) */ - public static final TagKey HEADS = register("heads"); + public static final TagKey SKULLS = register("skulls"); public static final TagKey ROPES = register("ropes"); public static final TagKey CHAINS = register("chains"); 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 e1463f0662..e742f90fe6 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,14 +266,6 @@ private ConventionalItemTags() { */ public static final TagKey WOODEN_RODS = register("rods/wooden"); public static final TagKey BLAZE_RODS = register("rods/blaze"); - /** - * Tag that holds all head based blocks such as Skeleton Skull or Player Head. - *

- * Note: If you don't want Player Head in recipe, use custom ingredients to do tag exclusions to exclude Player Head. - * See {@link net.fabricmc.fabric.api.recipe.v1.ingredient.DefaultCustomIngredients} - * children classes for various custom ingredients available that can also be used in data generation. - */ - public static final TagKey HEADS = register("heads"); public static final TagKey ROPES = register("ropes"); public static final TagKey CHAINS = register("chains"); From 63f010b64c738a0b6b0db460982cbd996852440b Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Tue, 27 Feb 2024 07:20:31 -0500 Subject: [PATCH 098/123] Fixed missing biomes from is_snowy tag --- .../convention/datagen/generators/BiomeTagGenerator.java | 6 +++++- .../resources/data/c/tags/worldgen/biome/is_snowy.json | 6 +++++- 2 files changed, 10 insertions(+), 2 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 e87e0d9ae5..47b5566505 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 @@ -119,8 +119,12 @@ private void generateCategoryTags() { getOrCreateTagBuilder(ConventionalBiomeTags.IS_SNOWY) .add(BiomeKeys.SNOWY_BEACH) .add(BiomeKeys.SNOWY_PLAINS) + .add(BiomeKeys.ICE_SPIKES) + .add(BiomeKeys.SNOWY_TAIGA) + .add(BiomeKeys.GROVE) .add(BiomeKeys.SNOWY_SLOPES) - .add(BiomeKeys.SNOWY_TAIGA); + .add(BiomeKeys.JAGGED_PEAKS) + .add(BiomeKeys.FROZEN_PEAKS); getOrCreateTagBuilder(ConventionalBiomeTags.IS_BEACH) .addOptionalTag(BiomeTags.IS_BEACH) .add(BiomeKeys.STONY_SHORE); diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy.json index 1df88f66c4..eec7e1191e 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy.json @@ -3,7 +3,11 @@ "values": [ "minecraft:snowy_beach", "minecraft:snowy_plains", + "minecraft:ice_spikes", + "minecraft:snowy_taiga", + "minecraft:grove", "minecraft:snowy_slopes", - "minecraft:snowy_taiga" + "minecraft:jagged_peaks", + "minecraft:frozen_peaks" ] } \ No newline at end of file From faa4093b207a73e25d220e00cd53b9ff52cc5ffb Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 16 Mar 2024 14:30:47 -0400 Subject: [PATCH 099/123] Added c:teleporting_not_supported tag --- .../datagen/generators/EntityTypeTagGenerator.java | 1 + .../c/tags/entity_types/teleporting_not_supported.json | 4 ++++ .../api/tag/convention/v2/ConventionalEntityTypeTags.java | 7 +++++++ 3 files changed, 12 insertions(+) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/teleporting_not_supported.json diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java index 0b7667f708..d14805a28b 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java @@ -47,5 +47,6 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { .add(EntityType.BOAT) .add(EntityType.CHEST_BOAT); getOrCreateTagBuilder(ConventionalEntityTypeTags.CAPTURING_NOT_SUPPORTED); + getOrCreateTagBuilder(ConventionalEntityTypeTags.TELEPORTING_NOT_SUPPORTED); } } diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/teleporting_not_supported.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/teleporting_not_supported.json new file mode 100644 index 0000000000..5e8aecc986 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/teleporting_not_supported.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": [] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java index dde091bdc0..e41b6b5c94 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java @@ -43,6 +43,13 @@ private ConventionalEntityTypeTags() { */ public static final TagKey> CAPTURING_NOT_SUPPORTED = register("capturing_not_supported"); + /** + * Entities should be included in this tag if they are not allowed to be teleported in any way. + * This is more for mods that allow teleporting entities within the same dimension. Any mod that is + * teleporting entities to new dimensions should be checking canChangeDimensions method on the entity itself. + */ + public static final TagKey> TELEPORTING_NOT_SUPPORTED = register("teleporting_not_supported"); + private static TagKey> register(String tagId) { return TagRegistration.ENTITY_TYPE_TAG.registerC(tagId); } From 749533a7ab84502368340499357c559ae60272b0 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 16 Mar 2024 14:31:53 -0400 Subject: [PATCH 100/123] Changed name of the javadoc method referenced --- .../api/tag/convention/v2/ConventionalEntityTypeTags.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java index e41b6b5c94..91d173c605 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java @@ -46,7 +46,7 @@ private ConventionalEntityTypeTags() { /** * Entities should be included in this tag if they are not allowed to be teleported in any way. * This is more for mods that allow teleporting entities within the same dimension. Any mod that is - * teleporting entities to new dimensions should be checking canChangeDimensions method on the entity itself. + * teleporting entities to new dimensions should be checking canUsePortals method on the entity itself. */ public static final TagKey> TELEPORTING_NOT_SUPPORTED = register("teleporting_not_supported"); From 1a1725096529e6804578abd13adebf0a2eeb7686 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 10 Apr 2024 15:21:33 -0400 Subject: [PATCH 101/123] Updated to 1.20.5 --- .../datagen/generators/ItemTagGenerator.java | 22 ++++++++ .../data/c/tags/blocks/barrels/wooden.json | 1 - .../resources/data/c/tags/blocks/chests.json | 1 - .../data/c/tags/blocks/chests/wooden.json | 1 - .../data/c/tags/blocks/cobblestones.json | 1 - .../resources/data/c/tags/blocks/dyed.json | 1 - .../data/c/tags/blocks/dyed/black.json | 1 - .../data/c/tags/blocks/dyed/blue.json | 1 - .../data/c/tags/blocks/dyed/brown.json | 1 - .../data/c/tags/blocks/dyed/cyan.json | 1 - .../data/c/tags/blocks/dyed/gray.json | 1 - .../data/c/tags/blocks/dyed/green.json | 1 - .../data/c/tags/blocks/dyed/light_blue.json | 1 - .../data/c/tags/blocks/dyed/light_gray.json | 1 - .../data/c/tags/blocks/dyed/lime.json | 1 - .../data/c/tags/blocks/dyed/magenta.json | 1 - .../data/c/tags/blocks/dyed/orange.json | 1 - .../data/c/tags/blocks/dyed/pink.json | 1 - .../data/c/tags/blocks/dyed/purple.json | 1 - .../data/c/tags/blocks/dyed/red.json | 1 - .../data/c/tags/blocks/dyed/white.json | 1 - .../data/c/tags/blocks/dyed/yellow.json | 1 - .../c/tags/blocks/ores/netherite_scrap.json | 1 - .../data/c/tags/blocks/ores/quartz.json | 1 - .../player_workstations/crafting_tables.json | 1 - .../data/c/tags/blocks/sandstone/blocks.json | 1 - .../c/tags/blocks/sandstone/red_slabs.json | 1 - .../c/tags/blocks/sandstone/red_stairs.json | 1 - .../data/c/tags/blocks/sandstone/stairs.json | 1 - .../resources/data/c/tags/blocks/skulls.json | 1 - .../resources/data/c/tags/blocks/stones.json | 1 - .../data/c/tags/blocks/storage_blocks.json | 1 - .../tags/blocks/storage_blocks/bone_meal.json | 1 - .../c/tags/blocks/storage_blocks/coal.json | 1 - .../c/tags/blocks/storage_blocks/copper.json | 1 - .../c/tags/blocks/storage_blocks/diamond.json | 1 - .../blocks/storage_blocks/dried_kelp.json | 1 - .../c/tags/blocks/storage_blocks/emerald.json | 1 - .../c/tags/blocks/storage_blocks/gold.json | 1 - .../c/tags/blocks/storage_blocks/iron.json | 1 - .../c/tags/blocks/storage_blocks/lapis.json | 1 - .../tags/blocks/storage_blocks/netherite.json | 1 - .../tags/blocks/storage_blocks/redstone.json | 1 - .../c/tags/blocks/storage_blocks/slime.json | 1 - ...ntity_auxiliary_movement_enhancements.json | 1 - .../entity_speed_enhancements.json | 1 - .../teleporting_not_supported.json | 1 - .../fluids/hidden_from_recipe_viewers.json | 1 - .../resources/data/c/tags/fluids/honey.json | 1 - .../resources/data/c/tags/fluids/milk.json | 1 - .../resources/data/c/tags/items/armors.json | 20 +++++++ .../resources/data/c/tags/items/barrels.json | 1 - .../resources/data/c/tags/items/bricks.json | 1 - .../data/c/tags/items/bricks/nether.json | 1 - .../resources/data/c/tags/items/chests.json | 1 - .../data/c/tags/items/chests/wooden.json | 1 - .../data/c/tags/items/cobblestones.json | 1 - .../resources/data/c/tags/items/dusts.json | 1 - .../data/c/tags/items/dusts/glowstone.json | 1 - .../data/c/tags/items/dusts/redstone.json | 1 - .../resources/data/c/tags/items/dyed.json | 1 - .../data/c/tags/items/dyed/black.json | 1 - .../data/c/tags/items/dyed/blue.json | 1 - .../data/c/tags/items/dyed/brown.json | 1 - .../data/c/tags/items/dyed/cyan.json | 1 - .../data/c/tags/items/dyed/gray.json | 1 - .../data/c/tags/items/dyed/green.json | 1 - .../data/c/tags/items/dyed/light_blue.json | 1 - .../data/c/tags/items/dyed/light_gray.json | 1 - .../data/c/tags/items/dyed/lime.json | 1 - .../data/c/tags/items/dyed/magenta.json | 1 - .../data/c/tags/items/dyed/orange.json | 1 - .../data/c/tags/items/dyed/pink.json | 1 - .../data/c/tags/items/dyed/purple.json | 1 - .../resources/data/c/tags/items/dyed/red.json | 1 - .../data/c/tags/items/dyed/white.json | 1 - .../data/c/tags/items/dyed/yellow.json | 1 - .../data/c/tags/items/dyes/black.json | 1 - .../data/c/tags/items/dyes/blue.json | 1 - .../data/c/tags/items/dyes/brown.json | 1 - .../data/c/tags/items/dyes/cyan.json | 1 - .../data/c/tags/items/dyes/gray.json | 1 - .../data/c/tags/items/dyes/green.json | 1 - .../data/c/tags/items/dyes/light_blue.json | 1 - .../data/c/tags/items/dyes/light_gray.json | 1 - .../data/c/tags/items/dyes/lime.json | 1 - .../data/c/tags/items/dyes/magenta.json | 1 - .../data/c/tags/items/dyes/orange.json | 1 - .../data/c/tags/items/dyes/pink.json | 1 - .../data/c/tags/items/dyes/purple.json | 1 - .../resources/data/c/tags/items/dyes/red.json | 1 - .../data/c/tags/items/dyes/white.json | 1 - .../data/c/tags/items/dyes/yellow.json | 1 - .../data/c/tags/items/enchantable.json | 56 +++++++++++++++++++ .../resources/data/c/tags/items/foods.json | 2 +- .../data/c/tags/items/foods/berries.json | 1 - .../data/c/tags/items/foods/candies.json | 1 - .../c/tags/items/foods/cooked_fishes.json | 1 - .../data/c/tags/items/foods/cooked_meats.json | 1 - .../data/c/tags/items/foods/cookies.json | 1 - .../tags/items/foods/edible_when_placed.json | 1 - .../c/tags/items/foods/food_poisoning.json | 1 - .../data/c/tags/items/foods/fruits.json | 1 - .../data/c/tags/items/foods/raw_fishes.json | 1 - .../data/c/tags/items/foods/raw_meats.json | 1 - .../data/c/tags/items/foods/soups.json | 1 - .../data/c/tags/items/foods/vegetables.json | 1 - .../data/c/tags/items/gems/amethyst.json | 1 - .../data/c/tags/items/gems/diamond.json | 1 - .../data/c/tags/items/gems/emerald.json | 1 - .../data/c/tags/items/gems/lapis.json | 1 - .../data/c/tags/items/gems/prismarine.json | 1 - .../data/c/tags/items/gems/quartz.json | 1 - .../items/hidden_from_recipe_viewers.json | 1 - .../c/tags/items/ores/netherite_scrap.json | 1 - .../player_workstations/crafting_tables.json | 1 - .../items/player_workstations/furnaces.json | 1 - .../data/c/tags/items/raw_blocks/copper.json | 1 - .../data/c/tags/items/raw_blocks/gold.json | 1 - .../data/c/tags/items/raw_blocks/iron.json | 1 - .../data/c/tags/items/raw_materials.json | 1 - .../c/tags/items/raw_materials/copper.json | 1 - .../data/c/tags/items/raw_materials/gold.json | 1 - .../data/c/tags/items/raw_materials/iron.json | 1 - .../data/c/tags/items/rods/wooden.json | 1 - .../resources/data/c/tags/items/ropes.json | 1 - .../data/c/tags/items/sandstone/blocks.json | 1 - .../c/tags/items/sandstone/red_slabs.json | 1 - .../c/tags/items/sandstone/red_stairs.json | 1 - .../data/c/tags/items/sandstone/slabs.json | 1 - .../data/c/tags/items/sandstone/stairs.json | 1 - .../tags/items/sandstone/uncolored_slabs.json | 1 - .../resources/data/c/tags/items/stones.json | 1 - .../data/c/tags/items/storage_blocks.json | 1 - .../tags/items/storage_blocks/bone_meal.json | 1 - .../c/tags/items/storage_blocks/coal.json | 1 - .../c/tags/items/storage_blocks/copper.json | 1 - .../c/tags/items/storage_blocks/diamond.json | 1 - .../tags/items/storage_blocks/dried_kelp.json | 1 - .../c/tags/items/storage_blocks/emerald.json | 1 - .../c/tags/items/storage_blocks/gold.json | 1 - .../c/tags/items/storage_blocks/iron.json | 1 - .../c/tags/items/storage_blocks/lapis.json | 1 - .../tags/items/storage_blocks/netherite.json | 1 - .../tags/items/storage_blocks/raw_copper.json | 1 - .../c/tags/items/storage_blocks/raw_gold.json | 1 - .../c/tags/items/storage_blocks/raw_iron.json | 1 - .../c/tags/items/storage_blocks/redstone.json | 1 - .../c/tags/items/storage_blocks/slime.json | 1 - .../resources/data/c/tags/items/strings.json | 1 - .../resources/data/c/tags/items/tools.json | 1 - .../data/c/tags/items/tools/brushes.json | 1 - .../data/c/tags/items/tools/fishing_rods.json | 1 - .../data/c/tags/items/tools/shears.json | 1 - .../data/c/tags/items/tools/shields.json | 1 - .../data/c/tags/items/tools/spears.json | 1 - .../data/c/tags/worldgen/biome/is_cold.json | 1 - .../data/c/tags/worldgen/biome/is_dead.json | 1 - .../worldgen/biome/is_dense_vegetation.json | 1 - .../data/c/tags/worldgen/biome/is_dry.json | 1 - .../tags/worldgen/biome/is_dry/overworld.json | 1 - .../tags/worldgen/biome/is_flower_forest.json | 1 - .../data/c/tags/worldgen/biome/is_hot.json | 1 - .../tags/worldgen/biome/is_hot/overworld.json | 1 - .../worldgen/biome/is_mountain/slope.json | 1 - .../tags/worldgen/biome/is_nether_forest.json | 1 - .../c/tags/worldgen/biome/is_old_growth.json | 1 - .../data/c/tags/worldgen/biome/is_snowy.json | 1 - .../worldgen/biome/is_sparse_vegetation.json | 1 - .../biome/is_sparse_vegetation/overworld.json | 1 - .../c/tags/worldgen/biome/is_temperate.json | 1 - .../c/tags/worldgen/biome/is_wasteland.json | 1 - .../data/c/tags/worldgen/biome/is_wet.json | 1 - .../worldgen/biome/no_default_monsters.json | 1 - .../convention/v2/ConventionalItemTags.java | 15 ++++- 175 files changed, 113 insertions(+), 172 deletions(-) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/armors.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/enchantable.json 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 82cfe4ce2f..13787d7c23 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 @@ -221,6 +221,7 @@ private void generateFoodTags() { .add(Items.BAKED_POTATO) .add(Items.PUMPKIN_PIE) .add(Items.HONEY_BOTTLE) + .add(Items.OMINOUS_BOTTLE) .add(Items.DRIED_KELP) .addOptionalTag(ConventionalItemTags.FRUITS_FOODS) .addOptionalTag(ConventionalItemTags.VEGETABLES_FOODS) @@ -408,6 +409,27 @@ private void generateToolTags() { .add(Items.BOW) .add(Items.CROSSBOW) .add(Items.TRIDENT); + + getOrCreateTagBuilder(ConventionalItemTags.ARMORS) + .addOptionalTag(ItemTags.HEAD_ARMOR) + .addOptionalTag(ItemTags.CHEST_ARMOR) + .addOptionalTag(ItemTags.LEG_ARMOR) + .addOptionalTag(ItemTags.FOOT_ARMOR); + + getOrCreateTagBuilder(ConventionalItemTags.ENCHANTABLE) + .addOptionalTag(ItemTags.ARMOR_ENCHANTABLE) + .addOptionalTag(ItemTags.EQUIPPABLE_ENCHANTABLE) + .addOptionalTag(ItemTags.WEAPON_ENCHANTABLE) + .addOptionalTag(ItemTags.SWORD_ENCHANTABLE) + .addOptionalTag(ItemTags.MINING_ENCHANTABLE) + .addOptionalTag(ItemTags.MINING_LOOT_ENCHANTABLE) + .addOptionalTag(ItemTags.FISHING_ENCHANTABLE) + .addOptionalTag(ItemTags.TRIDENT_ENCHANTABLE) + .addOptionalTag(ItemTags.BOW_ENCHANTABLE) + .addOptionalTag(ItemTags.CROSSBOW_ENCHANTABLE) + .addOptionalTag(ItemTags.MACE_ENCHANTABLE) + .addOptionalTag(ItemTags.FIRE_ASPECT_ENCHANTABLE) + .addOptionalTag(ItemTags.DURABILITY_ENCHANTABLE); } private void generateVillagerJobSites() { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/barrels/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/barrels/wooden.json index a9c1763f11..e4ce49d85d 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/barrels/wooden.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/barrels/wooden.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:barrel", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests.json index 9ec42a987a..d1092146bd 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#c:chests/wooden", "minecraft:ender_chest" diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests/wooden.json index 6f6d1cfd05..7c5abdaf30 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests/wooden.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests/wooden.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:chest", "minecraft:trapped_chest", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/cobblestones.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/cobblestones.json index 6812611eac..9efe7a63ec 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/cobblestones.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/cobblestones.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:cobblestone", "minecraft:mossy_cobblestone", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed.json index 51e52da2bd..ad4584578d 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#c:dyed/white", "#c:dyed/orange", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/black.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/black.json index 6b1a6c0a4e..d751a8001c 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/black.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/black.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:black_banner", "minecraft:black_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/blue.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/blue.json index 71b30e6154..6aa8440457 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/blue.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/blue.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:blue_banner", "minecraft:blue_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/brown.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/brown.json index de7a8661dd..b8307f7246 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/brown.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/brown.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:brown_banner", "minecraft:brown_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/cyan.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/cyan.json index b869ee5b7a..6e5c8123b6 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/cyan.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/cyan.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:cyan_banner", "minecraft:cyan_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/gray.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/gray.json index e79bb7c9e0..f71d3c8250 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/gray.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/gray.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:gray_banner", "minecraft:gray_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/green.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/green.json index c4d0539a97..55e2fb08a1 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/green.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/green.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:green_banner", "minecraft:green_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/light_blue.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/light_blue.json index 5e5c8d17c8..c13fe22e48 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/light_blue.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/light_blue.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:light_blue_banner", "minecraft:light_blue_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/light_gray.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/light_gray.json index 0a976f6d5f..ec0eb75bf4 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/light_gray.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/light_gray.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:light_gray_banner", "minecraft:light_gray_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/lime.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/lime.json index d700410b58..5a32316c66 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/lime.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/lime.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:lime_banner", "minecraft:lime_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/magenta.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/magenta.json index 7936677411..98aee6c88e 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/magenta.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/magenta.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:magenta_banner", "minecraft:magenta_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/orange.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/orange.json index b33bb42fc8..22d7b60a3d 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/orange.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/orange.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:orange_banner", "minecraft:orange_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/pink.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/pink.json index 693d91c275..c45b47d69b 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/pink.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/pink.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:pink_banner", "minecraft:pink_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/purple.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/purple.json index 5df9b17e0b..1d8bd2dcf5 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/purple.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/purple.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:purple_banner", "minecraft:purple_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/red.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/red.json index 5ed3480778..8e900dceab 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/red.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/red.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:red_banner", "minecraft:red_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/white.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/white.json index 9e9707c73e..e534cdf69c 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/white.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/white.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:white_banner", "minecraft:white_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/yellow.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/yellow.json index ca355c5867..9086f0dd8f 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/yellow.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/yellow.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:yellow_banner", "minecraft:yellow_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores/netherite_scrap.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores/netherite_scrap.json index 6495885079..910d1fb8e6 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores/netherite_scrap.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores/netherite_scrap.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:ancient_debris" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores/quartz.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores/quartz.json index 8f0af0a820..c2416f7997 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores/quartz.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores/quartz.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:nether_quartz_ore", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/player_workstations/crafting_tables.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/player_workstations/crafting_tables.json index 9019c8810a..3be1c8e22e 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/player_workstations/crafting_tables.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/player_workstations/crafting_tables.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:crafting_table" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/blocks.json index 23a686229b..871827ea2d 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/blocks.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/blocks.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ { "id": "#c:sandstone/uncolored_blocks", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/red_slabs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/red_slabs.json index cbd4deed72..38a99cb4fc 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/red_slabs.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/red_slabs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:red_sandstone_slab", "minecraft:cut_red_sandstone_slab", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/red_stairs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/red_stairs.json index 9d20c68208..581969f2be 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/red_stairs.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/red_stairs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:red_sandstone_stairs", "minecraft:smooth_red_sandstone_stairs", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/stairs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/stairs.json index c9f3632241..b01cb4a765 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/stairs.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/stairs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ { "id": "#c:sandstone/uncolored_stairs", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/skulls.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/skulls.json index 93646eb7ac..a9820b074f 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/skulls.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/skulls.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:skeleton_skull", "minecraft:skeleton_wall_skull", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/stones.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/stones.json index 11fa89c391..9f3ad2cfd5 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/stones.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/stones.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:stone", "minecraft:andesite", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks.json index 771bb44c2f..b7696bea13 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#c:storage_blocks/bone_meal", "#c:storage_blocks/coal", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/bone_meal.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/bone_meal.json index 18fd367c3c..98ab24a213 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/bone_meal.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/bone_meal.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:bone_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/coal.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/coal.json index dbe07ace81..4b7921705b 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/coal.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/coal.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:coal_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/copper.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/copper.json index 1b51fad6c5..015bec70c3 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/copper.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/copper.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:copper_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/diamond.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/diamond.json index bc19777550..acd7f52de5 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/diamond.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/diamond.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:diamond_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/dried_kelp.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/dried_kelp.json index a2d78ca7d1..2609656429 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/dried_kelp.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/dried_kelp.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:dried_kelp_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/emerald.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/emerald.json index 30e292c558..152063ec6c 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/emerald.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/emerald.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:emerald_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/gold.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/gold.json index 863d47ad21..546dde03c9 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/gold.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/gold.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:gold_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/iron.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/iron.json index f9e01c6a9b..01fb2965f2 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/iron.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/iron.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:iron_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/lapis.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/lapis.json index 7de86cb6b5..f4ca82bbd4 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/lapis.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/lapis.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:lapis_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/netherite.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/netherite.json index 11b9a7230d..83433d44eb 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/netherite.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/netherite.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:netherite_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/redstone.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/redstone.json index f20a3ced25..f5fd89c541 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/redstone.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/redstone.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:redstone_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/slime.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/slime.json index f3c5414d36..523bdc2835 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/slime.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/slime.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:slime_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_auxiliary_movement_enhancements.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_auxiliary_movement_enhancements.json index 6cc9b14404..18527f1e0f 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_auxiliary_movement_enhancements.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_auxiliary_movement_enhancements.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:feather_falling", "minecraft:frost_walker" diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_speed_enhancements.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_speed_enhancements.json index 0a61372c0f..c8eb636ba6 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_speed_enhancements.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_speed_enhancements.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:soul_speed", "minecraft:swift_sneak", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/teleporting_not_supported.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/teleporting_not_supported.json index 5e8aecc986..f72d209df7 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/teleporting_not_supported.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/teleporting_not_supported.json @@ -1,4 +1,3 @@ { - "replace": false, "values": [] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/hidden_from_recipe_viewers.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/hidden_from_recipe_viewers.json index 5e8aecc986..f72d209df7 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/hidden_from_recipe_viewers.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/hidden_from_recipe_viewers.json @@ -1,4 +1,3 @@ { - "replace": false, "values": [] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/honey.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/honey.json index 5e8aecc986..f72d209df7 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/honey.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/honey.json @@ -1,4 +1,3 @@ { - "replace": false, "values": [] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/milk.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/milk.json index 5e8aecc986..f72d209df7 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/milk.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/milk.json @@ -1,4 +1,3 @@ { - "replace": false, "values": [] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/armors.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/armors.json new file mode 100644 index 0000000000..dcc5f66254 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/armors.json @@ -0,0 +1,20 @@ +{ + "values": [ + { + "id": "#minecraft:head_armor", + "required": false + }, + { + "id": "#minecraft:chest_armor", + "required": false + }, + { + "id": "#minecraft:leg_armor", + "required": false + }, + { + "id": "#minecraft:foot_armor", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels.json index 664f41b0c2..5e84e807f6 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#c:barrels/wooden" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bricks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bricks.json index 96b1cfbd53..c6ffebd0ec 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bricks.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bricks.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ { "id": "#c:bricks/normal", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bricks/nether.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bricks/nether.json index 709e0c77b1..ec7ed3ee9a 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bricks/nether.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bricks/nether.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:nether_brick" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests.json index 9ec42a987a..d1092146bd 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#c:chests/wooden", "minecraft:ender_chest" diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests/wooden.json index a877dfe096..a246801727 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests/wooden.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests/wooden.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:chest", "minecraft:trapped_chest", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/cobblestones.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/cobblestones.json index 6812611eac..9efe7a63ec 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/cobblestones.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/cobblestones.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:cobblestone", "minecraft:mossy_cobblestone", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts.json index e297595b15..d0edbb6a1d 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ { "id": "#c:dusts/glowstone", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/glowstone.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/glowstone.json index dcc3a1fa1e..3296e30a9a 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/glowstone.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/glowstone.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:glowstone_dust", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/redstone.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/redstone.json index a0b3cfe802..2117ea4d9a 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/redstone.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/redstone.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:redstone", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed.json index 51e52da2bd..ad4584578d 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#c:dyed/white", "#c:dyed/orange", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/black.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/black.json index ebe31c9524..174ba5e3c4 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/black.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/black.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:black_banner", "minecraft:black_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/blue.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/blue.json index e3c6e2ca95..ca4b83cd7d 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/blue.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/blue.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:blue_banner", "minecraft:blue_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/brown.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/brown.json index d359c02cd1..502f5bccec 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/brown.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/brown.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:brown_banner", "minecraft:brown_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/cyan.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/cyan.json index 0fb94adcce..f3e0d24c65 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/cyan.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/cyan.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:cyan_banner", "minecraft:cyan_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/gray.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/gray.json index f93eeb0c38..58a9ff3549 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/gray.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/gray.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:gray_banner", "minecraft:gray_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/green.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/green.json index 8b4261b21f..27dc841609 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/green.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/green.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:green_banner", "minecraft:green_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/light_blue.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/light_blue.json index 8bded9034a..63e842c4e0 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/light_blue.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/light_blue.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:light_blue_banner", "minecraft:light_blue_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/light_gray.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/light_gray.json index 155b5fe129..5a46bc1a15 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/light_gray.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/light_gray.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:light_gray_banner", "minecraft:light_gray_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/lime.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/lime.json index 6191433953..56f424525c 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/lime.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/lime.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:lime_banner", "minecraft:lime_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/magenta.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/magenta.json index 3c0960b9aa..f837aefc8a 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/magenta.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/magenta.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:magenta_banner", "minecraft:magenta_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/orange.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/orange.json index 6d443cdcda..7fa2a7ef84 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/orange.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/orange.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:orange_banner", "minecraft:orange_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/pink.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/pink.json index 9d6aa1d83e..7538cceb02 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/pink.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/pink.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:pink_banner", "minecraft:pink_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/purple.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/purple.json index 330f6e2f55..61355c9ae2 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/purple.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/purple.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:purple_banner", "minecraft:purple_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/red.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/red.json index 488a4ef6a6..252f4660e0 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/red.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/red.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:red_banner", "minecraft:red_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/white.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/white.json index b66e91b410..2e1979e814 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/white.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/white.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:white_banner", "minecraft:white_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/yellow.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/yellow.json index 4a38b9a835..0e353cc64e 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/yellow.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/yellow.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:yellow_banner", "minecraft:yellow_bed", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/black.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/black.json index cf83aebee3..affded1275 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/black.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/black.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:black_dye", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/blue.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/blue.json index fd5ec30230..e14bd1a4d6 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/blue.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/blue.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:blue_dye", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/brown.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/brown.json index f55a4123fa..e190092a97 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/brown.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/brown.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:brown_dye", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/cyan.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/cyan.json index 9df7fac00f..3407ddaea1 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/cyan.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/cyan.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:cyan_dye", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/gray.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/gray.json index fb7944ae24..1ba17b1d90 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/gray.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/gray.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:gray_dye", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/green.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/green.json index 1fbfe563a3..a04e63acc9 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/green.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/green.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:green_dye", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/light_blue.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/light_blue.json index 0cfe0611d1..04dd002ec4 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/light_blue.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/light_blue.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:light_blue_dye", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/light_gray.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/light_gray.json index 2fe9a39f43..25c7c0d476 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/light_gray.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/light_gray.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:light_gray_dye", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/lime.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/lime.json index 0efd7ab27c..5809417ee5 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/lime.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/lime.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:lime_dye", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/magenta.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/magenta.json index af5ba91d54..fc3256c1d1 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/magenta.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/magenta.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:magenta_dye", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/orange.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/orange.json index 5fcfee4da9..813536832d 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/orange.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/orange.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:orange_dye", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/pink.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/pink.json index 7bb8d7c0b8..32c3703581 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/pink.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/pink.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:pink_dye", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/purple.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/purple.json index f05e997c56..67b1163e92 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/purple.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/purple.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:purple_dye", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/red.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/red.json index d787e9d436..cc78a0e8bd 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/red.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/red.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:red_dye", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/white.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/white.json index 9a92c51c85..a448297947 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/white.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/white.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:white_dye", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/yellow.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/yellow.json index 7307cb919a..fd224f665f 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/yellow.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/yellow.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:yellow_dye", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/enchantable.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/enchantable.json new file mode 100644 index 0000000000..82f724cbce --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/enchantable.json @@ -0,0 +1,56 @@ +{ + "values": [ + { + "id": "#minecraft:enchantable/armor", + "required": false + }, + { + "id": "#minecraft:enchantable/equippable", + "required": false + }, + { + "id": "#minecraft:enchantable/weapon", + "required": false + }, + { + "id": "#minecraft:enchantable/sword", + "required": false + }, + { + "id": "#minecraft:enchantable/mining", + "required": false + }, + { + "id": "#minecraft:enchantable/mining_loot", + "required": false + }, + { + "id": "#minecraft:enchantable/fishing", + "required": false + }, + { + "id": "#minecraft:enchantable/trident", + "required": false + }, + { + "id": "#minecraft:enchantable/bow", + "required": false + }, + { + "id": "#minecraft:enchantable/crossbow", + "required": false + }, + { + "id": "#minecraft:enchantable/mace", + "required": false + }, + { + "id": "#minecraft:enchantable/fire_aspect", + "required": false + }, + { + "id": "#minecraft:enchantable/durability", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json index 917e349859..a867fdccd0 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json @@ -1,9 +1,9 @@ { - "replace": false, "values": [ "minecraft:baked_potato", "minecraft:pumpkin_pie", "minecraft:honey_bottle", + "minecraft:ominous_bottle", "minecraft:dried_kelp", { "id": "#c:foods/fruits", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/berries.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/berries.json index ba24344c2e..500bd9432c 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/berries.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/berries.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:sweet_berries", "minecraft:glow_berries" diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/candies.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/candies.json index 5e8aecc986..f72d209df7 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/candies.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/candies.json @@ -1,4 +1,3 @@ { - "replace": false, "values": [] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cooked_fishes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cooked_fishes.json index 0c095564aa..4e459bea9e 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cooked_fishes.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cooked_fishes.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:cooked_cod", "minecraft:cooked_salmon" diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cooked_meats.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cooked_meats.json index 8d18cc5ce3..fe6f7f5443 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cooked_meats.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cooked_meats.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:cooked_beef", "minecraft:cooked_chicken", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cookies.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cookies.json index a06d2ae8ad..a7c0dc91d8 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cookies.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cookies.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:cookie" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/edible_when_placed.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/edible_when_placed.json index a49f1d194c..d1a45a9222 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/edible_when_placed.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/edible_when_placed.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:cake" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/food_poisoning.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/food_poisoning.json index 47ba33cc5e..6b59df70e4 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/food_poisoning.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/food_poisoning.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:poisonous_potato", "minecraft:pufferfish", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/fruits.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/fruits.json index ce7de785a4..895ad4a310 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/fruits.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/fruits.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:apple", "minecraft:golden_apple", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/raw_fishes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/raw_fishes.json index bfbe799fca..83d056aa44 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/raw_fishes.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/raw_fishes.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:cod", "minecraft:salmon", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/raw_meats.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/raw_meats.json index 67485e8338..1c57ef56bf 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/raw_meats.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/raw_meats.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:beef", "minecraft:chicken", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/soups.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/soups.json index d7a5d6c6d4..5a1a339249 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/soups.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/soups.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:beetroot_soup", "minecraft:mushroom_stew", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/vegetables.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/vegetables.json index 0665641a7a..0476304c8a 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/vegetables.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/vegetables.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:carrot", "minecraft:golden_carrot", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/amethyst.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/amethyst.json index 10553e567e..742ef896d5 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/amethyst.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/amethyst.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:amethyst_shard" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/diamond.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/diamond.json index 36d5d91586..fdf1d37128 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/diamond.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/diamond.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:diamond", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/emerald.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/emerald.json index c506d650ba..be8158a623 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/emerald.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/emerald.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:emerald", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/lapis.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/lapis.json index 8d6dfcd8fa..3dbc7a77ba 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/lapis.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/lapis.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:lapis_lazuli", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/prismarine.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/prismarine.json index 6e3777b093..150e7ff711 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/prismarine.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/prismarine.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:prismarine_crystals" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/quartz.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/quartz.json index f062f80e01..d03fdf616e 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/quartz.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/quartz.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:quartz", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/hidden_from_recipe_viewers.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/hidden_from_recipe_viewers.json index 5e8aecc986..f72d209df7 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/hidden_from_recipe_viewers.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/hidden_from_recipe_viewers.json @@ -1,4 +1,3 @@ { - "replace": false, "values": [] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores/netherite_scrap.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores/netherite_scrap.json index 6495885079..910d1fb8e6 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores/netherite_scrap.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores/netherite_scrap.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:ancient_debris" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/player_workstations/crafting_tables.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/player_workstations/crafting_tables.json index 9019c8810a..3be1c8e22e 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/player_workstations/crafting_tables.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/player_workstations/crafting_tables.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:crafting_table" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/player_workstations/furnaces.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/player_workstations/furnaces.json index 469e57c08e..25edfef1ca 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/player_workstations/furnaces.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/player_workstations/furnaces.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:furnace" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/copper.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/copper.json index 3a578a0277..1a21e230ef 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/copper.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/copper.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:raw_copper_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/gold.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/gold.json index 4ce9cc47d1..80781ce667 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/gold.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/gold.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:raw_gold_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/iron.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/iron.json index 14f551c592..13ed9fc651 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/iron.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/iron.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:raw_iron_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials.json index 47a7fc7cba..d344ab6282 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ { "id": "#c:raw_materials/copper", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/copper.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/copper.json index 7bbe84139c..c02e701f3c 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/copper.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/copper.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:raw_copper", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/gold.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/gold.json index 432fd17379..854588fc8c 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/gold.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/gold.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:raw_gold", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/iron.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/iron.json index 9573eb14fe..18311b444a 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/iron.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/iron.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:raw_iron", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/wooden.json index 390efe6924..019b63dd31 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/wooden.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/wooden.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:stick" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ropes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ropes.json index 5e8aecc986..f72d209df7 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ropes.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ropes.json @@ -1,4 +1,3 @@ { - "replace": false, "values": [] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/blocks.json index 23a686229b..871827ea2d 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/blocks.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/blocks.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ { "id": "#c:sandstone/uncolored_blocks", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/red_slabs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/red_slabs.json index cbd4deed72..38a99cb4fc 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/red_slabs.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/red_slabs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:red_sandstone_slab", "minecraft:cut_red_sandstone_slab", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/red_stairs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/red_stairs.json index 9d20c68208..581969f2be 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/red_stairs.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/red_stairs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:red_sandstone_stairs", "minecraft:smooth_red_sandstone_stairs", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/slabs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/slabs.json index 8d6c86218a..1dc38421a7 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/slabs.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/slabs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ { "id": "#c:sandstone/uncolored_slabs", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/stairs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/stairs.json index c9f3632241..b01cb4a765 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/stairs.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/stairs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ { "id": "#c:sandstone/uncolored_stairs", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/uncolored_slabs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/uncolored_slabs.json index ac90e3f386..2b78d36596 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/uncolored_slabs.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/uncolored_slabs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:sandstone_slab", "minecraft:cut_sandstone_slab", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/stones.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/stones.json index 11fa89c391..9f3ad2cfd5 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/stones.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/stones.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:stone", "minecraft:andesite", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks.json index 771bb44c2f..b7696bea13 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#c:storage_blocks/bone_meal", "#c:storage_blocks/coal", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/bone_meal.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/bone_meal.json index 18fd367c3c..98ab24a213 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/bone_meal.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/bone_meal.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:bone_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/coal.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/coal.json index dbe07ace81..4b7921705b 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/coal.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/coal.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:coal_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/copper.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/copper.json index 1b51fad6c5..015bec70c3 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/copper.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/copper.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:copper_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/diamond.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/diamond.json index bc19777550..acd7f52de5 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/diamond.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/diamond.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:diamond_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/dried_kelp.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/dried_kelp.json index a2d78ca7d1..2609656429 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/dried_kelp.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/dried_kelp.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:dried_kelp_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/emerald.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/emerald.json index 30e292c558..152063ec6c 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/emerald.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/emerald.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:emerald_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/gold.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/gold.json index 863d47ad21..546dde03c9 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/gold.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/gold.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:gold_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/iron.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/iron.json index f9e01c6a9b..01fb2965f2 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/iron.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/iron.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:iron_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/lapis.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/lapis.json index 7de86cb6b5..f4ca82bbd4 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/lapis.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/lapis.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:lapis_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/netherite.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/netherite.json index 11b9a7230d..83433d44eb 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/netherite.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/netherite.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:netherite_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_copper.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_copper.json index 3a578a0277..1a21e230ef 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_copper.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_copper.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:raw_copper_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_gold.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_gold.json index 4ce9cc47d1..80781ce667 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_gold.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_gold.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:raw_gold_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_iron.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_iron.json index 14f551c592..13ed9fc651 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_iron.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_iron.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:raw_iron_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/redstone.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/redstone.json index f20a3ced25..f5fd89c541 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/redstone.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/redstone.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:redstone_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/slime.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/slime.json index f3c5414d36..523bdc2835 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/slime.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/slime.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:slime_block" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/strings.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/strings.json index 86c603831b..599801436e 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/strings.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/strings.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:string", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools.json index b78f093f9b..e6f97c30f8 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ { "id": "#minecraft:axes", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/brushes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/brushes.json index ad68ac36e3..8b2fb219ea 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/brushes.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/brushes.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:brush" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/fishing_rods.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/fishing_rods.json index 15a885ab6e..e97941e9dc 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/fishing_rods.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/fishing_rods.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:fishing_rod" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shears.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shears.json index 884d5d1544..2974368476 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shears.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shears.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:shears", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shields.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shields.json index 9c665cef1f..cb55f6df61 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shields.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shields.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:shield", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/spears.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/spears.json index 2198e694c9..5ee455d5d1 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/spears.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/spears.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:trident", { 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 a6c4a7fc48..a5684677e6 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,4 @@ { - "replace": false, "values": [ "#c:is_cold/overworld" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dead.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dead.json index 5e8aecc986..f72d209df7 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dead.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dead.json @@ -1,4 +1,3 @@ { - "replace": false, "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 ad91f62afa..ac773567ac 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 @@ -1,5 +1,4 @@ { - "replace": false, "values": [ { "id": "#c:is_dense_vegetation/overworld", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry.json index e1fa873301..dee9413885 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#c:is_dry/overworld" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/overworld.json index 2c70684dd3..a5498e419d 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/overworld.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/overworld.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ { "id": "#c:is_nether", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_flower_forest.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_flower_forest.json index 20a0f1d8ac..9885c52241 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_flower_forest.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_flower_forest.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:flower_forest", { 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 1dc6cf299b..8df12cae4b 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,5 +1,4 @@ { - "replace": false, "values": [ "#c:is_hot/overworld" ] 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 700a2d20a7..05050c6633 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,5 +1,4 @@ { - "replace": false, "values": [ { "id": "#c:is_jungle", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain/slope.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain/slope.json index 7a0451964d..0d6aa0d4d1 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain/slope.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain/slope.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:snowy_slopes", { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_nether_forest.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_nether_forest.json index f0edd6a24c..36924ab504 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_nether_forest.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_nether_forest.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:warped_forest", "minecraft:crimson_forest", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_old_growth.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_old_growth.json index b11724242a..412f42f3e5 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_old_growth.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_old_growth.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:old_growth_birch_forest", "minecraft:old_growth_pine_taiga", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy.json index eec7e1191e..193255cf45 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:snowy_beach", "minecraft:snowy_plains", 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 179cf8231d..bd3b8da016 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 @@ -1,5 +1,4 @@ { - "replace": false, "values": [ { "id": "#c:is_sparse_vegetation/overworld", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json index 6d9f976a8c..9b462a969b 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ { "id": "#c:is_savanna", 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 b547f21eaf..53794ed902 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,4 @@ { - "replace": false, "values": [ "#c:is_temperate/overworld" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wasteland.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wasteland.json index 5e8aecc986..f72d209df7 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wasteland.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wasteland.json @@ -1,4 +1,3 @@ { - "replace": false, "values": [] } \ No newline at end of file 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 9501d65260..bee471c87a 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,4 @@ { - "replace": false, "values": [ "#c:is_wet/overworld" ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/no_default_monsters.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/no_default_monsters.json index 4f47046888..2496ccf1e9 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/no_default_monsters.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/no_default_monsters.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:mushroom_fields", "minecraft:deep_dark" 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 e742f90fe6..37c38bf821 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 @@ -54,6 +54,18 @@ private ConventionalItemTags() { public static final TagKey RANGED_WEAPONS_TOOLS = register("tools/ranged_weapons"); public static final TagKey MINING_TOOLS = register("tools/mining_tools"); + // Armor tags + /** + * Collects the 4 vanilla armor tags into one parent collection for ease. + */ + public static final TagKey ARMORS = register("armors"); + + // Tools/Armor tags + /** + * Collects the many enchantable tags into one parent collection for ease. + */ + public static final TagKey ENCHANTABLE = register("enchantable"); + // Ores and ingots - categories public static final TagKey BRICKS = register("bricks"); public static final TagKey DUSTS = register("dusts"); @@ -201,7 +213,8 @@ private ConventionalItemTags() { // Items created with dyes /** * Tag that holds all blocks and items that can be dyed a specific color. - * (Does not include color blending items like leather armor) + * (Does not include color blending items like leather armor. + * Use {@link net.minecraft.registry.tag.ItemTags.DYEABLE} tag instead for color blending items) *

* Note: Use custom ingredients in recipes to do tag intersections and/or tag exclusions * to make more powerful recipes utilizing multiple tags such as dyed tags for an ingredient. From 2f712d2a82854db720e05bb2f0a484162bc613c8 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 10 Apr 2024 18:50:15 -0400 Subject: [PATCH 102/123] renamed end biome tag --- .../impl/tag/convention/ConventionLogWarnings.java | 2 +- .../convention/datagen/generators/BiomeTagGenerator.java | 4 ++-- .../tags/worldgen/biome/{is_the_end.json => is_end.json} | 0 .../api/tag/convention/v2/ConventionalBiomeTags.java | 9 +++++++-- 4 files changed, 10 insertions(+), 5 deletions(-) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/{is_the_end.json => is_end.json} (100%) diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index a5228ae7b0..887fb3d975 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -118,7 +118,7 @@ public enum LOG_WARNING_MODES { createMapEntry(ConventionalEnchantmentTags.ENTITY_MOVEMENT_ENHANCEMENT, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.ENTITY_SPEED_ENHANCEMENTS), createMapEntry(ConventionalBiomeTags.IN_NETHER, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_NETHER), - createMapEntry(ConventionalBiomeTags.IN_THE_END, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_THE_END), + createMapEntry(ConventionalBiomeTags.IN_THE_END, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_END), createMapEntry(ConventionalBiomeTags.IN_OVERWORLD, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_OVERWORLD), createMapEntry(ConventionalBiomeTags.CAVES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_CAVE), createMapEntry(ConventionalBiomeTags.CLIMATE_COLD, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_COLD), 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 47b5566505..c20d6574d3 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 @@ -53,7 +53,7 @@ private void generateDimensionTags() { .add(BiomeKeys.NETHER_WASTES) .add(BiomeKeys.SOUL_SAND_VALLEY) .add(BiomeKeys.BASALT_DELTAS); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_THE_END) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_END) .addOptionalTag(BiomeTags.IS_END) .add(BiomeKeys.END_BARRENS) .add(BiomeKeys.END_MIDLANDS) @@ -297,7 +297,7 @@ private void generateBackwardsCompatTags() { // TODO: Remove backwards compat tag entries in 1.22 getOrCreateTagBuilder(ConventionalBiomeTags.IS_NETHER).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "in_nether")); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_THE_END).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "in_the_end")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_END).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "in_the_end")); getOrCreateTagBuilder(ConventionalBiomeTags.IS_OVERWORLD).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "in_the_overworld")); getOrCreateTagBuilder(ConventionalBiomeTags.IS_CAVE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "caves")); getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD_OVERWORLD).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "climate_cold")); diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_the_end.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_end.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_the_end.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_end.json 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 f96f81c472..77a0920deb 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 @@ -33,15 +33,20 @@ private ConventionalBiomeTags() { /** * Biomes that spawn in the Overworld. + * (This is for people who want to tag their biomes as Overworld without getting + * side effects from {@link net.minecraft.registry.tag.BiomeTags.IS_OVERWORLD}) */ public static final TagKey IS_OVERWORLD = register("is_overworld"); - // The following are based on Biome categories, see Biome$Category for details /** * Biomes that spawn in the End. + * (This is for people who want to tag their biomes as End without getting + * side effects from {@link net.minecraft.registry.tag.BiomeTags.IS_END}) */ - public static final TagKey IS_THE_END = register("is_the_end"); + public static final TagKey IS_END = register("is_end"); /** * Biomes that spawn in the Nether. + * (This is for people who want to tag their biomes as Nether without getting + * side effects from {@link net.minecraft.registry.tag.BiomeTags.IS_NETHER}) */ public static final TagKey IS_NETHER = register("is_nether"); public static final TagKey IS_TAIGA = register("is_taiga"); From 5e76d2fc9ea40e2828146cc71e555e0b36eea74a Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 10 Apr 2024 18:59:45 -0400 Subject: [PATCH 103/123] removed unneeded comment --- .../tag/convention/datagen/generators/BiomeTagGenerator.java | 1 - 1 file changed, 1 deletion(-) 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 c20d6574d3..bfeaa20567 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 @@ -60,7 +60,6 @@ private void generateDimensionTags() { .add(BiomeKeys.END_HIGHLANDS) .add(BiomeKeys.THE_END) .add(BiomeKeys.SMALL_END_ISLANDS); - // We avoid the vanilla group tags here as mods may add to them without actually spawning them in the overworld getOrCreateTagBuilder(ConventionalBiomeTags.IS_OVERWORLD) .addOptionalTag(BiomeTags.IS_OVERWORLD) .add(BiomeKeys.RIVER, BiomeKeys.FROZEN_RIVER) From b29c87668595a665db0858e10fc521fdfe2c5f8c Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 10 Apr 2024 19:23:41 -0400 Subject: [PATCH 104/123] Updated module's depends --- fabric-convention-tags-v2/src/main/resources/fabric.mod.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fabric-convention-tags-v2/src/main/resources/fabric.mod.json b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json index aea2fdc22b..3d57969167 100644 --- a/fabric-convention-tags-v2/src/main/resources/fabric.mod.json +++ b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json @@ -16,8 +16,8 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.1", - "minecraft": ">=1.20.1", + "fabricloader": ">=0.15.6", + "minecraft": ">=1.20.5", "fabric-lifecycle-events-v1": "*" }, "mixins": [], From f76dcb47f42daacfbdd46fedc55683f14e9e37b2 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 10 Apr 2024 20:06:02 -0400 Subject: [PATCH 105/123] adjusted enchantables tag and fixed version requirements --- .../tag/convention/datagen/generators/ItemTagGenerator.java | 2 +- .../data/c/tags/items/{enchantable.json => enchantables.json} | 0 .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 2 +- fabric-convention-tags-v2/src/main/resources/fabric.mod.json | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{enchantable.json => enchantables.json} (100%) 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 13787d7c23..414b07f5d6 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 @@ -416,7 +416,7 @@ private void generateToolTags() { .addOptionalTag(ItemTags.LEG_ARMOR) .addOptionalTag(ItemTags.FOOT_ARMOR); - getOrCreateTagBuilder(ConventionalItemTags.ENCHANTABLE) + getOrCreateTagBuilder(ConventionalItemTags.ENCHANTABLES) .addOptionalTag(ItemTags.ARMOR_ENCHANTABLE) .addOptionalTag(ItemTags.EQUIPPABLE_ENCHANTABLE) .addOptionalTag(ItemTags.WEAPON_ENCHANTABLE) diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/enchantable.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/enchantables.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/enchantable.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/enchantables.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 37c38bf821..e58077ac97 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 @@ -64,7 +64,7 @@ private ConventionalItemTags() { /** * Collects the many enchantable tags into one parent collection for ease. */ - public static final TagKey ENCHANTABLE = register("enchantable"); + public static final TagKey ENCHANTABLES = register("enchantables"); // Ores and ingots - categories public static final TagKey BRICKS = register("bricks"); diff --git a/fabric-convention-tags-v2/src/main/resources/fabric.mod.json b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json index 3d57969167..02fa0e0dcc 100644 --- a/fabric-convention-tags-v2/src/main/resources/fabric.mod.json +++ b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json @@ -17,7 +17,7 @@ ], "depends": { "fabricloader": ">=0.15.6", - "minecraft": ">=1.20.5", + "minecraft": ">=1.20.5-beta.1", "fabric-lifecycle-events-v1": "*" }, "mixins": [], From 4540bd993a5e2ff592f70dc952818eff403eecbb Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 10 Apr 2024 20:20:09 -0400 Subject: [PATCH 106/123] Improve the overworld bioem tag ordering --- .../datagen/generators/BiomeTagGenerator.java | 31 +++++++++---------- .../c/tags/worldgen/biome/is_overworld.json | 10 +++--- 2 files changed, 19 insertions(+), 22 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 bfeaa20567..d4e7a295bc 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 @@ -67,24 +67,21 @@ private void generateDimensionTags() { .add(BiomeKeys.DEEP_FROZEN_OCEAN, BiomeKeys.DEEP_OCEAN) .add(BiomeKeys.DEEP_LUKEWARM_OCEAN, BiomeKeys.WARM_OCEAN, BiomeKeys.LUKEWARM_OCEAN) .add(BiomeKeys.FROZEN_OCEAN, BiomeKeys.OCEAN) - .add(BiomeKeys.BEACH, BiomeKeys.PLAINS) - .add(BiomeKeys.SUNFLOWER_PLAINS, BiomeKeys.SNOWY_PLAINS) + .add(BiomeKeys.BEACH, BiomeKeys.SNOWY_BEACH, BiomeKeys.STONY_SHORE) + .add(BiomeKeys.PLAINS, BiomeKeys.SUNFLOWER_PLAINS, BiomeKeys.SNOWY_PLAINS) .add(BiomeKeys.ICE_SPIKES, BiomeKeys.DESERT) - .add(BiomeKeys.FOREST, BiomeKeys.FLOWER_FOREST) - .add(BiomeKeys.BIRCH_FOREST, BiomeKeys.DARK_FOREST) - .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST, BiomeKeys.OLD_GROWTH_PINE_TAIGA) - .add(BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA, BiomeKeys.TAIGA) - .add(BiomeKeys.SNOWY_TAIGA, BiomeKeys.SAVANNA) - .add(BiomeKeys.SAVANNA_PLATEAU, BiomeKeys.WINDSWEPT_HILLS) - .add(BiomeKeys.WINDSWEPT_GRAVELLY_HILLS, BiomeKeys.WINDSWEPT_FOREST) - .add(BiomeKeys.WINDSWEPT_SAVANNA, BiomeKeys.JUNGLE, BiomeKeys.SPARSE_JUNGLE) - .add(BiomeKeys.BAMBOO_JUNGLE, BiomeKeys.BADLANDS, BiomeKeys.ERODED_BADLANDS) - .add(BiomeKeys.WOODED_BADLANDS, BiomeKeys.MEADOW, BiomeKeys.GROVE) - .add(BiomeKeys.SNOWY_SLOPES, BiomeKeys.FROZEN_PEAKS, BiomeKeys.JAGGED_PEAKS) - .add(BiomeKeys.STONY_PEAKS, BiomeKeys.MUSHROOM_FIELDS, BiomeKeys.DRIPSTONE_CAVES) - .add(BiomeKeys.LUSH_CAVES, BiomeKeys.SNOWY_BEACH, BiomeKeys.SWAMP, BiomeKeys.STONY_SHORE) - .add(BiomeKeys.DEEP_DARK, BiomeKeys.MANGROVE_SWAMP) - .add(BiomeKeys.CHERRY_GROVE); + .add(BiomeKeys.FOREST, BiomeKeys.FLOWER_FOREST, BiomeKeys.BIRCH_FOREST, BiomeKeys.DARK_FOREST) + .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST, BiomeKeys.OLD_GROWTH_PINE_TAIGA, BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA) + .add(BiomeKeys.TAIGA, BiomeKeys.SNOWY_TAIGA) + .add(BiomeKeys.SWAMP, BiomeKeys.MANGROVE_SWAMP) + .add(BiomeKeys.SAVANNA, BiomeKeys.SAVANNA_PLATEAU) + .add(BiomeKeys.WINDSWEPT_HILLS, BiomeKeys.WINDSWEPT_GRAVELLY_HILLS, BiomeKeys.WINDSWEPT_FOREST, BiomeKeys.WINDSWEPT_SAVANNA) + .add(BiomeKeys.JUNGLE, BiomeKeys.SPARSE_JUNGLE, BiomeKeys.BAMBOO_JUNGLE) + .add(BiomeKeys.BADLANDS, BiomeKeys.ERODED_BADLANDS, BiomeKeys.WOODED_BADLANDS) + .add(BiomeKeys.MEADOW, BiomeKeys.GROVE, BiomeKeys.CHERRY_GROVE, BiomeKeys.SNOWY_SLOPES) + .add(BiomeKeys.FROZEN_PEAKS, BiomeKeys.JAGGED_PEAKS, BiomeKeys.STONY_PEAKS) + .add(BiomeKeys.MUSHROOM_FIELDS) + .add(BiomeKeys.DRIPSTONE_CAVES, BiomeKeys.LUSH_CAVES, BiomeKeys.DEEP_DARK); } private void generateCategoryTags() { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_overworld.json index 19ec572308..927edef409 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_overworld.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_overworld.json @@ -16,6 +16,8 @@ "minecraft:frozen_ocean", "minecraft:ocean", "minecraft:beach", + "minecraft:snowy_beach", + "minecraft:stony_shore", "minecraft:plains", "minecraft:sunflower_plains", "minecraft:snowy_plains", @@ -30,6 +32,8 @@ "minecraft:old_growth_spruce_taiga", "minecraft:taiga", "minecraft:snowy_taiga", + "minecraft:swamp", + "minecraft:mangrove_swamp", "minecraft:savanna", "minecraft:savanna_plateau", "minecraft:windswept_hills", @@ -44,6 +48,7 @@ "minecraft:wooded_badlands", "minecraft:meadow", "minecraft:grove", + "minecraft:cherry_grove", "minecraft:snowy_slopes", "minecraft:frozen_peaks", "minecraft:jagged_peaks", @@ -51,12 +56,7 @@ "minecraft:mushroom_fields", "minecraft:dripstone_caves", "minecraft:lush_caves", - "minecraft:snowy_beach", - "minecraft:swamp", - "minecraft:stony_shore", "minecraft:deep_dark", - "minecraft:mangrove_swamp", - "minecraft:cherry_grove", { "id": "#c:in_the_overworld", "required": false From 2ed0b37e16a7a49927fe025001912153682559a5 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 10 Apr 2024 20:38:35 -0400 Subject: [PATCH 107/123] updated comments --- .../api/tag/convention/v2/ConventionalBiomeTags.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 77a0920deb..dc769535fe 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 @@ -70,7 +70,7 @@ private ConventionalBiomeTags() { */ public static final TagKey IS_AQUATIC_ICY = register("is_aquatic_icy"); /** - * Biomes that exist on the shoreline of a body of water. + * Biomes that are dedicated to spawning on the shoreline of a body of water. */ public static final TagKey IS_BEACH = register("is_beach"); /** @@ -120,7 +120,8 @@ private ConventionalBiomeTags() { */ public static final TagKey IS_AQUATIC = register("is_aquatic"); /** - * Barren biomes that lack vegetation. + * Biomes that lack any natural life or vegetation. + * (Example, land destroyed and sterilized by nuclear weapons) */ public static final TagKey IS_WASTELAND = register("is_wasteland"); /** @@ -132,8 +133,9 @@ private ConventionalBiomeTags() { */ public static final TagKey IS_FLORAL = register("is_floral"); /** - * For biomes where snow, and not ice, naturally spawns as a predominant feature. - * For biomes where ice is a predominant feature, see {@link ConventionalBiomeTags#IS_ICY}. + * For biomes that contains lots of naturally spawned snow. + * For biomes where lot of ice is present, see {@link ConventionalBiomeTags#IS_ICY}. + * Biome with lots of both snow and ice may be in both tags. */ public static final TagKey IS_SNOWY = register("is_snowy"); From b9c798081af8aca4cd9b8d77fe66f05f04104290 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 10 Apr 2024 21:07:28 -0400 Subject: [PATCH 108/123] adjust end island javadoc --- .../fabric/api/tag/convention/v2/ConventionalBiomeTags.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 dc769535fe..c5acfe81dc 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 @@ -142,7 +142,7 @@ private ConventionalBiomeTags() { public static final TagKey IS_BADLANDS = register("is_badlands"); public static final TagKey IS_CAVE = register("is_cave"); /** - * Biomes that spawn as or on islands in the End. + * Biomes that spawn as part of the large islands outside the center island in The End dimension. */ public static final TagKey IS_END_ISLAND = register("is_end_island"); public static final TagKey IS_NETHER_FOREST = register("is_nether_forest"); From 43cca0c7d26e0ff0592f00805ccdc5fbdd1ef851 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 10 Apr 2024 21:17:53 -0400 Subject: [PATCH 109/123] Add end biomes to end island tags --- .../tag/convention/datagen/generators/BiomeTagGenerator.java | 5 ++++- .../resources/data/c/tags/worldgen/biome/is_end_island.json | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) 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 d4e7a295bc..4efe112670 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 @@ -278,7 +278,10 @@ private void generateTerrainDescriptorTags() { .addOptionalTag(ConventionalBiomeTags.IS_RIVER); getOrCreateTagBuilder(ConventionalBiomeTags.IS_DEAD); getOrCreateTagBuilder(ConventionalBiomeTags.IS_WASTELAND); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_END_ISLAND); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_END_ISLAND) + .add(BiomeKeys.END_HIGHLANDS) + .add(BiomeKeys.END_MIDLANDS) + .add(BiomeKeys.END_BARRENS); getOrCreateTagBuilder(ConventionalBiomeTags.IS_NETHER_FOREST) .add(BiomeKeys.WARPED_FOREST) .add(BiomeKeys.CRIMSON_FOREST); diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_end_island.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_end_island.json index 9070de183a..2ea56b9459 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_end_island.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_end_island.json @@ -1,5 +1,8 @@ { "values": [ + "minecraft:end_highlands", + "minecraft:end_midlands", + "minecraft:end_barrens", { "id": "#c:end_islands", "required": false From a4e13e125571463e8c1a29ef31aba0f32e947142 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 10 Apr 2024 21:44:12 -0400 Subject: [PATCH 110/123] adjusted end island tag name and reorder ocean tags --- .../impl/tag/convention/ConventionLogWarnings.java | 2 +- .../datagen/generators/BiomeTagGenerator.java | 13 +++++++------ .../data/c/tags/worldgen/biome/is_deep_ocean.json | 8 ++++++-- ...{is_end_island.json => is_outer_end_island.json} | 0 .../c/tags/worldgen/biome/is_shallow_ocean.json | 4 ++-- .../tag/convention/v2/ConventionalBiomeTags.java | 2 +- 6 files changed, 17 insertions(+), 12 deletions(-) rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/{is_end_island.json => is_outer_end_island.json} (100%) diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 887fb3d975..051654da48 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -134,7 +134,7 @@ public enum LOG_WARNING_MODES { createMapEntry(ConventionalBiomeTags.TREE_SAVANNA, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_SAVANNA_TREE), createMapEntry(ConventionalBiomeTags.MOUNTAIN_PEAK, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_MOUNTAIN_PEAK), createMapEntry(ConventionalBiomeTags.MOUNTAIN_SLOPE, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_MOUNTAIN_SLOPE), - createMapEntry(ConventionalBiomeTags.END_ISLANDS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_END_ISLAND), + createMapEntry(ConventionalBiomeTags.END_ISLANDS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_OUTER_END_ISLAND), createMapEntry(ConventionalBiomeTags.NETHER_FORESTS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_NETHER_FOREST), createMapEntry(ConventionalBiomeTags.FLOWER_FORESTS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags.IS_FLOWER_FOREST), 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 4efe112670..4ef1cf5a5e 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 @@ -158,16 +158,17 @@ private void generateOtherBiomeTypes() { getOrCreateTagBuilder(ConventionalBiomeTags.IS_VOID) .add(BiomeKeys.THE_VOID); getOrCreateTagBuilder(ConventionalBiomeTags.IS_DEEP_OCEAN) - .add(BiomeKeys.DEEP_FROZEN_OCEAN) + .addOptionalTag(BiomeTags.IS_DEEP_OCEAN) + .add(BiomeKeys.DEEP_OCEAN) .add(BiomeKeys.DEEP_LUKEWARM_OCEAN) .add(BiomeKeys.DEEP_COLD_OCEAN) - .add(BiomeKeys.DEEP_OCEAN); + .add(BiomeKeys.DEEP_FROZEN_OCEAN); getOrCreateTagBuilder(ConventionalBiomeTags.IS_SHALLOW_OCEAN) .add(BiomeKeys.OCEAN) .add(BiomeKeys.LUKEWARM_OCEAN) - .add(BiomeKeys.FROZEN_OCEAN) + .add(BiomeKeys.WARM_OCEAN) .add(BiomeKeys.COLD_OCEAN) - .add(BiomeKeys.WARM_OCEAN); + .add(BiomeKeys.FROZEN_OCEAN); getOrCreateTagBuilder(ConventionalBiomeTags.NO_DEFAULT_MONSTERS) .add(BiomeKeys.MUSHROOM_FIELDS) .add(BiomeKeys.DEEP_DARK); @@ -278,7 +279,7 @@ private void generateTerrainDescriptorTags() { .addOptionalTag(ConventionalBiomeTags.IS_RIVER); getOrCreateTagBuilder(ConventionalBiomeTags.IS_DEAD); getOrCreateTagBuilder(ConventionalBiomeTags.IS_WASTELAND); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_END_ISLAND) + getOrCreateTagBuilder(ConventionalBiomeTags.IS_OUTER_END_ISLAND) .add(BiomeKeys.END_HIGHLANDS) .add(BiomeKeys.END_MIDLANDS) .add(BiomeKeys.END_BARRENS); @@ -312,7 +313,7 @@ private void generateBackwardsCompatTags() { getOrCreateTagBuilder(ConventionalBiomeTags.IS_SAVANNA_TREE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "tree_savanna")); getOrCreateTagBuilder(ConventionalBiomeTags.IS_MOUNTAIN_PEAK).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "mountain_peak")); getOrCreateTagBuilder(ConventionalBiomeTags.IS_MOUNTAIN_SLOPE).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "mountain_slope")); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_END_ISLAND).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "end_islands")); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_OUTER_END_ISLAND).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "end_islands")); getOrCreateTagBuilder(ConventionalBiomeTags.IS_NETHER_FOREST).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "nether_forests")); getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLOWER_FOREST).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "flower_forests")); } diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_deep_ocean.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_deep_ocean.json index d6e8167839..3b9c195a28 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_deep_ocean.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_deep_ocean.json @@ -1,8 +1,12 @@ { "values": [ - "minecraft:deep_frozen_ocean", + { + "id": "#minecraft:is_deep_ocean", + "required": false + }, + "minecraft:deep_ocean", "minecraft:deep_lukewarm_ocean", "minecraft:deep_cold_ocean", - "minecraft:deep_ocean" + "minecraft:deep_frozen_ocean" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_end_island.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_outer_end_island.json similarity index 100% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_end_island.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_outer_end_island.json diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_shallow_ocean.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_shallow_ocean.json index adc221c776..858efda8f1 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_shallow_ocean.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_shallow_ocean.json @@ -2,8 +2,8 @@ "values": [ "minecraft:ocean", "minecraft:lukewarm_ocean", - "minecraft:frozen_ocean", + "minecraft:warm_ocean", "minecraft:cold_ocean", - "minecraft:warm_ocean" + "minecraft:frozen_ocean" ] } \ No newline at end of file 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 c5acfe81dc..3e4073c861 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 @@ -144,7 +144,7 @@ private ConventionalBiomeTags() { /** * Biomes that spawn as part of the large islands outside the center island in The End dimension. */ - public static final TagKey IS_END_ISLAND = register("is_end_island"); + public static final TagKey IS_OUTER_END_ISLAND = register("is_outer_end_island"); public static final TagKey IS_NETHER_FOREST = register("is_nether_forest"); /** * For snowy plains-like biomes. From 4ad438987da086b9461d2167b056fb3119006d8b Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Fri, 12 Apr 2024 13:06:16 -0400 Subject: [PATCH 111/123] Added suggested changes --- .../tag/convention/ConventionLogWarnings.java | 6 +- .../convention/v2/ConventionalBiomeTags.java | 132 +++++++++--------- .../v2/ConventionalEntityTypeTags.java | 1 + .../fabric/api/tag/convention/v2/TagUtil.java | 4 +- 4 files changed, 75 insertions(+), 68 deletions(-) diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 051654da48..6f1bc6c347 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -43,14 +43,14 @@ import net.fabricmc.loader.api.FabricLoader; public class ConventionLogWarnings implements ModInitializer { - public static final String LOG_LEGACY_WARNING_MODE = System.getProperty("fabric-tag-conventions-v1.legacyTagWarning", LOG_WARNING_MODES.DEV_SHORT.name()); - public enum LOG_WARNING_MODES { + private static final String LOG_LEGACY_WARNING_MODE = System.getProperty("fabric-tag-conventions-v1.legacyTagWarning", LOG_WARNING_MODES.DEV_SHORT.name()); + private enum LOG_WARNING_MODES { SILENCED, DEV_SHORT, DEV_VERBOSE } - public static final Logger LOGGER = LoggerFactory.getLogger(ConventionLogWarnings.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ConventionLogWarnings.class); /** * Old `c` tags that we migrated to a new tag under a new convention. 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 3e4073c861..be1cb03dc4 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 @@ -31,60 +31,14 @@ public final class ConventionalBiomeTags { private ConventionalBiomeTags() { } + public static final TagKey IS_VOID = register("is_void"); + /** * Biomes that spawn in the Overworld. * (This is for people who want to tag their biomes as Overworld without getting * side effects from {@link net.minecraft.registry.tag.BiomeTags.IS_OVERWORLD}) */ public static final TagKey IS_OVERWORLD = register("is_overworld"); - /** - * Biomes that spawn in the End. - * (This is for people who want to tag their biomes as End without getting - * side effects from {@link net.minecraft.registry.tag.BiomeTags.IS_END}) - */ - public static final TagKey IS_END = register("is_end"); - /** - * Biomes that spawn in the Nether. - * (This is for people who want to tag their biomes as Nether without getting - * side effects from {@link net.minecraft.registry.tag.BiomeTags.IS_NETHER}) - */ - public static final TagKey IS_NETHER = register("is_nether"); - public static final TagKey IS_TAIGA = register("is_taiga"); - public static final TagKey IS_EXTREME_HILLS = register("is_extreme_hills"); - public static final TagKey IS_WINDSWEPT = register("is_windswept"); - public static final TagKey IS_JUNGLE = register("is_jungle"); - /** - * For temperate or warmer plains-like biomes. - * For snowy plains-like biomes, see {@link ConventionalBiomeTags#IS_SNOWY_PLAINS}. - */ - public static final TagKey IS_PLAINS = register("is_plains"); - public static final TagKey IS_SAVANNA = register("is_savanna"); - /** - * For land biomes where ice naturally spawns. - * For biomes where snow alone spawns, see {@link ConventionalBiomeTags#IS_SNOWY}. - */ - public static final TagKey IS_ICY = register("is_icy"); - /** - * For water biomes where ice naturally spawns. - * For biomes where snow alone spawns, see {@link ConventionalBiomeTags#IS_SNOWY}. - */ - public static final TagKey IS_AQUATIC_ICY = register("is_aquatic_icy"); - /** - * Biomes that are dedicated to spawning on the shoreline of a body of water. - */ - public static final TagKey IS_BEACH = register("is_beach"); - /** - * Biomes densely populated with deciduous trees. - */ - public static final TagKey IS_FOREST = register("is_forest"); - public static final TagKey IS_BIRCH_FOREST = register("is_birch_forest"); - public static final TagKey IS_OCEAN = register("is_ocean"); - public static final TagKey IS_DESERT = register("is_desert"); - public static final TagKey IS_RIVER = register("is_river"); - public static final TagKey IS_SWAMP = register("is_swamp"); - public static final TagKey IS_MUSHROOM = register("is_mushroom"); - public static final TagKey IS_UNDERGROUND = register("is_underground"); - public static final TagKey IS_MOUNTAIN = register("is_mountain"); public static final TagKey IS_HOT = register("is_hot"); public static final TagKey IS_HOT_OVERWORLD = register("is_hot/overworld"); @@ -112,13 +66,50 @@ private ConventionalBiomeTags() { public static final TagKey IS_JUNGLE_TREE = register("is_tree/jungle"); public static final TagKey IS_DECIDUOUS_TREE = register("is_tree/deciduous"); - public static final TagKey IS_VOID = register("is_void"); + public static final TagKey IS_MOUNTAIN = register("is_mountain"); public static final TagKey IS_MOUNTAIN_PEAK = register("is_mountain/peak"); public static final TagKey IS_MOUNTAIN_SLOPE = register("is_mountain/slope"); + /** - * Biomes consisting primarily of water. + * For temperate or warmer plains-like biomes. + * For snowy plains-like biomes, see {@link ConventionalBiomeTags#IS_SNOWY_PLAINS}. */ - public static final TagKey IS_AQUATIC = register("is_aquatic"); + public static final TagKey IS_PLAINS = register("is_plains"); + /** + * For snowy plains-like biomes. + * For warmer plains-like biomes, see {@link ConventionalBiomeTags#IS_PLAINS}. + */ + public static final TagKey IS_SNOWY_PLAINS = register("is_snowy_plains"); + /** + * Biomes densely populated with deciduous trees. + */ + public static final TagKey IS_FOREST = register("is_forest"); + public static final TagKey IS_BIRCH_FOREST = register("is_birch_forest"); + public static final TagKey IS_FLOWER_FOREST = register("is_flower_forest"); + public static final TagKey IS_TAIGA = register("is_taiga"); + public static final TagKey IS_OLD_GROWTH = register("is_old_growth"); + public static final TagKey IS_EXTREME_HILLS = register("is_extreme_hills"); + public static final TagKey IS_WINDSWEPT = register("is_windswept"); + public static final TagKey IS_JUNGLE = register("is_jungle"); + public static final TagKey IS_SAVANNA = register("is_savanna"); + public static final TagKey IS_SWAMP = register("is_swamp"); + public static final TagKey IS_DESERT = register("is_desert"); + public static final TagKey IS_BADLANDS = register("is_badlands"); + /** + * Biomes that are dedicated to spawning on the shoreline of a body of water. + */ + public static final TagKey IS_BEACH = register("is_beach"); + public static final TagKey IS_STONY_SHORES = register("is_stony_shores"); + public static final TagKey IS_MUSHROOM = register("is_mushroom"); + + public static final TagKey IS_RIVER = register("is_river"); + public static final TagKey IS_OCEAN = register("is_ocean"); + public static final TagKey IS_DEEP_OCEAN = register("is_deep_ocean"); + public static final TagKey IS_SHALLOW_OCEAN = register("is_shallow_ocean"); + + public static final TagKey IS_UNDERGROUND = register("is_underground"); + public static final TagKey IS_CAVE = register("is_cave"); + /** * Biomes that lack any natural life or vegetation. * (Example, land destroyed and sterilized by nuclear weapons) @@ -138,24 +129,39 @@ private ConventionalBiomeTags() { * Biome with lots of both snow and ice may be in both tags. */ public static final TagKey IS_SNOWY = register("is_snowy"); + /** + * For land biomes where ice naturally spawns. + * For biomes where snow alone spawns, see {@link ConventionalBiomeTags#IS_SNOWY}. + */ + public static final TagKey IS_ICY = register("is_icy"); + /** + * Biomes consisting primarily of water. + */ + public static final TagKey IS_AQUATIC = register("is_aquatic"); + /** + * For water biomes where ice naturally spawns. + * For biomes where snow alone spawns, see {@link ConventionalBiomeTags#IS_SNOWY}. + */ + public static final TagKey IS_AQUATIC_ICY = register("is_aquatic_icy"); - public static final TagKey IS_BADLANDS = register("is_badlands"); - public static final TagKey IS_CAVE = register("is_cave"); /** - * Biomes that spawn as part of the large islands outside the center island in The End dimension. + * Biomes that spawn in the Nether. + * (This is for people who want to tag their biomes as Nether without getting + * side effects from {@link net.minecraft.registry.tag.BiomeTags.IS_NETHER}) */ - public static final TagKey IS_OUTER_END_ISLAND = register("is_outer_end_island"); + public static final TagKey IS_NETHER = register("is_nether"); public static final TagKey IS_NETHER_FOREST = register("is_nether_forest"); + /** - * For snowy plains-like biomes. - * For warmer plains-like biomes, see {@link ConventionalBiomeTags#IS_PLAINS}. + * Biomes that spawn in the End. + * (This is for people who want to tag their biomes as End without getting + * side effects from {@link net.minecraft.registry.tag.BiomeTags.IS_END}) */ - public static final TagKey IS_SNOWY_PLAINS = register("is_snowy_plains"); - public static final TagKey IS_STONY_SHORES = register("is_stony_shores"); - public static final TagKey IS_FLOWER_FOREST = register("is_flower_forest"); - public static final TagKey IS_OLD_GROWTH = register("is_old_growth"); - public static final TagKey IS_DEEP_OCEAN = register("is_deep_ocean"); - public static final TagKey IS_SHALLOW_OCEAN = register("is_shallow_ocean"); + public static final TagKey IS_END = register("is_end"); + /** + * Biomes that spawn as part of the large islands outside the center island in The End dimension. + */ + public static final TagKey IS_OUTER_END_ISLAND = register("is_outer_end_island"); /** * For biomes that should not spawn monsters over time the normal way. diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java index 91d173c605..f73cce5299 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java @@ -33,6 +33,7 @@ private ConventionalEntityTypeTags() { * Tag containing entity types that display a boss health bar. */ public static final TagKey> BOSSES = register("bosses"); + public static final TagKey> MINECARTS = register("minecarts"); public static final TagKey> BOATS = register("boats"); diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/TagUtil.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/TagUtil.java index 36952f37ea..98289d65e4 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/TagUtil.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/TagUtil.java @@ -35,8 +35,8 @@ * For non-dynamic registry entries, the simpler {@link #isIn(TagKey, Object)} can be used. */ public final class TagUtil { - public static String C_TAG_NAMESPACE = "c"; - public static String FABRIC_TAG_NAMESPACE = "fabric"; + public static final String C_TAG_NAMESPACE = "c"; + public static final String FABRIC_TAG_NAMESPACE = "fabric"; private TagUtil() { } From d68060681c4cadb193006f3186be50174d7a9c73 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Fri, 12 Apr 2024 13:07:24 -0400 Subject: [PATCH 112/123] Moved no default monster to top --- .../tag/convention/v2/ConventionalBiomeTags.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 be1cb03dc4..5097b3080e 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 @@ -30,6 +30,13 @@ public final class ConventionalBiomeTags { private ConventionalBiomeTags() { } + + /** + * For biomes that should not spawn monsters over time the normal way. + * In other words, their Spawners and Spawn Cost entries have the monster category empty. + * Example: Mushroom Biomes not having Zombies, Creepers, Skeleton, nor any other normal monsters. + */ + public static final TagKey NO_DEFAULT_MONSTERS = register("no_default_monsters"); public static final TagKey IS_VOID = register("is_void"); @@ -163,13 +170,6 @@ private ConventionalBiomeTags() { */ public static final TagKey IS_OUTER_END_ISLAND = register("is_outer_end_island"); - /** - * For biomes that should not spawn monsters over time the normal way. - * In other words, their Spawners and Spawn Cost entries have the monster category empty. - * Example: Mushroom Biomes not having Zombies, Creepers, Skeleton, nor any other normal monsters. - */ - public static final TagKey NO_DEFAULT_MONSTERS = register("no_default_monsters"); - private static TagKey register(String tagId) { return TagRegistration.BIOME_TAG.registerC(tagId); } From e337074469394cc625037cfe6e45665660a478b5 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Fri, 12 Apr 2024 13:15:13 -0400 Subject: [PATCH 113/123] spotless apply --- .../fabric/api/tag/convention/v2/ConventionalBiomeTags.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5097b3080e..acaeea3e92 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 @@ -30,7 +30,7 @@ public final class ConventionalBiomeTags { private ConventionalBiomeTags() { } - + /** * For biomes that should not spawn monsters over time the normal way. * In other words, their Spawners and Spawn Cost entries have the monster category empty. From 255e8be7d693cfc360fc42d750f28214ef75fda1 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Fri, 12 Apr 2024 13:18:43 -0400 Subject: [PATCH 114/123] Added clarification to overworld tag doc for strongholds --- .../fabric/api/tag/convention/v2/ConventionalBiomeTags.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 acaeea3e92..2adb128f8a 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 @@ -43,7 +43,11 @@ private ConventionalBiomeTags() { /** * Biomes that spawn in the Overworld. * (This is for people who want to tag their biomes as Overworld without getting - * side effects from {@link net.minecraft.registry.tag.BiomeTags.IS_OVERWORLD}) + * side effects from {@link net.minecraft.registry.tag.BiomeTags.IS_OVERWORLD}. + *

+ * NOTE: If you do not add to the vanilla Overworld tag, be sure to add to + * {@link net.minecraft.registry.tag.BiomeTags.STRONGHOLD_HAS_STRUCTURE} so + * some Strongholds do not go missing.) */ public static final TagKey IS_OVERWORLD = register("is_overworld"); From 27cd11f3fa27e6139fb76ca84a1c8da034bbf1af Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Fri, 12 Apr 2024 13:31:07 -0400 Subject: [PATCH 115/123] Fixed p tag in javadoc --- .../fabric/api/tag/convention/v2/ConventionalBiomeTags.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2adb128f8a..c6618c4832 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 @@ -44,7 +44,7 @@ private ConventionalBiomeTags() { * Biomes that spawn in the Overworld. * (This is for people who want to tag their biomes as Overworld without getting * side effects from {@link net.minecraft.registry.tag.BiomeTags.IS_OVERWORLD}. - *

+ *

* NOTE: If you do not add to the vanilla Overworld tag, be sure to add to * {@link net.minecraft.registry.tag.BiomeTags.STRONGHOLD_HAS_STRUCTURE} so * some Strongholds do not go missing.) From 90a9176c586e1b0c6750530d0d40fc7f3b06efd0 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Fri, 12 Apr 2024 13:35:38 -0400 Subject: [PATCH 116/123] added info for block recipe viewer hiding tag --- .../fabric/api/tag/convention/v2/ConventionalBlockTags.java | 1 + 1 file changed, 1 insertion(+) 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 0620794b34..6813e657ba 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 @@ -147,6 +147,7 @@ private ConventionalBlockTags() { /** * Tag that holds all blocks that recipe viewers should not show to users. + * Recipe viewers may use this to automatically find the corresponding BlockItem to hide. */ public static final TagKey HIDDEN_FROM_RECIPE_VIEWERS = register("hidden_from_recipe_viewers"); From e683e86e36c1f9af64db18938a2674340df221aa Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Fri, 12 Apr 2024 15:25:10 -0400 Subject: [PATCH 117/123] added structure tags for hiding structures --- .../convention/datagen/DatagenEntrypoint.java | 2 + .../generators/StructureTagGenerator.java | 39 ++++++++++++++++ .../structure/hidden_from_displayers.json | 3 ++ .../hidden_from_locator_selection.json | 3 ++ .../v2/ConventionalStructureTags.java | 46 +++++++++++++++++++ .../tag/convention/v2/TagRegistration.java | 2 + 6 files changed, 95 insertions(+) create mode 100644 fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/StructureTagGenerator.java create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/structure/hidden_from_displayers.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/structure/hidden_from_locator_selection.json create mode 100644 fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalStructureTags.java diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java index ef208e8cf0..6dbd91e7dd 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java @@ -24,6 +24,7 @@ import net.fabricmc.fabric.impl.tag.convention.datagen.generators.EntityTypeTagGenerator; import net.fabricmc.fabric.impl.tag.convention.datagen.generators.FluidTagGenerator; import net.fabricmc.fabric.impl.tag.convention.datagen.generators.ItemTagGenerator; +import net.fabricmc.fabric.impl.tag.convention.datagen.generators.StructureTagGenerator; public class DatagenEntrypoint implements DataGeneratorEntrypoint { @Override @@ -35,6 +36,7 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { pack.addProvider(FluidTagGenerator::new); pack.addProvider(EnchantmentTagGenerator::new); pack.addProvider(BiomeTagGenerator::new); + pack.addProvider(StructureTagGenerator::new); pack.addProvider(EntityTypeTagGenerator::new); } } diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/StructureTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/StructureTagGenerator.java new file mode 100644 index 0000000000..487bec19fc --- /dev/null +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/StructureTagGenerator.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.impl.tag.convention.datagen.generators; + +import java.util.concurrent.CompletableFuture; + +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.world.gen.structure.Structure; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalStructureTags; + +public final class StructureTagGenerator extends FabricTagProvider { + public StructureTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { + super(output, RegistryKeys.STRUCTURE, completableFuture); + } + + @Override + protected void configure(RegistryWrapper.WrapperLookup arg) { + getOrCreateTagBuilder(ConventionalStructureTags.HIDDEN_FROM_DISPLAYERS); + getOrCreateTagBuilder(ConventionalStructureTags.HIDDEN_FROM_LOCATOR_SELECTION); + } +} diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/structure/hidden_from_displayers.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/structure/hidden_from_displayers.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/structure/hidden_from_displayers.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/structure/hidden_from_locator_selection.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/structure/hidden_from_locator_selection.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/structure/hidden_from_locator_selection.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalStructureTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalStructureTags.java new file mode 100644 index 0000000000..6439666350 --- /dev/null +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalStructureTags.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.api.tag.convention.v2; + +import net.minecraft.registry.tag.TagKey; +import net.minecraft.world.gen.structure.Structure; + +import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; + +/** + * See {@link net.minecraft.registry.tag.StructureTags} for vanilla tags. + */ +public final class ConventionalStructureTags { + private ConventionalStructureTags() { + } + + /** + * Structures that should not show up on minimaps or world map views from mods/sites. + * No effect on vanilla map items. + */ + public static final TagKey HIDDEN_FROM_DISPLAYERS = register("hidden_from_displayers"); + + /** + * Structures that should not be locatable/selectable by modded structure-locating items or abilities. + * No effect on vanilla map items. + */ + public static final TagKey HIDDEN_FROM_LOCATOR_SELECTION = register("hidden_from_locator_selection"); + + private static TagKey register(String tagId) { + return TagRegistration.STRUCTURE_TAG.registerC(tagId); + } +} diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java index d611e3b029..7cd1ad7896 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java @@ -27,6 +27,7 @@ import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; import net.minecraft.world.biome.Biome; +import net.minecraft.world.gen.structure.Structure; import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; @@ -34,6 +35,7 @@ public record TagRegistration(RegistryKey> registryKey) { public static final TagRegistration ITEM_TAG = new TagRegistration<>(RegistryKeys.ITEM); public static final TagRegistration BLOCK_TAG = new TagRegistration<>(RegistryKeys.BLOCK); public static final TagRegistration BIOME_TAG = new TagRegistration<>(RegistryKeys.BIOME); + public static final TagRegistration STRUCTURE_TAG = new TagRegistration<>(RegistryKeys.STRUCTURE); public static final TagRegistration FLUID_TAG = new TagRegistration<>(RegistryKeys.FLUID); public static final TagRegistration> ENTITY_TYPE_TAG = new TagRegistration<>(RegistryKeys.ENTITY_TYPE); public static final TagRegistration ENCHANTMENT_TAG = new TagRegistration<>(RegistryKeys.ENCHANTMENT); From b44b5fa18e802113902a68048fc652c3fa7be989 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Fri, 12 Apr 2024 15:49:44 -0400 Subject: [PATCH 118/123] Added hidden tag for biomes --- .../convention/datagen/generators/BiomeTagGenerator.java | 1 + .../tags/worldgen/biome/hidden_from_locator_selection.json | 3 +++ .../fabric/api/tag/convention/v2/ConventionalBiomeTags.java | 6 ++++++ 3 files changed, 10 insertions(+) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/hidden_from_locator_selection.json 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 4ef1cf5a5e..24751e4f40 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 @@ -172,6 +172,7 @@ private void generateOtherBiomeTypes() { getOrCreateTagBuilder(ConventionalBiomeTags.NO_DEFAULT_MONSTERS) .add(BiomeKeys.MUSHROOM_FIELDS) .add(BiomeKeys.DEEP_DARK); + getOrCreateTagBuilder(ConventionalBiomeTags.HIDDEN_FROM_LOCATOR_SELECTION); // Create tag file for visibility } private void generateClimateAndVegetationTags() { diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/hidden_from_locator_selection.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/hidden_from_locator_selection.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/hidden_from_locator_selection.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file 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 c6618c4832..b39ea9d728 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 @@ -20,6 +20,7 @@ import net.minecraft.world.biome.Biome; import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; +import net.minecraft.world.gen.structure.Structure; /** * See {@link net.minecraft.registry.tag.BiomeTags} for vanilla tags. @@ -37,6 +38,11 @@ private ConventionalBiomeTags() { * Example: Mushroom Biomes not having Zombies, Creepers, Skeleton, nor any other normal monsters. */ public static final TagKey NO_DEFAULT_MONSTERS = register("no_default_monsters"); + /** + * Biomes that should not be locatable/selectable by modded biome-locating items or abilities. + */ + public static final TagKey HIDDEN_FROM_LOCATOR_SELECTION = register("hidden_from_locator_selection"); + public static final TagKey IS_VOID = register("is_void"); From d5976db9dddb07bc4055e8605fcceb51c2a63ce8 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Fri, 12 Apr 2024 15:56:16 -0400 Subject: [PATCH 119/123] Oh my gosh, MORE SPOTLESS --- .../fabric/api/tag/convention/v2/ConventionalBiomeTags.java | 1 - 1 file changed, 1 deletion(-) 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 b39ea9d728..8a24baed38 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 @@ -20,7 +20,6 @@ import net.minecraft.world.biome.Biome; import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; -import net.minecraft.world.gen.structure.Structure; /** * See {@link net.minecraft.registry.tag.BiomeTags} for vanilla tags. From 9f9f0466e1c68498806d8407e95ce937ffd8ea6f Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Fri, 12 Apr 2024 16:10:42 -0400 Subject: [PATCH 120/123] sacrificed a goat to the linter --- .../fabric/api/tag/convention/v2/ConventionalBiomeTags.java | 1 - 1 file changed, 1 deletion(-) 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 8a24baed38..09311e48d9 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 @@ -42,7 +42,6 @@ private ConventionalBiomeTags() { */ public static final TagKey HIDDEN_FROM_LOCATOR_SELECTION = register("hidden_from_locator_selection"); - public static final TagKey IS_VOID = register("is_void"); /** From 028a8286bc1986527a8674ea08d770d1c5055e5f Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 14 Apr 2024 10:56:30 -0400 Subject: [PATCH 121/123] cleaned up redundant entries in biome tags --- .../datagen/generators/BiomeTagGenerator.java | 63 ++++--------------- .../data/c/tags/worldgen/biome/is_beach.json | 3 +- .../c/tags/worldgen/biome/is_deep_ocean.json | 6 +- .../data/c/tags/worldgen/biome/is_end.json | 5 -- .../tags/worldgen/biome/is_extreme_hills.json | 6 -- .../data/c/tags/worldgen/biome/is_hill.json | 8 +++ .../c/tags/worldgen/biome/is_mountain.json | 8 +++ .../data/c/tags/worldgen/biome/is_nether.json | 5 -- .../data/c/tags/worldgen/biome/is_ocean.json | 6 +- .../c/tags/worldgen/biome/is_overworld.json | 53 ---------------- .../c/tags/worldgen/biome/is_savanna.json | 5 +- .../convention/v2/ConventionalBiomeTags.java | 5 +- 12 files changed, 39 insertions(+), 134 deletions(-) delete mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_extreme_hills.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hill.json 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 24751e4f40..1ce01f8c9d 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 @@ -47,49 +47,18 @@ protected void configure(RegistryWrapper.WrapperLookup arg) { private void generateDimensionTags() { getOrCreateTagBuilder(ConventionalBiomeTags.IS_NETHER) - .addOptionalTag(BiomeTags.IS_NETHER) - .add(BiomeKeys.CRIMSON_FOREST) - .add(BiomeKeys.WARPED_FOREST) - .add(BiomeKeys.NETHER_WASTES) - .add(BiomeKeys.SOUL_SAND_VALLEY) - .add(BiomeKeys.BASALT_DELTAS); + .addOptionalTag(BiomeTags.IS_NETHER); getOrCreateTagBuilder(ConventionalBiomeTags.IS_END) - .addOptionalTag(BiomeTags.IS_END) - .add(BiomeKeys.END_BARRENS) - .add(BiomeKeys.END_MIDLANDS) - .add(BiomeKeys.END_HIGHLANDS) - .add(BiomeKeys.THE_END) - .add(BiomeKeys.SMALL_END_ISLANDS); + .addOptionalTag(BiomeTags.IS_END); getOrCreateTagBuilder(ConventionalBiomeTags.IS_OVERWORLD) - .addOptionalTag(BiomeTags.IS_OVERWORLD) - .add(BiomeKeys.RIVER, BiomeKeys.FROZEN_RIVER) - .add(BiomeKeys.COLD_OCEAN, BiomeKeys.DEEP_COLD_OCEAN) - .add(BiomeKeys.DEEP_FROZEN_OCEAN, BiomeKeys.DEEP_OCEAN) - .add(BiomeKeys.DEEP_LUKEWARM_OCEAN, BiomeKeys.WARM_OCEAN, BiomeKeys.LUKEWARM_OCEAN) - .add(BiomeKeys.FROZEN_OCEAN, BiomeKeys.OCEAN) - .add(BiomeKeys.BEACH, BiomeKeys.SNOWY_BEACH, BiomeKeys.STONY_SHORE) - .add(BiomeKeys.PLAINS, BiomeKeys.SUNFLOWER_PLAINS, BiomeKeys.SNOWY_PLAINS) - .add(BiomeKeys.ICE_SPIKES, BiomeKeys.DESERT) - .add(BiomeKeys.FOREST, BiomeKeys.FLOWER_FOREST, BiomeKeys.BIRCH_FOREST, BiomeKeys.DARK_FOREST) - .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST, BiomeKeys.OLD_GROWTH_PINE_TAIGA, BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA) - .add(BiomeKeys.TAIGA, BiomeKeys.SNOWY_TAIGA) - .add(BiomeKeys.SWAMP, BiomeKeys.MANGROVE_SWAMP) - .add(BiomeKeys.SAVANNA, BiomeKeys.SAVANNA_PLATEAU) - .add(BiomeKeys.WINDSWEPT_HILLS, BiomeKeys.WINDSWEPT_GRAVELLY_HILLS, BiomeKeys.WINDSWEPT_FOREST, BiomeKeys.WINDSWEPT_SAVANNA) - .add(BiomeKeys.JUNGLE, BiomeKeys.SPARSE_JUNGLE, BiomeKeys.BAMBOO_JUNGLE) - .add(BiomeKeys.BADLANDS, BiomeKeys.ERODED_BADLANDS, BiomeKeys.WOODED_BADLANDS) - .add(BiomeKeys.MEADOW, BiomeKeys.GROVE, BiomeKeys.CHERRY_GROVE, BiomeKeys.SNOWY_SLOPES) - .add(BiomeKeys.FROZEN_PEAKS, BiomeKeys.JAGGED_PEAKS, BiomeKeys.STONY_PEAKS) - .add(BiomeKeys.MUSHROOM_FIELDS) - .add(BiomeKeys.DRIPSTONE_CAVES, BiomeKeys.LUSH_CAVES, BiomeKeys.DEEP_DARK); + .addOptionalTag(BiomeTags.IS_OVERWORLD); } private void generateCategoryTags() { getOrCreateTagBuilder(ConventionalBiomeTags.IS_TAIGA) .addOptionalTag(BiomeTags.IS_TAIGA); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_EXTREME_HILLS) - .add(BiomeKeys.WINDSWEPT_GRAVELLY_HILLS) - .add(BiomeKeys.WINDSWEPT_HILLS); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_HILL) + .addOptionalTag(BiomeTags.IS_HILL); getOrCreateTagBuilder(ConventionalBiomeTags.IS_WINDSWEPT) .add(BiomeKeys.WINDSWEPT_HILLS) .add(BiomeKeys.WINDSWEPT_GRAVELLY_HILLS) @@ -101,10 +70,7 @@ private void generateCategoryTags() { .add(BiomeKeys.SUNFLOWER_PLAINS) .add(BiomeKeys.PLAINS); getOrCreateTagBuilder(ConventionalBiomeTags.IS_SAVANNA) - .addOptionalTag(BiomeTags.IS_SAVANNA) - .add(BiomeKeys.SAVANNA_PLATEAU) - .add(BiomeKeys.WINDSWEPT_SAVANNA) - .add(BiomeKeys.SAVANNA); + .addOptionalTag(BiomeTags.IS_SAVANNA); getOrCreateTagBuilder(ConventionalBiomeTags.IS_ICY) .add(BiomeKeys.FROZEN_PEAKS) .add(BiomeKeys.ICE_SPIKES); @@ -122,17 +88,16 @@ private void generateCategoryTags() { .add(BiomeKeys.JAGGED_PEAKS) .add(BiomeKeys.FROZEN_PEAKS); getOrCreateTagBuilder(ConventionalBiomeTags.IS_BEACH) - .addOptionalTag(BiomeTags.IS_BEACH) - .add(BiomeKeys.STONY_SHORE); + .addOptionalTag(BiomeTags.IS_BEACH); getOrCreateTagBuilder(ConventionalBiomeTags.IS_FOREST) .addOptionalTag(BiomeTags.IS_FOREST); getOrCreateTagBuilder(ConventionalBiomeTags.IS_BIRCH_FOREST) .add(BiomeKeys.BIRCH_FOREST) .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST); getOrCreateTagBuilder(ConventionalBiomeTags.IS_OCEAN) + .addOptionalTag(BiomeTags.IS_OCEAN) .addOptionalTag(ConventionalBiomeTags.IS_DEEP_OCEAN) - .addOptionalTag(ConventionalBiomeTags.IS_SHALLOW_OCEAN) - .addOptionalTag(BiomeTags.IS_OCEAN); + .addOptionalTag(ConventionalBiomeTags.IS_SHALLOW_OCEAN); getOrCreateTagBuilder(ConventionalBiomeTags.IS_DESERT) .add(BiomeKeys.DESERT); getOrCreateTagBuilder(ConventionalBiomeTags.IS_RIVER) @@ -145,7 +110,9 @@ private void generateCategoryTags() { getOrCreateTagBuilder(ConventionalBiomeTags.IS_UNDERGROUND) .addOptionalTag(ConventionalBiomeTags.IS_CAVE); getOrCreateTagBuilder(ConventionalBiomeTags.IS_MOUNTAIN) - .addOptionalTag(BiomeTags.IS_MOUNTAIN); + .addOptionalTag(BiomeTags.IS_MOUNTAIN) + .addOptionalTag(ConventionalBiomeTags.IS_MOUNTAIN_PEAK) + .addOptionalTag(ConventionalBiomeTags.IS_MOUNTAIN_SLOPE); } private void generateOtherBiomeTypes() { @@ -158,11 +125,7 @@ private void generateOtherBiomeTypes() { getOrCreateTagBuilder(ConventionalBiomeTags.IS_VOID) .add(BiomeKeys.THE_VOID); getOrCreateTagBuilder(ConventionalBiomeTags.IS_DEEP_OCEAN) - .addOptionalTag(BiomeTags.IS_DEEP_OCEAN) - .add(BiomeKeys.DEEP_OCEAN) - .add(BiomeKeys.DEEP_LUKEWARM_OCEAN) - .add(BiomeKeys.DEEP_COLD_OCEAN) - .add(BiomeKeys.DEEP_FROZEN_OCEAN); + .addOptionalTag(BiomeTags.IS_DEEP_OCEAN); getOrCreateTagBuilder(ConventionalBiomeTags.IS_SHALLOW_OCEAN) .add(BiomeKeys.OCEAN) .add(BiomeKeys.LUKEWARM_OCEAN) diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_beach.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_beach.json index fd2cd72851..5ee39058eb 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_beach.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_beach.json @@ -3,7 +3,6 @@ { "id": "#minecraft:is_beach", "required": false - }, - "minecraft:stony_shore" + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_deep_ocean.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_deep_ocean.json index 3b9c195a28..e0df3c6e6d 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_deep_ocean.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_deep_ocean.json @@ -3,10 +3,6 @@ { "id": "#minecraft:is_deep_ocean", "required": false - }, - "minecraft:deep_ocean", - "minecraft:deep_lukewarm_ocean", - "minecraft:deep_cold_ocean", - "minecraft:deep_frozen_ocean" + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_end.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_end.json index 443d5d4763..75a22e21fd 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_end.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_end.json @@ -4,11 +4,6 @@ "id": "#minecraft:is_end", "required": false }, - "minecraft:end_barrens", - "minecraft:end_midlands", - "minecraft:end_highlands", - "minecraft:the_end", - "minecraft:small_end_islands", { "id": "#c:in_the_end", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_extreme_hills.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_extreme_hills.json deleted file mode 100644 index 50ce8f7488..0000000000 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_extreme_hills.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "minecraft:windswept_gravelly_hills", - "minecraft:windswept_hills" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hill.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hill.json new file mode 100644 index 0000000000..4cc9ec6fd1 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hill.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#minecraft:is_hill", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain.json index 93d3e9e342..34425310ad 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain.json @@ -3,6 +3,14 @@ { "id": "#minecraft:is_mountain", "required": false + }, + { + "id": "#c:is_mountain/peak", + "required": false + }, + { + "id": "#c:is_mountain/slope", + "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_nether.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_nether.json index be6d4920df..79f7a494a5 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_nether.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_nether.json @@ -4,11 +4,6 @@ "id": "#minecraft:is_nether", "required": false }, - "minecraft:crimson_forest", - "minecraft:warped_forest", - "minecraft:nether_wastes", - "minecraft:soul_sand_valley", - "minecraft:basalt_deltas", { "id": "#c:in_nether", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_ocean.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_ocean.json index ba46b879ff..641e9f7bb6 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_ocean.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_ocean.json @@ -1,15 +1,15 @@ { "values": [ { - "id": "#c:is_deep_ocean", + "id": "#minecraft:is_ocean", "required": false }, { - "id": "#c:is_shallow_ocean", + "id": "#c:is_deep_ocean", "required": false }, { - "id": "#minecraft:is_ocean", + "id": "#c:is_shallow_ocean", "required": false } ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_overworld.json index 927edef409..e0903f76a8 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_overworld.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_overworld.json @@ -4,59 +4,6 @@ "id": "#minecraft:is_overworld", "required": false }, - "minecraft:river", - "minecraft:frozen_river", - "minecraft:cold_ocean", - "minecraft:deep_cold_ocean", - "minecraft:deep_frozen_ocean", - "minecraft:deep_ocean", - "minecraft:deep_lukewarm_ocean", - "minecraft:warm_ocean", - "minecraft:lukewarm_ocean", - "minecraft:frozen_ocean", - "minecraft:ocean", - "minecraft:beach", - "minecraft:snowy_beach", - "minecraft:stony_shore", - "minecraft:plains", - "minecraft:sunflower_plains", - "minecraft:snowy_plains", - "minecraft:ice_spikes", - "minecraft:desert", - "minecraft:forest", - "minecraft:flower_forest", - "minecraft:birch_forest", - "minecraft:dark_forest", - "minecraft:old_growth_birch_forest", - "minecraft:old_growth_pine_taiga", - "minecraft:old_growth_spruce_taiga", - "minecraft:taiga", - "minecraft:snowy_taiga", - "minecraft:swamp", - "minecraft:mangrove_swamp", - "minecraft:savanna", - "minecraft:savanna_plateau", - "minecraft:windswept_hills", - "minecraft:windswept_gravelly_hills", - "minecraft:windswept_forest", - "minecraft:windswept_savanna", - "minecraft:jungle", - "minecraft:sparse_jungle", - "minecraft:bamboo_jungle", - "minecraft:badlands", - "minecraft:eroded_badlands", - "minecraft:wooded_badlands", - "minecraft:meadow", - "minecraft:grove", - "minecraft:cherry_grove", - "minecraft:snowy_slopes", - "minecraft:frozen_peaks", - "minecraft:jagged_peaks", - "minecraft:stony_peaks", - "minecraft:mushroom_fields", - "minecraft:dripstone_caves", - "minecraft:lush_caves", - "minecraft:deep_dark", { "id": "#c:in_the_overworld", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_savanna.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_savanna.json index c5b3d64aad..c02ae956e5 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_savanna.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_savanna.json @@ -3,9 +3,6 @@ { "id": "#minecraft:is_savanna", "required": false - }, - "minecraft:savanna_plateau", - "minecraft:windswept_savanna", - "minecraft:savanna" + } ] } \ No newline at end of file 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 09311e48d9..276faad0ea 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 @@ -103,7 +103,10 @@ private ConventionalBiomeTags() { public static final TagKey IS_FLOWER_FOREST = register("is_flower_forest"); public static final TagKey IS_TAIGA = register("is_taiga"); public static final TagKey IS_OLD_GROWTH = register("is_old_growth"); - public static final TagKey IS_EXTREME_HILLS = register("is_extreme_hills"); + /** + * Biomes that spawn as a hills biome. (Previously was called Extreme Hills biome in past) + */ + public static final TagKey IS_HILL = register("is_hill"); public static final TagKey IS_WINDSWEPT = register("is_windswept"); public static final TagKey IS_JUNGLE = register("is_jungle"); public static final TagKey IS_SAVANNA = register("is_savanna"); From 3d49be61e5ef394ad4cb1ace3c99e280e2b5de2c Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 14 Apr 2024 11:55:40 -0400 Subject: [PATCH 122/123] fixed biome tag inconsistencies and match neo a bit better --- .../datagen/generators/BiomeTagGenerator.java | 122 +++++++++++++----- .../c/tags/worldgen/biome/is_cold/end.json | 9 ++ .../worldgen/biome/is_cold/overworld.json | 19 +-- .../biome/is_dense_vegetation/overworld.json | 7 +- .../data/c/tags/worldgen/biome/is_dry.json | 4 +- .../c/tags/worldgen/biome/is_dry/end.json | 9 ++ .../c/tags/worldgen/biome/is_dry/nether.json | 9 ++ .../tags/worldgen/biome/is_dry/overworld.json | 23 +--- .../data/c/tags/worldgen/biome/is_hot.json | 3 +- .../c/tags/worldgen/biome/is_hot/nether.json | 9 ++ .../tags/worldgen/biome/is_hot/overworld.json | 35 ++--- .../worldgen/biome/is_mountain/slope.json | 3 + .../data/c/tags/worldgen/biome/is_plains.json | 4 +- .../biome/is_sparse_vegetation/overworld.json | 27 ++-- .../worldgen/biome/is_tree/coniferous.json | 2 +- .../tags/worldgen/biome/is_wet/overworld.json | 19 +-- .../convention/v2/ConventionalBiomeTags.java | 4 + 17 files changed, 193 insertions(+), 115 deletions(-) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold/end.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/end.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/nether.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/nether.json 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 1ce01f8c9d..8b4a684362 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 @@ -67,8 +67,8 @@ private void generateCategoryTags() { getOrCreateTagBuilder(ConventionalBiomeTags.IS_JUNGLE) .addOptionalTag(BiomeTags.IS_JUNGLE); getOrCreateTagBuilder(ConventionalBiomeTags.IS_PLAINS) - .add(BiomeKeys.SUNFLOWER_PLAINS) - .add(BiomeKeys.PLAINS); + .add(BiomeKeys.PLAINS) + .add(BiomeKeys.SUNFLOWER_PLAINS); getOrCreateTagBuilder(ConventionalBiomeTags.IS_SAVANNA) .addOptionalTag(BiomeTags.IS_SAVANNA); getOrCreateTagBuilder(ConventionalBiomeTags.IS_ICY) @@ -140,13 +140,27 @@ private void generateOtherBiomeTypes() { private void generateClimateAndVegetationTags() { getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD_OVERWORLD) + .add(BiomeKeys.TAIGA) + .add(BiomeKeys.OLD_GROWTH_PINE_TAIGA) .add(BiomeKeys.SNOWY_PLAINS) - .add(BiomeKeys.SNOWY_SLOPES) + .add(BiomeKeys.ICE_SPIKES) .add(BiomeKeys.GROVE) + .add(BiomeKeys.SNOWY_SLOPES) .add(BiomeKeys.JAGGED_PEAKS) - .add(BiomeKeys.TAIGA, BiomeKeys.SNOWY_TAIGA) - .add(BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA, BiomeKeys.OLD_GROWTH_PINE_TAIGA) - .addOptionalTag(ConventionalBiomeTags.IS_ICY); + .add(BiomeKeys.FROZEN_PEAKS) + .add(BiomeKeys.SNOWY_BEACH) + .add(BiomeKeys.SNOWY_TAIGA) + .add(BiomeKeys.FROZEN_RIVER) + .add(BiomeKeys.COLD_OCEAN) + .add(BiomeKeys.FROZEN_OCEAN) + .add(BiomeKeys.DEEP_COLD_OCEAN) + .add(BiomeKeys.DEEP_FROZEN_OCEAN); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD_END) + .add(BiomeKeys.THE_END) + .add(BiomeKeys.SMALL_END_ISLANDS) + .add(BiomeKeys.END_MIDLANDS) + .add(BiomeKeys.END_HIGHLANDS) + .add(BiomeKeys.END_BARRENS); getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD) .addTag(ConventionalBiomeTags.IS_COLD_OVERWORLD); @@ -165,47 +179,91 @@ private void generateClimateAndVegetationTags() { .addTag(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD); getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT_OVERWORLD) - .addOptionalTag(ConventionalBiomeTags.IS_JUNGLE) - .addOptionalTag(ConventionalBiomeTags.IS_SAVANNA) - .addOptionalTag(ConventionalBiomeTags.IS_DESERT) - .addOptionalTag(ConventionalBiomeTags.IS_BADLANDS) + .add(BiomeKeys.SWAMP) + .add(BiomeKeys.MANGROVE_SWAMP) + .add(BiomeKeys.JUNGLE) + .add(BiomeKeys.BAMBOO_JUNGLE) + .add(BiomeKeys.SPARSE_JUNGLE) + .add(BiomeKeys.DESERT) + .add(BiomeKeys.ERODED_BADLANDS) + .add(BiomeKeys.SAVANNA) + .add(BiomeKeys.SAVANNA_PLATEAU) + .add(BiomeKeys.WINDSWEPT_SAVANNA) .add(BiomeKeys.STONY_PEAKS) - .addOptionalTag(ConventionalBiomeTags.IS_MUSHROOM) - .addOptionalTag(ConventionalBiomeTags.IS_NETHER); + .add(BiomeKeys.WARM_OCEAN); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT_NETHER) + .add(BiomeKeys.NETHER_WASTES) + .add(BiomeKeys.CRIMSON_FOREST) + .add(BiomeKeys.WARPED_FOREST) + .add(BiomeKeys.SOUL_SAND_VALLEY) + .add(BiomeKeys.BASALT_DELTAS); getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT) - .addTag(ConventionalBiomeTags.IS_HOT_OVERWORLD); + .addTag(ConventionalBiomeTags.IS_HOT_OVERWORLD) + .addTag(ConventionalBiomeTags.IS_HOT_NETHER); getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET_OVERWORLD) - .addOptionalTag(ConventionalBiomeTags.IS_AQUATIC) - .addOptionalTag(ConventionalBiomeTags.IS_SWAMP) + .add(BiomeKeys.SWAMP) + .add(BiomeKeys.MANGROVE_SWAMP) + .add(BiomeKeys.JUNGLE) + .add(BiomeKeys.BAMBOO_JUNGLE) + .add(BiomeKeys.SPARSE_JUNGLE) + .add(BiomeKeys.BEACH) .add(BiomeKeys.LUSH_CAVES) - .addOptionalTag(ConventionalBiomeTags.IS_JUNGLE); + .add(BiomeKeys.DRIPSTONE_CAVES); getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET) .addTag(ConventionalBiomeTags.IS_WET_OVERWORLD); getOrCreateTagBuilder(ConventionalBiomeTags.IS_DRY_OVERWORLD) - .addOptionalTag(ConventionalBiomeTags.IS_NETHER) - .addOptionalTag(ConventionalBiomeTags.IS_BADLANDS) - .addOptionalTag(ConventionalBiomeTags.IS_DESERT) - .addOptionalTag(ConventionalBiomeTags.IS_SAVANNA); + .add(BiomeKeys.DESERT) + .add(BiomeKeys.BADLANDS) + .add(BiomeKeys.WOODED_BADLANDS) + .add(BiomeKeys.ERODED_BADLANDS) + .add(BiomeKeys.SAVANNA) + .add(BiomeKeys.SAVANNA_PLATEAU) + .add(BiomeKeys.WINDSWEPT_SAVANNA); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_DRY_NETHER) + .add(BiomeKeys.NETHER_WASTES) + .add(BiomeKeys.CRIMSON_FOREST) + .add(BiomeKeys.WARPED_FOREST) + .add(BiomeKeys.SOUL_SAND_VALLEY) + .add(BiomeKeys.BASALT_DELTAS); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_DRY_END) + .add(BiomeKeys.THE_END) + .add(BiomeKeys.SMALL_END_ISLANDS) + .add(BiomeKeys.END_MIDLANDS) + .add(BiomeKeys.END_HIGHLANDS) + .add(BiomeKeys.END_BARRENS); getOrCreateTagBuilder(ConventionalBiomeTags.IS_DRY) - .addTag(ConventionalBiomeTags.IS_DRY_OVERWORLD); + .addTag(ConventionalBiomeTags.IS_DRY_OVERWORLD) + .addTag(ConventionalBiomeTags.IS_DRY_NETHER) + .addTag(ConventionalBiomeTags.IS_DRY_END); getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD) - .addOptionalTag(ConventionalBiomeTags.IS_JUNGLE) - .add(BiomeKeys.DARK_FOREST); + .add(BiomeKeys.DARK_FOREST) + .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST) + .add(BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA) + .add(BiomeKeys.JUNGLE); getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE) .addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD) - .addOptionalTag(ConventionalBiomeTags.IS_SAVANNA) - .addOptionalTag(ConventionalBiomeTags.IS_DESERT) - .addOptionalTag(ConventionalBiomeTags.IS_DEAD) - .addOptionalTag(ConventionalBiomeTags.IS_WASTELAND); + .add(BiomeKeys.WOODED_BADLANDS) + .add(BiomeKeys.ERODED_BADLANDS) + .add(BiomeKeys.SAVANNA) + .add(BiomeKeys.SAVANNA_PLATEAU) + .add(BiomeKeys.WINDSWEPT_SAVANNA) + .add(BiomeKeys.WINDSWEPT_FOREST) + .add(BiomeKeys.WINDSWEPT_HILLS) + .add(BiomeKeys.WINDSWEPT_GRAVELLY_HILLS) + .add(BiomeKeys.SNOWY_SLOPES) + .add(BiomeKeys.JAGGED_PEAKS) + .add(BiomeKeys.FROZEN_PEAKS); getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE) .addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_CONIFEROUS_TREE) - .add(BiomeKeys.GROVE) - .addOptionalTag(ConventionalBiomeTags.IS_TAIGA); + .addOptionalTag(ConventionalBiomeTags.IS_TAIGA) + .add(BiomeKeys.GROVE); getOrCreateTagBuilder(ConventionalBiomeTags.IS_DECIDUOUS_TREE) .add(BiomeKeys.FOREST) .add(BiomeKeys.WINDSWEPT_FOREST) @@ -217,6 +275,7 @@ private void generateClimateAndVegetationTags() { .addOptionalTag(ConventionalBiomeTags.IS_JUNGLE); getOrCreateTagBuilder(ConventionalBiomeTags.IS_SAVANNA_TREE) .addOptionalTag(ConventionalBiomeTags.IS_SAVANNA); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLORAL) .add(BiomeKeys.SUNFLOWER_PLAINS) .add(BiomeKeys.MEADOW) @@ -237,7 +296,10 @@ private void generateTerrainDescriptorTags() { .add(BiomeKeys.JAGGED_PEAKS) .add(BiomeKeys.STONY_PEAKS); getOrCreateTagBuilder(ConventionalBiomeTags.IS_MOUNTAIN_SLOPE) - .add(BiomeKeys.SNOWY_SLOPES); + .add(BiomeKeys.SNOWY_SLOPES) + .add(BiomeKeys.MEADOW) + .add(BiomeKeys.GROVE) + .add(BiomeKeys.CHERRY_GROVE); getOrCreateTagBuilder(ConventionalBiomeTags.IS_AQUATIC) .addOptionalTag(ConventionalBiomeTags.IS_OCEAN) .addOptionalTag(ConventionalBiomeTags.IS_RIVER); diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold/end.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold/end.json new file mode 100644 index 0000000000..73d3eff3b0 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold/end.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:the_end", + "minecraft:small_end_islands", + "minecraft:end_midlands", + "minecraft:end_highlands", + "minecraft:end_barrens" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold/overworld.json index eb928a0d80..dce4ac9231 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold/overworld.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold/overworld.json @@ -1,17 +1,20 @@ { "values": [ + "minecraft:taiga", + "minecraft:old_growth_pine_taiga", "minecraft:snowy_plains", - "minecraft:snowy_slopes", + "minecraft:ice_spikes", "minecraft:grove", + "minecraft:snowy_slopes", "minecraft:jagged_peaks", - "minecraft:taiga", + "minecraft:frozen_peaks", + "minecraft:snowy_beach", "minecraft:snowy_taiga", - "minecraft:old_growth_spruce_taiga", - "minecraft:old_growth_pine_taiga", - { - "id": "#c:is_icy", - "required": false - }, + "minecraft:frozen_river", + "minecraft:cold_ocean", + "minecraft:frozen_ocean", + "minecraft:deep_cold_ocean", + "minecraft:deep_frozen_ocean", { "id": "#c:climate_cold", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation/overworld.json index a63cf7cd5b..795607e702 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation/overworld.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation/overworld.json @@ -1,10 +1,9 @@ { "values": [ - { - "id": "#c:is_jungle", - "required": false - }, "minecraft:dark_forest", + "minecraft:old_growth_birch_forest", + "minecraft:old_growth_spruce_taiga", + "minecraft:jungle", { "id": "#c:vegetation_dense", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry.json index dee9413885..fb8b1f1309 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry.json @@ -1,5 +1,7 @@ { "values": [ - "#c:is_dry/overworld" + "#c:is_dry/overworld", + "#c:is_dry/nether", + "#c:is_dry/end" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/end.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/end.json new file mode 100644 index 0000000000..73d3eff3b0 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/end.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:the_end", + "minecraft:small_end_islands", + "minecraft:end_midlands", + "minecraft:end_highlands", + "minecraft:end_barrens" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/nether.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/nether.json new file mode 100644 index 0000000000..d8cf8f5e34 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/nether.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:nether_wastes", + "minecraft:crimson_forest", + "minecraft:warped_forest", + "minecraft:soul_sand_valley", + "minecraft:basalt_deltas" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/overworld.json index a5498e419d..b9637b737b 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/overworld.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/overworld.json @@ -1,21 +1,12 @@ { "values": [ - { - "id": "#c:is_nether", - "required": false - }, - { - "id": "#c:is_badlands", - "required": false - }, - { - "id": "#c:is_desert", - "required": false - }, - { - "id": "#c:is_savanna", - "required": false - }, + "minecraft:desert", + "minecraft:badlands", + "minecraft:wooded_badlands", + "minecraft:eroded_badlands", + "minecraft:savanna", + "minecraft:savanna_plateau", + "minecraft:windswept_savanna", { "id": "#c:climate_dry", "required": false 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 8df12cae4b..91ad22241e 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,5 +1,6 @@ { "values": [ - "#c:is_hot/overworld" + "#c:is_hot/overworld", + "#c:is_hot/nether" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/nether.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/nether.json new file mode 100644 index 0000000000..d8cf8f5e34 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/nether.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:nether_wastes", + "minecraft:crimson_forest", + "minecraft:warped_forest", + "minecraft:soul_sand_valley", + "minecraft:basalt_deltas" + ] +} \ 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 05050c6633..904a4720ce 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,30 +1,17 @@ { "values": [ - { - "id": "#c:is_jungle", - "required": false - }, - { - "id": "#c:is_savanna", - "required": false - }, - { - "id": "#c:is_desert", - "required": false - }, - { - "id": "#c:is_badlands", - "required": false - }, + "minecraft:swamp", + "minecraft:mangrove_swamp", + "minecraft:jungle", + "minecraft:bamboo_jungle", + "minecraft:sparse_jungle", + "minecraft:desert", + "minecraft:eroded_badlands", + "minecraft:savanna", + "minecraft:savanna_plateau", + "minecraft:windswept_savanna", "minecraft:stony_peaks", - { - "id": "#c:is_mushroom", - "required": false - }, - { - "id": "#c:is_nether", - "required": false - }, + "minecraft:warm_ocean", { "id": "#c:climate_hot", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain/slope.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain/slope.json index 0d6aa0d4d1..d9e109f37f 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain/slope.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain/slope.json @@ -1,6 +1,9 @@ { "values": [ "minecraft:snowy_slopes", + "minecraft:meadow", + "minecraft:grove", + "minecraft:cherry_grove", { "id": "#c:mountain_slope", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_plains.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_plains.json index 25bb4e2130..c88810bc13 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_plains.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_plains.json @@ -1,6 +1,6 @@ { "values": [ - "minecraft:sunflower_plains", - "minecraft:plains" + "minecraft:plains", + "minecraft:sunflower_plains" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json index 9b462a969b..3565ae3956 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json @@ -1,21 +1,16 @@ { "values": [ - { - "id": "#c:is_savanna", - "required": false - }, - { - "id": "#c:is_desert", - "required": false - }, - { - "id": "#c:is_dead", - "required": false - }, - { - "id": "#c:is_wasteland", - "required": false - }, + "minecraft:wooded_badlands", + "minecraft:eroded_badlands", + "minecraft:savanna", + "minecraft:savanna_plateau", + "minecraft:windswept_savanna", + "minecraft:windswept_forest", + "minecraft:windswept_hills", + "minecraft:windswept_gravelly_hills", + "minecraft:snowy_slopes", + "minecraft:jagged_peaks", + "minecraft:frozen_peaks", { "id": "#c:vegetation_sparse", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/coniferous.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/coniferous.json index 88331550c7..add5217d0b 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/coniferous.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/coniferous.json @@ -1,10 +1,10 @@ { "values": [ - "minecraft:grove", { "id": "#c:is_taiga", "required": false }, + "minecraft:grove", { "id": "#c:tree_coniferous", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet/overworld.json index 33539d79e9..2976c53ca2 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet/overworld.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet/overworld.json @@ -1,18 +1,13 @@ { "values": [ - { - "id": "#c:is_aquatic", - "required": false - }, - { - "id": "#c:is_swamp", - "required": false - }, + "minecraft:swamp", + "minecraft:mangrove_swamp", + "minecraft:jungle", + "minecraft:bamboo_jungle", + "minecraft:sparse_jungle", + "minecraft:beach", "minecraft:lush_caves", - { - "id": "#c:is_jungle", - "required": false - }, + "minecraft:dripstone_caves", { "id": "#c:climate_wet", "required": false 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 276faad0ea..8ec523ea8c 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 @@ -57,18 +57,22 @@ 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_TEMPERATE = register("is_temperate"); public static final TagKey IS_TEMPERATE_OVERWORLD = register("is_temperate/overworld"); 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_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_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"); public static final TagKey IS_VEGETATION_SPARSE = register("is_sparse_vegetation"); public static final TagKey IS_VEGETATION_SPARSE_OVERWORLD = register("is_sparse_vegetation/overworld"); From 7b3c4df39a1ca0bda0ca805deed7d1e62fdc1c25 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 14 Apr 2024 12:07:25 -0400 Subject: [PATCH 123/123] fixed item tag issues --- .../convention/datagen/generators/ItemTagGenerator.java | 8 ++++++-- .../resources/data/c/tags/items/bricks/normal.json | 2 +- .../src/generated/resources/data/c/tags/items/rods.json | 4 ++++ .../resources/data/c/tags/items/rods/breeze.json | 5 +++++ .../api/tag/convention/v2/ConventionalItemTags.java | 1 + 5 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/breeze.json 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 414b07f5d6..f84d1fde4f 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 @@ -297,7 +297,7 @@ private void generateOreAndRelatedTags() { // Vanilla instances getOrCreateTagBuilder(ConventionalItemTags.NORMAL_BRICKS) - .add(Items.BRICKS); + .add(Items.BRICK); getOrCreateTagBuilder(ConventionalItemTags.NETHER_BRICKS) .add(Items.NETHER_BRICK); @@ -455,9 +455,13 @@ private void generateOtherTags() { getOrCreateTagBuilder(ConventionalItemTags.BLAZE_RODS) .add(Items.BLAZE_ROD); + getOrCreateTagBuilder(ConventionalItemTags.BREEZE_RODS) + .add(Items.BREEZE_ROD); + getOrCreateTagBuilder(ConventionalItemTags.RODS) .addOptionalTag(ConventionalItemTags.WOODEN_RODS) - .addOptionalTag(ConventionalItemTags.BLAZE_RODS); + .addOptionalTag(ConventionalItemTags.BLAZE_RODS) + .addOptionalTag(ConventionalItemTags.BREEZE_RODS); getOrCreateTagBuilder(ConventionalItemTags.ROPES); // Generate tag so others can see it exists through JSON. diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bricks/normal.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bricks/normal.json index e7d8939ed0..8f632e499a 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bricks/normal.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bricks/normal.json @@ -1,5 +1,5 @@ { "values": [ - "minecraft:bricks" + "minecraft:brick" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json index ff6788dee3..05aad4f4e6 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json @@ -7,6 +7,10 @@ { "id": "#c:rods/blaze", "required": false + }, + { + "id": "#c:rods/breeze", + "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/breeze.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/breeze.json new file mode 100644 index 0000000000..8290ef56cf --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/breeze.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:breeze_rod" + ] +} \ No newline at end of file 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 e58077ac97..aba8979875 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 @@ -279,6 +279,7 @@ private ConventionalItemTags() { */ public static final TagKey WOODEN_RODS = register("rods/wooden"); public static final TagKey BLAZE_RODS = register("rods/blaze"); + public static final TagKey BREEZE_RODS = register("rods/breeze"); public static final TagKey ROPES = register("ropes"); public static final TagKey CHAINS = register("chains");