diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 688eb13c2..69ecc3559 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 000000000..c3234962d --- /dev/null +++ b/deprecated/fabric-convention-tags-v1/build.gradle @@ -0,0 +1,6 @@ +version = getSubprojectVersion(project) + +moduleDependencies(project, [ + 'fabric-api-base', + 'fabric-convention-tags-v2' +]) \ 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/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java similarity index 94% rename from fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java rename to deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java index ec5ce54fb..b93d4a3f1 100644 --- a/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 @@ -22,11 +22,9 @@ import net.minecraft.world.biome.Biome; import net.fabricmc.fabric.impl.tag.convention.TagRegistration; /** - * See {@link net.minecraft.registry.tag.BiomeTags} for vanilla tags. - * Note that addition to some vanilla tags implies having certain functionality, - * and as such certain biome tags exist to mirror vanilla tags, and should be preferred - * over vanilla unless its behavior is desired. + * @deprecated Please use {@link net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags} */ +@Deprecated public final class ConventionalBiomeTags { private ConventionalBiomeTags() { } @@ -136,6 +134,6 @@ public final class 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/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 similarity index 93% rename from fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java rename to deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBlockTags.java index 8e65d0c15..ccee5bfe4 100644 --- a/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 @@ -23,9 +23,9 @@ import net.minecraft.registry.tag.TagKey; import net.fabricmc.fabric.impl.tag.convention.TagRegistration; /** - * See {@link net.minecraft.registry.tag.BlockTags} for vanilla tags. - * Note that addition to some vanilla tags implies having certain functionality. + * @deprecated Please use {@link net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags} */ +@Deprecated public final class ConventionalBlockTags { private ConventionalBlockTags() { } @@ -68,6 +68,6 @@ public final class 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/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 similarity index 91% rename from fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEnchantmentTags.java rename to deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEnchantmentTags.java index e2deb2398..e1c786af3 100644 --- a/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 @@ -21,6 +21,10 @@ 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() { } @@ -49,6 +53,6 @@ public final class 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-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 similarity index 84% rename from fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java rename to deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalEntityTypeTags.java index 1db8af2ff..966b3510e 100644 --- a/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 @@ -22,9 +22,9 @@ import net.minecraft.registry.tag.TagKey; import net.fabricmc.fabric.impl.tag.convention.TagRegistration; /** - * See {@link net.minecraft.registry.tag.EntityTypeTags} for vanilla tags. - * Note that addition to some vanilla tags implies having certain functionality. + * @deprecated Please use {@link net.fabricmc.fabric.api.tag.convention.v2.ConventionalEntityTypeTags} */ +@Deprecated public final class ConventionalEntityTypeTags { private ConventionalEntityTypeTags() { } @@ -37,6 +37,6 @@ public final class 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/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 similarity index 84% rename from fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalFluidTags.java rename to deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalFluidTags.java index 62e7348da..c29f3d513 100644 --- a/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 @@ -22,9 +22,9 @@ import net.minecraft.registry.tag.TagKey; import net.fabricmc.fabric.impl.tag.convention.TagRegistration; /** - * See {@link net.minecraft.registry.tag.FluidTags} for vanilla tags. - * Note that addition to some vanilla tags implies having certain functionality. + * @deprecated Please use {@link net.fabricmc.fabric.api.tag.convention.v2.ConventionalFluidTags} */ +@Deprecated public final class ConventionalFluidTags { private ConventionalFluidTags() { } @@ -35,6 +35,6 @@ public final class 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-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 similarity index 97% rename from fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java rename to deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalItemTags.java index f9c18926b..8044747a0 100644 --- a/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 @@ -23,9 +23,9 @@ import net.minecraft.registry.tag.TagKey; import net.fabricmc.fabric.impl.tag.convention.TagRegistration; /** - * See {@link net.minecraft.registry.tag.ItemTags} for vanilla tags. - * Note that addition to some vanilla tags implies having certain functionality. + * @deprecated Please use {@link net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags} */ +@Deprecated public final class ConventionalItemTags { private ConventionalItemTags() { } @@ -151,6 +151,6 @@ public final class 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/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 000000000..9ad7108e9 --- /dev/null +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java @@ -0,0 +1,48 @@ +/* + * 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 org.jetbrains.annotations.Nullable; + +import net.minecraft.registry.DynamicRegistryManager; +import net.minecraft.registry.tag.TagKey; + +/** + * @deprecated Please use {@link net.fabricmc.fabric.api.tag.convention.v2.TagUtil} + */ +@Deprecated +public final class TagUtil { + 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 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) { + return net.fabricmc.fabric.api.tag.convention.v2.TagUtil.isIn(registryManager, tagKey, entry); + } +} 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 000000000..6f1bc6c34 --- /dev/null +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -0,0 +1,280 @@ +/* + * 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.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.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; +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.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; + +public class ConventionLogWarnings implements ModInitializer { + 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 + } + + private 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.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.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), + 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(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), + 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_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.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_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), + + // 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, "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), + 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), + 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), + 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), + 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, "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, "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, "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, "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) + + ); + + @Override + public void onInitialize() { + if (FabricLoader.getInstance().isDevelopmentEnvironment() && !LOG_LEGACY_WARNING_MODE.equalsIgnoreCase(LOG_WARNING_MODES.SILENCED.name())) { + setupLegacyTagWarning(); + } + } + + private static void setupLegacyTagWarning() { + // Log tags that are still using legacy conventions under 'c' namespace + ServerLifecycleEvents.SERVER_STARTED.register(server -> { + 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 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. + 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()); + } + }); + } + + 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)); + } + + 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-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 similarity index 96% rename from fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java rename to deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java index 89c105c42..089736146 100644 --- a/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 @@ -28,6 +28,7 @@ import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; 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); @@ -41,11 +42,13 @@ public class TagRegistration { registryKey = registry; } + @Deprecated public TagKey registerFabric(String tagId) { return TagKey.of(registryKey, new Identifier("fabric", tagId)); } - public TagKey registerCommon(String tagId) { + @Deprecated + public TagKey registerC(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/fabric-convention-tags-v1/src/main/resources/fabric.mod.json b/deprecated/fabric-convention-tags-v1/src/main/resources/fabric.mod.json similarity index 85% rename from fabric-convention-tags-v1/src/main/resources/fabric.mod.json rename to deprecated/fabric-convention-tags-v1/src/main/resources/fabric.mod.json index cd16c69f2..5490f990a 100644 --- a/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.15.6", "minecraft": ">=1.18.2" diff --git a/fabric-client-tags-api-v1/build.gradle b/fabric-client-tags-api-v1/build.gradle index 406c6a3cb..40ea8782a 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 21d1e1226..438445d0f 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 @@ import net.fabricmc.fabric.impl.tag.client.ClientTagsImpl; * 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 ed2b70a8a..1e29b730f 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.client.event.lifecycle.v1.ClientTickEvents; 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; @@ -51,7 +51,7 @@ public class ClientTagTest implements ClientModInitializer { } 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!"); } @@ -63,7 +63,7 @@ public class ClientTagTest implements ClientModInitializer { 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-client-tags-api-v1/src/testmodClient/resources/fabric.mod.json b/fabric-client-tags-api-v1/src/testmodClient/resources/fabric.mod.json index 5f4d62b0a..29ba7f357 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/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 52d671a53..000000000 --- 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-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 deleted file mode 100644 index 9ba2a1120..000000000 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java +++ /dev/null @@ -1,197 +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.List; -import java.util.concurrent.CompletableFuture; - -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; -import net.minecraft.registry.RegistryWrapper; -import net.minecraft.registry.tag.BlockTags; - -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( - Blocks.BARREL, - Blocks.BLAST_FURNACE, - Blocks.BREWING_STAND, - Blocks.CARTOGRAPHY_TABLE, - Blocks.CAULDRON, - Blocks.LAVA_CAULDRON, - Blocks.WATER_CAULDRON, - Blocks.POWDER_SNOW_CAULDRON, - Blocks.COMPOSTER, - Blocks.FLETCHING_TABLE, - Blocks.GRINDSTONE, - Blocks.LECTERN, - Blocks.LOOM, - Blocks.SMITHING_TABLE, - Blocks.SMOKER, - Blocks.STONECUTTER - ); - - public BlockTagGenerator(FabricDataOutput output, CompletableFuture registriesFuture) { - super(output, registriesFuture); - } - - @Override - protected void configure(RegistryWrapper.WrapperLookup registries) { - getOrCreateTagBuilder(ConventionalBlockTags.QUARTZ_ORES) - .add(Blocks.NETHER_QUARTZ_ORE); - getOrCreateTagBuilder(ConventionalBlockTags.ORES) - .addOptionalTag(BlockTags.REDSTONE_ORES) - .addOptionalTag(BlockTags.COPPER_ORES) - .addOptionalTag(BlockTags.GOLD_ORES) - .addOptionalTag(BlockTags.IRON_ORES) - .addOptionalTag(BlockTags.COAL_ORES) - .addOptionalTag(BlockTags.EMERALD_ORES) - .addOptionalTag(BlockTags.LAPIS_ORES) - .addOptionalTag(BlockTags.DIAMOND_ORES) - .addOptionalTag(ConventionalBlockTags.QUARTZ_ORES); - - getOrCreateTagBuilder(ConventionalBlockTags.CHESTS) - .add(Blocks.CHEST) - .add(Blocks.ENDER_CHEST) - .add(Blocks.TRAPPED_CHEST); - getOrCreateTagBuilder(ConventionalBlockTags.BOOKSHELVES) - .add(Blocks.BOOKSHELF); - generateGlassTags(); - generateShulkerTag(); - getOrCreateTagBuilder(ConventionalBlockTags.WOODEN_BARRELS) - .add(Blocks.BARREL); - - generateBuddingTags(); - - VILLAGER_JOB_SITE_BLOCKS.forEach(getOrCreateTagBuilder(ConventionalBlockTags.VILLAGER_JOB_SITES)::add); - - generateSandstoneTags(); - } - - private void generateSandstoneTags() { - 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.CHISELED_RED_SANDSTONE) - .add(Blocks.CUT_RED_SANDSTONE) - .add(Blocks.SMOOTH_RED_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_SANDSTONE_STAIRS) - .add(Blocks.RED_SANDSTONE_STAIRS) - .add(Blocks.SMOOTH_RED_SANDSTONE_STAIRS); - - getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_SANDSTONE_BLOCKS) - .add(Blocks.SANDSTONE) - .add(Blocks.CHISELED_SANDSTONE) - .add(Blocks.CUT_SANDSTONE) - .add(Blocks.SMOOTH_SANDSTONE); - getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS) - .add(Blocks.SANDSTONE_SLAB) - .add(Blocks.CUT_SANDSTONE_SLAB) - .add(Blocks.SMOOTH_SANDSTONE_SLAB); - getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS) - .add(Blocks.SANDSTONE_STAIRS) - .add(Blocks.SMOOTH_SANDSTONE_STAIRS); - } - - private void generateBuddingTags() { - getOrCreateTagBuilder(ConventionalBlockTags.BUDDING_BLOCKS) - .add(Blocks.BUDDING_AMETHYST); - getOrCreateTagBuilder(ConventionalBlockTags.BUDS) - .add(Blocks.SMALL_AMETHYST_BUD) - .add(Blocks.MEDIUM_AMETHYST_BUD) - .add(Blocks.LARGE_AMETHYST_BUD); - getOrCreateTagBuilder(ConventionalBlockTags.CLUSTERS) - .add(Blocks.AMETHYST_CLUSTER); - } - - private void generateShulkerTag() { - getOrCreateTagBuilder(ConventionalBlockTags.SHULKER_BOXES) - .add(Blocks.SHULKER_BOX) - .add(Blocks.BLUE_SHULKER_BOX) - .add(Blocks.BROWN_SHULKER_BOX) - .add(Blocks.CYAN_SHULKER_BOX) - .add(Blocks.GRAY_SHULKER_BOX) - .add(Blocks.GREEN_SHULKER_BOX) - .add(Blocks.LIGHT_BLUE_SHULKER_BOX) - .add(Blocks.LIGHT_GRAY_SHULKER_BOX) - .add(Blocks.LIME_SHULKER_BOX) - .add(Blocks.MAGENTA_SHULKER_BOX) - .add(Blocks.ORANGE_SHULKER_BOX) - .add(Blocks.PINK_SHULKER_BOX) - .add(Blocks.PURPLE_SHULKER_BOX) - .add(Blocks.RED_SHULKER_BOX) - .add(Blocks.WHITE_SHULKER_BOX) - .add(Blocks.YELLOW_SHULKER_BOX) - .add(Blocks.BLACK_SHULKER_BOX); - } - - private void generateGlassTags() { - getOrCreateTagBuilder(ConventionalBlockTags.GLASS_BLOCKS) - .add(Blocks.GLASS) - .add(Blocks.GRAY_STAINED_GLASS) - .add(Blocks.BLACK_STAINED_GLASS) - .add(Blocks.ORANGE_STAINED_GLASS) - .add(Blocks.BLUE_STAINED_GLASS) - .add(Blocks.BROWN_STAINED_GLASS) - .add(Blocks.CYAN_STAINED_GLASS) - .add(Blocks.GREEN_STAINED_GLASS) - .add(Blocks.LIGHT_BLUE_STAINED_GLASS) - .add(Blocks.LIGHT_GRAY_STAINED_GLASS) - .add(Blocks.LIME_STAINED_GLASS) - .add(Blocks.MAGENTA_STAINED_GLASS) - .add(Blocks.PINK_STAINED_GLASS) - .add(Blocks.PURPLE_STAINED_GLASS) - .add(Blocks.RED_STAINED_GLASS) - .add(Blocks.TINTED_GLASS) - .add(Blocks.WHITE_STAINED_GLASS) - .add(Blocks.YELLOW_STAINED_GLASS); - getOrCreateTagBuilder(ConventionalBlockTags.GLASS_PANES) - .add(Blocks.GLASS_PANE) - .add(Blocks.GRAY_STAINED_GLASS_PANE) - .add(Blocks.BLACK_STAINED_GLASS_PANE) - .add(Blocks.ORANGE_STAINED_GLASS_PANE) - .add(Blocks.BLUE_STAINED_GLASS_PANE) - .add(Blocks.BROWN_STAINED_GLASS_PANE) - .add(Blocks.CYAN_STAINED_GLASS_PANE) - .add(Blocks.GREEN_STAINED_GLASS_PANE) - .add(Blocks.LIGHT_BLUE_STAINED_GLASS_PANE) - .add(Blocks.LIGHT_GRAY_STAINED_GLASS_PANE) - .add(Blocks.LIME_STAINED_GLASS_PANE) - .add(Blocks.MAGENTA_STAINED_GLASS_PANE) - .add(Blocks.PINK_STAINED_GLASS_PANE) - .add(Blocks.PURPLE_STAINED_GLASS_PANE) - .add(Blocks.RED_STAINED_GLASS_PANE) - .add(Blocks.WHITE_STAINED_GLASS_PANE) - .add(Blocks.YELLOW_STAINED_GLASS_PANE); - } -} 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 deleted file mode 100644 index e86a0ace6..000000000 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ /dev/null @@ -1,306 +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.component.DataComponentTypes; -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; - -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 { - /** @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); - } - - @Override - protected void configure(RegistryWrapper.WrapperLookup arg) { - generateToolTags(); - generateBucketTags(); - generateOreAndRelatedTags(); - generateConsumableTags(); - generateDyeTags(); - generateVillagerJobSites(); - copyItemTags(); - } - - private void copyItemTags() { - 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.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.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() { - 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) - .add(Items.BLACK_DYE); - getOrCreateTagBuilder(ConventionalItemTags.BLUE_DYES) - .add(Items.BLUE_DYE); - getOrCreateTagBuilder(ConventionalItemTags.BROWN_DYES) - .add(Items.BROWN_DYE); - getOrCreateTagBuilder(ConventionalItemTags.GREEN_DYES) - .add(Items.GREEN_DYE); - getOrCreateTagBuilder(ConventionalItemTags.RED_DYES) - .add(Items.RED_DYE); - getOrCreateTagBuilder(ConventionalItemTags.WHITE_DYES) - .add(Items.WHITE_DYE); - getOrCreateTagBuilder(ConventionalItemTags.YELLOW_DYES) - .add(Items.YELLOW_DYE); - getOrCreateTagBuilder(ConventionalItemTags.LIGHT_BLUE_DYES) - .add(Items.LIGHT_BLUE_DYE); - getOrCreateTagBuilder(ConventionalItemTags.LIGHT_GRAY_DYES) - .add(Items.LIGHT_GRAY_DYE); - getOrCreateTagBuilder(ConventionalItemTags.LIME_DYES) - .add(Items.LIME_DYE); - getOrCreateTagBuilder(ConventionalItemTags.MAGENTA_DYES) - .add(Items.MAGENTA_DYE); - getOrCreateTagBuilder(ConventionalItemTags.ORANGE_DYES) - .add(Items.ORANGE_DYE); - getOrCreateTagBuilder(ConventionalItemTags.PINK_DYES) - .add(Items.PINK_DYE); - getOrCreateTagBuilder(ConventionalItemTags.CYAN_DYES) - .add(Items.CYAN_DYE); - getOrCreateTagBuilder(ConventionalItemTags.GRAY_DYES) - .add(Items.GRAY_DYE); - getOrCreateTagBuilder(ConventionalItemTags.PURPLE_DYES) - .add(Items.PURPLE_DYE); - } - - private void generateConsumableTags() { - Registries.ITEM.forEach(item -> { - if (item.getDefaultStack().contains(DataComponentTypes.FOOD)) { - getOrCreateTagBuilder(ConventionalItemTags.FOODS).add(item); - } - }); - getOrCreateTagBuilder(ConventionalItemTags.POTIONS) - .add(Items.LINGERING_POTION) - .add(Items.SPLASH_POTION) - .add(Items.POTION); - } - - private void generateBucketTags() { - getOrCreateTagBuilder(ConventionalItemTags.EMPTY_BUCKETS) - .add(Items.BUCKET); - getOrCreateTagBuilder(ConventionalItemTags.LAVA_BUCKETS) - .add(Items.LAVA_BUCKET); - 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.WATER_BUCKETS) - .add(Items.WATER_BUCKET); - getOrCreateTagBuilder(ConventionalItemTags.MILK_BUCKETS) - .add(Items.MILK_BUCKET); - } - - private void generateOreAndRelatedTags() { - // Categories - getOrCreateTagBuilder(ConventionalItemTags.DUSTS) - .add(Items.GLOWSTONE_DUST) - .add(Items.REDSTONE); - getOrCreateTagBuilder(ConventionalItemTags.GEMS) - .add(Items.DIAMOND, Items.EMERALD, Items.AMETHYST_SHARD, Items.LAPIS_LAZULI); - getOrCreateTagBuilder(ConventionalItemTags.INGOTS) - .add(Items.COPPER_INGOT, Items.GOLD_INGOT, Items.IRON_INGOT, Items.NETHERITE_INGOT); - 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); - - // Vanilla instances - getOrCreateTagBuilder(ConventionalItemTags.IRON_INGOTS) - .add(Items.IRON_INGOT); - getOrCreateTagBuilder(ConventionalItemTags.COPPER_INGOTS) - .add(Items.COPPER_INGOT); - getOrCreateTagBuilder(ConventionalItemTags.GOLD_INGOTS) - .add(Items.GOLD_INGOT); - getOrCreateTagBuilder(ConventionalItemTags.NETHERITE_INGOTS) - .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) - .add(Items.RAW_IRON_BLOCK); - getOrCreateTagBuilder(ConventionalItemTags.RAW_COPPER_BLOCKS) - .add(Items.RAW_COPPER_BLOCK); - getOrCreateTagBuilder(ConventionalItemTags.RAW_GOLD_BLOCKS) - .add(Items.RAW_GOLD_BLOCK); - getOrCreateTagBuilder(ConventionalItemTags.COAL) - .addOptionalTag(ItemTags.COALS); - getOrCreateTagBuilder(ConventionalItemTags.EMERALDS) - .add(Items.EMERALD); - getOrCreateTagBuilder(ConventionalItemTags.LAPIS) - .add(Items.LAPIS_LAZULI); - getOrCreateTagBuilder(ConventionalItemTags.DIAMONDS) - .add(Items.DIAMOND); - } - - 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) - .add(Items.BOW); - getOrCreateTagBuilder(ConventionalItemTags.SHIELDS) - .add(Items.SHIELD); - } - - private void generateVillagerJobSites() { - BlockTagGenerator.VILLAGER_JOB_SITE_BLOCKS.stream() - .map(ItemConvertible::asItem) - .distinct() // cauldron blocks have the same item - .forEach(getOrCreateTagBuilder(ConventionalItemTags.VILLAGER_JOB_SITES)::add); - } - - private static Identifier createFabricId(String id) { - return new Identifier("fabric", id); - } -} 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/c/tags/blocks/chests.json deleted file mode 100644 index 329aa55a9..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/chests.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "values": [ - "minecraft:chest", - "minecraft:ender_chest", - "minecraft:trapped_chest" - ] -} \ 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/c/tags/blocks/red_sandstone_slabs.json deleted file mode 100644 index a586c4908..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/red_sandstone_slabs.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "values": [ - "minecraft:red_sandstone_slab", - "minecraft:cut_red_sandstone_slab", - "minecraft:smooth_red_sandstone_slab" - ] -} \ 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 8778d5dbb..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/red_sandstone_stairs.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 d830f1dc1..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/uncolored_sandstone_slabs.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 ddb4a27f8..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/uncolored_sandstone_stairs.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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/blocks/wooden_barrels.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/wooden_barrels.json deleted file mode 100644 index b07daae1c..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/wooden_barrels.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:barrel" - ] -} \ 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 a08bf3111..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/entity_movement_enhancement.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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/items/black_dyes.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/black_dyes.json deleted file mode 100644 index a2ecf55c4..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/black_dyes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:black_dye" - ] -} \ 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/c/tags/items/blue_dyes.json deleted file mode 100644 index e7b78e12a..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/blue_dyes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:blue_dye" - ] -} \ 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 8c7249234..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/brown_dyes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:brown_dye" - ] -} \ 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/c/tags/items/chests.json deleted file mode 100644 index 329aa55a9..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/chests.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "values": [ - "minecraft:chest", - "minecraft:ender_chest", - "minecraft:trapped_chest" - ] -} \ 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 f0c5a4400..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/cyan_dyes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 f44f30dd5..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/diamonds.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 c632bc0d6..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/dusts.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 07a098211..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/emeralds.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:emerald" - ] -} \ 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/c/tags/items/foods.json deleted file mode 100644 index 652d8b713..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/foods.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "values": [ - "minecraft:apple", - "minecraft:mushroom_stew", - "minecraft:bread", - "minecraft:porkchop", - "minecraft:cooked_porkchop", - "minecraft:golden_apple", - "minecraft:enchanted_golden_apple", - "minecraft:cod", - "minecraft:salmon", - "minecraft:tropical_fish", - "minecraft:pufferfish", - "minecraft:cooked_cod", - "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:golden_carrot", - "minecraft:pumpkin_pie", - "minecraft:rabbit", - "minecraft:cooked_rabbit", - "minecraft:rabbit_stew", - "minecraft:mutton", - "minecraft:cooked_mutton", - "minecraft:chorus_fruit", - "minecraft:beetroot", - "minecraft:beetroot_soup", - "minecraft:suspicious_stew", - "minecraft:sweet_berries", - "minecraft:glow_berries", - "minecraft:honey_bottle", - "minecraft:ominous_bottle" - ] -} \ 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/c/tags/items/gems.json deleted file mode 100644 index 6e6b71028..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/gems.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "minecraft:diamond", - "minecraft:emerald", - "minecraft:amethyst_shard", - "minecraft:lapis_lazuli" - ] -} \ 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 6cdbb27a4..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/gray_dyes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 89fe8ccaf..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/green_dyes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 e8a52a786..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/hoes.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "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/ingots.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/ingots.json deleted file mode 100644 index fbf69a565..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/ingots.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "minecraft:copper_ingot", - "minecraft:gold_ingot", - "minecraft:iron_ingot", - "minecraft:netherite_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 614441df4..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/lapis.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:lapis_lazuli" - ] -} \ 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 76f1a7786..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/light_blue_dyes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 596b2efb3..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/light_gray_dyes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 b0ac91f97..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/lime_dyes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 f6898d4c9..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/magenta_dyes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:magenta_dye" - ] -} \ 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 df54849c5..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/orange_dyes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:orange_dye" - ] -} \ 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 d9f289862..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/pink_dyes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:pink_dye" - ] -} \ 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/c/tags/items/potions.json deleted file mode 100644 index 96ccf7890..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/potions.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "values": [ - "minecraft:lingering_potion", - "minecraft:splash_potion", - "minecraft:potion" - ] -} \ 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 b3ebfe3c2..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/purple_dyes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 aad2eef95..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/quartz.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 f0bc7a465..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/quartz_ores.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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_ores.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_copper_ores.json deleted file mode 100644 index 3e03ab9ca..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_copper_ores.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 3d1252e5f..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_gold_ores.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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_ores.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_iron_ores.json deleted file mode 100644 index 8f9af48d8..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_iron_ores.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 9c6fe3467..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/red_dyes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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_slabs.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/red_sandstone_slabs.json deleted file mode 100644 index a586c4908..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/red_sandstone_slabs.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "values": [ - "minecraft:red_sandstone_slab", - "minecraft:cut_red_sandstone_slab", - "minecraft:smooth_red_sandstone_slab" - ] -} \ 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 8778d5dbb..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/red_sandstone_stairs.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 a096239ec..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/redstone_dusts.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:redstone" - ] -} \ 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/c/tags/items/sandstone_blocks.json deleted file mode 100644 index 686cd2a17..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/sandstone_blocks.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "values": [ - { - "id": "#c:uncolored_sandstone_blocks", - "required": false - }, - { - "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/sandstone_slabs.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/sandstone_slabs.json deleted file mode 100644 index 72f7801bb..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/sandstone_slabs.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "values": [ - { - "id": "#c:uncolored_sandstone_slabs", - "required": false - }, - { - "id": "#c:red_sandstone_slabs", - "required": false - } - ] -} \ 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 a90f3163e..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/shears.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "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 0f2454ce0..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/shields.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 5352fdfb2..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/shovels.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "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 7a2c450bc..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/spears.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 a57e465b4..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/swords.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "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 d830f1dc1..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/uncolored_sandstone_slabs.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 ddb4a27f8..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/uncolored_sandstone_stairs.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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/white_dyes.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/white_dyes.json deleted file mode 100644 index 3a30d72b1..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/white_dyes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 b07daae1c..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/wooden_barrels.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 434995983..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/yellow_dyes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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/caves.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/caves.json deleted file mode 100644 index ce959e39e..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/caves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "values": [ - "minecraft:deep_dark", - "minecraft:dripstone_caves", - "minecraft:lush_caves" - ] -} \ 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/c/tags/worldgen/biome/climate_cold.json deleted file mode 100644 index 2e84b2fb1..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_cold.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "values": [ - "minecraft:snowy_plains", - "minecraft:grove", - "minecraft:jagged_peaks", - "minecraft:taiga", - "minecraft:snowy_taiga", - "minecraft:old_growth_spruce_taiga", - "minecraft:old_growth_pine_taiga", - { - "id": "#c:icy", - "required": false - } - ] -} \ No newline at end of file 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/c/tags/worldgen/biome/deep_ocean.json deleted file mode 100644 index d6e816783..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/deep_ocean.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "minecraft:deep_frozen_ocean", - "minecraft:deep_lukewarm_ocean", - "minecraft:deep_cold_ocean", - "minecraft:deep_ocean" - ] -} \ 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 50ce8f748..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/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-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 8edd5b8da..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/flower_forests.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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/in_overworld.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/in_overworld.json deleted file mode 100644 index d4ac14d25..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/in_overworld.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "values": [ - { - "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: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: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:snowy_slopes", - "minecraft:frozen_peaks", - "minecraft:jagged_peaks", - "minecraft:stony_peaks", - "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" - ] -} \ 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 47653ad1c..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mesa.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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_peak.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mountain_peak.json deleted file mode 100644 index deb2cfc59..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mountain_peak.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "values": [ - "minecraft:frozen_peaks", - "minecraft:jagged_peaks", - "minecraft:stony_peaks" - ] -} \ 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 45c21abf7..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mountain_slope.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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/nether_forests.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/nether_forests.json deleted file mode 100644 index 19cc0e3b3..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/nether_forests.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 25bb4e213..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/plains.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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/savanna.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/savanna.json deleted file mode 100644 index c5b3d64aa..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/savanna.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "values": [ - { - "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-v1/src/generated/resources/data/c/tags/worldgen/biome/snowy.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/snowy.json deleted file mode 100644 index c446ac413..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/snowy.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "minecraft:snowy_beach", - "minecraft:snowy_plains", - "minecraft:snowy_slopes", - "minecraft:snowy_taiga" - ] -} \ 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 68629984f..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/vegetation_dense.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "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/minecraft/tags/items/pickaxes.json b/fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/pickaxes.json deleted file mode 100644 index a21deae06..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/pickaxes.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "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 491f42c5c..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/shovels.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "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/generated/resources/data/minecraft/tags/items/swords.json b/fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/swords.json deleted file mode 100644 index 0b7abab12..000000000 --- a/fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/swords.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "values": [ - { - "id": "#c:swords", - "required": false - }, - { - "id": "#fabric:swords", - "required": false - } - ] -} \ 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 91% rename from fabric-convention-tags-v1/build.gradle rename to fabric-convention-tags-v2/build.gradle index ab2cb0ef6..194a4b918 100644 --- a/fabric-convention-tags-v1/build.gradle +++ b/fabric-convention-tags-v2/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/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 93% 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 index ef208e8cf..6dbd91e7d 100644 --- 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 @@ -24,6 +24,7 @@ import net.fabricmc.fabric.impl.tag.convention.datagen.generators.EnchantmentTag 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 class DatagenEntrypoint implements DataGeneratorEntrypoint { 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/BiomeTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java new file mode 100644 index 000000000..8b4a68436 --- /dev/null +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java @@ -0,0 +1,346 @@ +/* + * 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.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.v2.ConventionalBiomeTags; +import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; + +public final 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(); + generateBackwardsCompatTags(); + } + + private void generateDimensionTags() { + getOrCreateTagBuilder(ConventionalBiomeTags.IS_NETHER) + .addOptionalTag(BiomeTags.IS_NETHER); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_END) + .addOptionalTag(BiomeTags.IS_END); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_OVERWORLD) + .addOptionalTag(BiomeTags.IS_OVERWORLD); + } + + private void generateCategoryTags() { + getOrCreateTagBuilder(ConventionalBiomeTags.IS_TAIGA) + .addOptionalTag(BiomeTags.IS_TAIGA); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_HILL) + .addOptionalTag(BiomeTags.IS_HILL); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_WINDSWEPT) + .add(BiomeKeys.WINDSWEPT_HILLS) + .add(BiomeKeys.WINDSWEPT_GRAVELLY_HILLS) + .add(BiomeKeys.WINDSWEPT_FOREST) + .add(BiomeKeys.WINDSWEPT_SAVANNA); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_JUNGLE) + .addOptionalTag(BiomeTags.IS_JUNGLE); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_PLAINS) + .add(BiomeKeys.PLAINS) + .add(BiomeKeys.SUNFLOWER_PLAINS); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_SAVANNA) + .addOptionalTag(BiomeTags.IS_SAVANNA); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_ICY) + .add(BiomeKeys.FROZEN_PEAKS) + .add(BiomeKeys.ICE_SPIKES); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_AQUATIC_ICY) + .add(BiomeKeys.FROZEN_RIVER) + .add(BiomeKeys.DEEP_FROZEN_OCEAN) + .add(BiomeKeys.FROZEN_OCEAN); + 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.JAGGED_PEAKS) + .add(BiomeKeys.FROZEN_PEAKS); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_BEACH) + .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); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_DESERT) + .add(BiomeKeys.DESERT); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_RIVER) + .addOptionalTag(BiomeTags.IS_RIVER); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_SWAMP) + .add(BiomeKeys.MANGROVE_SWAMP) + .add(BiomeKeys.SWAMP); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_MUSHROOM) + .add(BiomeKeys.MUSHROOM_FIELDS); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_UNDERGROUND) + .addOptionalTag(ConventionalBiomeTags.IS_CAVE); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_MOUNTAIN) + .addOptionalTag(BiomeTags.IS_MOUNTAIN) + .addOptionalTag(ConventionalBiomeTags.IS_MOUNTAIN_PEAK) + .addOptionalTag(ConventionalBiomeTags.IS_MOUNTAIN_SLOPE); + } + + private void generateOtherBiomeTypes() { + getOrCreateTagBuilder(ConventionalBiomeTags.IS_BADLANDS) + .addOptionalTag(BiomeTags.IS_BADLANDS); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_CAVE) + .add(BiomeKeys.DEEP_DARK) + .add(BiomeKeys.DRIPSTONE_CAVES) + .add(BiomeKeys.LUSH_CAVES); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_VOID) + .add(BiomeKeys.THE_VOID); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_DEEP_OCEAN) + .addOptionalTag(BiomeTags.IS_DEEP_OCEAN); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_SHALLOW_OCEAN) + .add(BiomeKeys.OCEAN) + .add(BiomeKeys.LUKEWARM_OCEAN) + .add(BiomeKeys.WARM_OCEAN) + .add(BiomeKeys.COLD_OCEAN) + .add(BiomeKeys.FROZEN_OCEAN); + 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() { + getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD_OVERWORLD) + .add(BiomeKeys.TAIGA) + .add(BiomeKeys.OLD_GROWTH_PINE_TAIGA) + .add(BiomeKeys.SNOWY_PLAINS) + .add(BiomeKeys.ICE_SPIKES) + .add(BiomeKeys.GROVE) + .add(BiomeKeys.SNOWY_SLOPES) + .add(BiomeKeys.JAGGED_PEAKS) + .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); + + getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD) + .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.IS_TEMPERATE) + .addTag(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD); + + getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT_OVERWORLD) + .add(BiomeKeys.SWAMP) + .add(BiomeKeys.MANGROVE_SWAMP) + .add(BiomeKeys.JUNGLE) + .add(BiomeKeys.BAMBOO_JUNGLE) + .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) + .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_NETHER); + + getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET_OVERWORLD) + .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) + .add(BiomeKeys.DRIPSTONE_CAVES); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET) + .addTag(ConventionalBiomeTags.IS_WET_OVERWORLD); + + getOrCreateTagBuilder(ConventionalBiomeTags.IS_DRY_OVERWORLD) + .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_NETHER) + .addTag(ConventionalBiomeTags.IS_DRY_END); + + getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD) + .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) + .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) + .addOptionalTag(ConventionalBiomeTags.IS_TAIGA) + .add(BiomeKeys.GROVE); + 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.IS_JUNGLE_TREE) + .addOptionalTag(ConventionalBiomeTags.IS_JUNGLE); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_SAVANNA_TREE) + .addOptionalTag(ConventionalBiomeTags.IS_SAVANNA); + + getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLORAL) + .add(BiomeKeys.SUNFLOWER_PLAINS) + .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() { + getOrCreateTagBuilder(ConventionalBiomeTags.IS_MOUNTAIN_PEAK) + .add(BiomeKeys.FROZEN_PEAKS) + .add(BiomeKeys.JAGGED_PEAKS) + .add(BiomeKeys.STONY_PEAKS); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_MOUNTAIN_SLOPE) + .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); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_DEAD); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_WASTELAND); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_OUTER_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); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_SNOWY_PLAINS) + .add(BiomeKeys.SNOWY_PLAINS); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_STONY_SHORES) + .add(BiomeKeys.STONY_SHORE); + } + + 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(TagUtil.C_TAG_NAMESPACE, "in_nether")); + 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")); + 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_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/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 new file mode 100644 index 000000000..a37a3ab3e --- /dev/null +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java @@ -0,0 +1,466 @@ +/* + * 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.List; +import java.util.concurrent.CompletableFuture; + +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.tag.BlockTags; +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 final class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { + static List VILLAGER_JOB_SITE_BLOCKS = List.of( + Blocks.BARREL, + Blocks.BLAST_FURNACE, + Blocks.BREWING_STAND, + Blocks.CARTOGRAPHY_TABLE, + Blocks.CAULDRON, + Blocks.LAVA_CAULDRON, + Blocks.WATER_CAULDRON, + Blocks.POWDER_SNOW_CAULDRON, + Blocks.COMPOSTER, + Blocks.FLETCHING_TABLE, + Blocks.GRINDSTONE, + Blocks.LECTERN, + Blocks.LOOM, + Blocks.SMITHING_TABLE, + Blocks.SMOKER, + Blocks.STONECUTTER + ); + + public BlockTagGenerator(FabricDataOutput output, CompletableFuture registriesFuture) { + super(output, registriesFuture); + } + + @Override + protected void configure(RegistryWrapper.WrapperLookup registries) { + getOrCreateTagBuilder(ConventionalBlockTags.STONES) + .add(Blocks.STONE) + .add(Blocks.ANDESITE) + .add(Blocks.DIORITE) + .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); + getOrCreateTagBuilder(ConventionalBlockTags.NETHERITE_SCRAP_ORES) + .add(Blocks.ANCIENT_DEBRIS); + getOrCreateTagBuilder(ConventionalBlockTags.ORES) + .addOptionalTag(BlockTags.COAL_ORES) + .addOptionalTag(BlockTags.COPPER_ORES) + .addOptionalTag(BlockTags.DIAMOND_ORES) + .addOptionalTag(BlockTags.EMERALD_ORES) + .addOptionalTag(BlockTags.GOLD_ORES) + .addOptionalTag(BlockTags.IRON_ORES) + .addOptionalTag(BlockTags.LAPIS_ORES) + .addOptionalTag(ConventionalBlockTags.NETHERITE_SCRAP_ORES) + .addOptionalTag(BlockTags.REDSTONE_ORES) + .addOptionalTag(ConventionalBlockTags.QUARTZ_ORES); + + getOrCreateTagBuilder(ConventionalBlockTags.WOODEN_CHESTS) + .add(Blocks.CHEST) + .add(Blocks.TRAPPED_CHEST); + getOrCreateTagBuilder(ConventionalBlockTags.CHESTS) + .addTag(ConventionalBlockTags.WOODEN_CHESTS) + .add(Blocks.ENDER_CHEST); + getOrCreateTagBuilder(ConventionalBlockTags.BOOKSHELVES) + .add(Blocks.BOOKSHELF); + generateGlassTags(); + generateShulkerTag(); + getOrCreateTagBuilder(ConventionalBlockTags.WOODEN_BARRELS) + .add(Blocks.BARREL); + getOrCreateTagBuilder(ConventionalBlockTags.BARRELS) + .addTag(ConventionalBlockTags.WOODEN_BARRELS); + + generateBuddingTags(); + + generateSandstoneTags(); + + generateDyedTags(); + + generateStorageTags(); + + generateHeadTags(); + + generateMiscTags(); + + generateBackwardsCompatTags(); + } + + 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. + + getOrCreateTagBuilder(ConventionalBlockTags.ROPES); // Generate tag so others can see it exists through JSON. + + 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() { + 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_SANDSTONE_SLABS) + .add(Blocks.RED_SANDSTONE_SLAB) + .add(Blocks.CUT_RED_SANDSTONE_SLAB) + .add(Blocks.SMOOTH_RED_SANDSTONE_SLAB); + getOrCreateTagBuilder(ConventionalBlockTags.RED_SANDSTONE_STAIRS) + .add(Blocks.RED_SANDSTONE_STAIRS) + .add(Blocks.SMOOTH_RED_SANDSTONE_STAIRS); + + getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_SANDSTONE_BLOCKS) + .add(Blocks.SANDSTONE) + .add(Blocks.CUT_SANDSTONE) + .add(Blocks.SMOOTH_SANDSTONE) + .add(Blocks.CHISELED_SANDSTONE); + getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS) + .add(Blocks.SANDSTONE_SLAB) + .add(Blocks.CUT_SANDSTONE_SLAB) + .add(Blocks.SMOOTH_SANDSTONE_SLAB); + getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS) + .add(Blocks.SANDSTONE_STAIRS) + .add(Blocks.SMOOTH_SANDSTONE_STAIRS); + } + + private void generateBuddingTags() { + getOrCreateTagBuilder(ConventionalBlockTags.BUDDING_BLOCKS) + .add(Blocks.BUDDING_AMETHYST); + getOrCreateTagBuilder(ConventionalBlockTags.BUDS) + .add(Blocks.SMALL_AMETHYST_BUD) + .add(Blocks.MEDIUM_AMETHYST_BUD) + .add(Blocks.LARGE_AMETHYST_BUD); + getOrCreateTagBuilder(ConventionalBlockTags.CLUSTERS) + .add(Blocks.AMETHYST_CLUSTER); + } + + private void generateShulkerTag() { + getOrCreateTagBuilder(ConventionalBlockTags.SHULKER_BOXES) + .add(Blocks.SHULKER_BOX) + .add(Blocks.WHITE_SHULKER_BOX) + .add(Blocks.ORANGE_SHULKER_BOX) + .add(Blocks.MAGENTA_SHULKER_BOX) + .add(Blocks.LIGHT_BLUE_SHULKER_BOX) + .add(Blocks.YELLOW_SHULKER_BOX) + .add(Blocks.LIME_SHULKER_BOX) + .add(Blocks.PINK_SHULKER_BOX) + .add(Blocks.GRAY_SHULKER_BOX) + .add(Blocks.LIGHT_GRAY_SHULKER_BOX) + .add(Blocks.CYAN_SHULKER_BOX) + .add(Blocks.PURPLE_SHULKER_BOX) + .add(Blocks.BLUE_SHULKER_BOX) + .add(Blocks.BROWN_SHULKER_BOX) + .add(Blocks.GREEN_SHULKER_BOX) + .add(Blocks.RED_SHULKER_BOX) + .add(Blocks.BLACK_SHULKER_BOX); + } + + private void generateGlassTags() { + getOrCreateTagBuilder(ConventionalBlockTags.GLASS_BLOCKS) + .add(Blocks.GLASS) + .add(Blocks.TINTED_GLASS) + .add(Blocks.WHITE_STAINED_GLASS) + .add(Blocks.ORANGE_STAINED_GLASS) + .add(Blocks.MAGENTA_STAINED_GLASS) + .add(Blocks.LIGHT_BLUE_STAINED_GLASS) + .add(Blocks.YELLOW_STAINED_GLASS) + .add(Blocks.LIME_STAINED_GLASS) + .add(Blocks.PINK_STAINED_GLASS) + .add(Blocks.GRAY_STAINED_GLASS) + .add(Blocks.LIGHT_GRAY_STAINED_GLASS) + .add(Blocks.CYAN_STAINED_GLASS) + .add(Blocks.PURPLE_STAINED_GLASS) + .add(Blocks.BLUE_STAINED_GLASS) + .add(Blocks.BROWN_STAINED_GLASS) + .add(Blocks.GREEN_STAINED_GLASS) + .add(Blocks.BLACK_STAINED_GLASS) + .add(Blocks.RED_STAINED_GLASS); + getOrCreateTagBuilder(ConventionalBlockTags.GLASS_PANES) + .add(Blocks.GLASS_PANE) + .add(Blocks.WHITE_STAINED_GLASS_PANE) + .add(Blocks.ORANGE_STAINED_GLASS_PANE) + .add(Blocks.MAGENTA_STAINED_GLASS_PANE) + .add(Blocks.LIGHT_BLUE_STAINED_GLASS_PANE) + .add(Blocks.YELLOW_STAINED_GLASS_PANE) + .add(Blocks.LIME_STAINED_GLASS_PANE) + .add(Blocks.PINK_STAINED_GLASS_PANE) + .add(Blocks.GRAY_STAINED_GLASS_PANE) + .add(Blocks.LIGHT_GRAY_STAINED_GLASS_PANE) + .add(Blocks.CYAN_STAINED_GLASS_PANE) + .add(Blocks.PURPLE_STAINED_GLASS_PANE) + .add(Blocks.BLUE_STAINED_GLASS_PANE) + .add(Blocks.BROWN_STAINED_GLASS_PANE) + .add(Blocks.GREEN_STAINED_GLASS_PANE) + .add(Blocks.BLACK_STAINED_GLASS_PANE) + .add(Blocks.RED_STAINED_GLASS_PANE); + } + + private void generateDyedTags() { + 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) + .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) + .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) + .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) + .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) + .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) + .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) + .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) + .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) + .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) + .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) + .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) + .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) + .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) + .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) + .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) + .addTag(ConventionalBlockTags.WHITE_DYED) + .addTag(ConventionalBlockTags.ORANGE_DYED) + .addTag(ConventionalBlockTags.MAGENTA_DYED) + .addTag(ConventionalBlockTags.LIGHT_BLUE_DYED) + .addTag(ConventionalBlockTags.YELLOW_DYED) + .addTag(ConventionalBlockTags.LIME_DYED) + .addTag(ConventionalBlockTags.PINK_DYED) + .addTag(ConventionalBlockTags.GRAY_DYED) + .addTag(ConventionalBlockTags.LIGHT_GRAY_DYED) + .addTag(ConventionalBlockTags.CYAN_DYED) + .addTag(ConventionalBlockTags.PURPLE_DYED) + .addTag(ConventionalBlockTags.BLUE_DYED) + .addTag(ConventionalBlockTags.BROWN_DYED) + .addTag(ConventionalBlockTags.GREEN_DYED) + .addTag(ConventionalBlockTags.RED_DYED) + .addTag(ConventionalBlockTags.BLACK_DYED); + } + + private void generateStorageTags() { + getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS) + .addTag(ConventionalBlockTags.STORAGE_BLOCKS_BONE_MEAL) + .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_BONE_MEAL) + .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 generateHeadTags() { + getOrCreateTagBuilder(ConventionalBlockTags.SKULLS) + .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 + + 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.WOODEN_CHESTS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "wooden_chests")); + 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-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 61% 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 aa8b31656..dc43c542d 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 @@ -20,38 +20,47 @@ import java.util.concurrent.CompletableFuture; 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.v1.ConventionalEnchantmentTags; +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); } @Override protected void configure(RegistryWrapper.WrapperLookup registries) { - getOrCreateTagBuilder(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS) + getOrCreateTagBuilder(ConventionalEnchantmentTags.INCREASE_BLOCK_DROPS) .add(Enchantments.FORTUNE); - getOrCreateTagBuilder(ConventionalEnchantmentTags.INCREASES_ENTITY_DROPS) + getOrCreateTagBuilder(ConventionalEnchantmentTags.INCREASE_ENTITY_DROPS) .add(Enchantments.LOOTING); - getOrCreateTagBuilder(ConventionalEnchantmentTags.WEAPON_DAMAGE_ENHANCEMENT) - .add(Enchantments.BANE_OF_ARTHROPODS) - .add(Enchantments.IMPALING) + getOrCreateTagBuilder(ConventionalEnchantmentTags.WEAPON_DAMAGE_ENHANCEMENTS) + .add(Enchantments.SHARPNESS) .add(Enchantments.SMITE) + .add(Enchantments.BANE_OF_ARTHROPODS) .add(Enchantments.POWER) - .add(Enchantments.SHARPNESS); - getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_MOVEMENT_ENHANCEMENT) + .add(Enchantments.IMPALING); + getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_SPEED_ENHANCEMENTS) + .add(Enchantments.SOUL_SPEED) .add(Enchantments.SWIFT_SNEAK) - .add(Enchantments.DEPTH_STRIDER) - .add(Enchantments.SOUL_SPEED); - getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_DEFENSE_ENHANCEMENT) + .add(Enchantments.DEPTH_STRIDER); + getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS) .add(Enchantments.FEATHER_FALLING) + .add(Enchantments.FROST_WALKER); + getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_DEFENSE_ENHANCEMENT) .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 + getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_SPEED_ENHANCEMENTS) + .addOptionalTag(new Identifier("c", "entity_movement_enhancement")); } } 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 85% 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 e141177c2..d14805a28 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 @@ -23,9 +23,9 @@ 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.ConventionalEntityTypeTags; +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); } @@ -46,5 +46,7 @@ public class EntityTypeTagGenerator extends FabricTagProvider.EntityTypeTagProvi getOrCreateTagBuilder(ConventionalEntityTypeTags.BOATS) .add(EntityType.BOAT) .add(EntityType.CHEST_BOAT); + getOrCreateTagBuilder(ConventionalEntityTypeTags.CAPTURING_NOT_SUPPORTED); + getOrCreateTagBuilder(ConventionalEntityTypeTags.TELEPORTING_NOT_SUPPORTED); } } 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 80% 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 f17b4b71a..057258cb7 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 @@ -23,9 +23,9 @@ 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.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); } @@ -36,5 +36,8 @@ public class FluidTagGenerator extends FabricTagProvider.FluidTagProvider { .addOptionalTag(FluidTags.WATER); getOrCreateTagBuilder(ConventionalFluidTags.LAVA) .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 new file mode 100644 index 000000000..f84d1fde4 --- /dev/null +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -0,0 +1,628 @@ +/* + * 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.item.ItemConvertible; +import net.minecraft.item.Items; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.tag.ItemTags; +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 final class ItemTagGenerator extends FabricTagProvider.ItemTagProvider { + public ItemTagGenerator(FabricDataOutput output, CompletableFuture completableFuture, FabricTagProvider.BlockTagProvider blockTags) { + super(output, completableFuture, blockTags); + } + + @Override + protected void configure(RegistryWrapper.WrapperLookup arg) { + generateToolTags(); + generateBucketTags(); + generateOreAndRelatedTags(); + generateConsumableTags(); + generateFoodTags(); + generateDyeTags(); + generateDyedTags(); + generateVillagerJobSites(); + generateOtherTags(); + copyItemTags(); + generateBackwardsCompatTags(); + } + + 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); + copy(ConventionalBlockTags.CHESTS, ConventionalItemTags.CHESTS); + copy(ConventionalBlockTags.WOODEN_CHESTS, ConventionalItemTags.WOODEN_CHESTS); + copy(ConventionalBlockTags.GLASS_BLOCKS, ConventionalItemTags.GLASS_BLOCKS); + copy(ConventionalBlockTags.GLASS_PANES, ConventionalItemTags.GLASS_PANES); + copy(ConventionalBlockTags.SHULKER_BOXES, ConventionalItemTags.SHULKER_BOXES); + + 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.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.STORAGE_BLOCKS, ConventionalItemTags.STORAGE_BLOCKS); + 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); + 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() { + getOrCreateTagBuilder(ConventionalItemTags.DYES) + .addOptionalTag(ConventionalItemTags.WHITE_DYES) + .addOptionalTag(ConventionalItemTags.ORANGE_DYES) + .addOptionalTag(ConventionalItemTags.MAGENTA_DYES) + .addOptionalTag(ConventionalItemTags.LIGHT_BLUE_DYES) + .addOptionalTag(ConventionalItemTags.YELLOW_DYES) + .addOptionalTag(ConventionalItemTags.LIME_DYES) + .addOptionalTag(ConventionalItemTags.PINK_DYES) + .addOptionalTag(ConventionalItemTags.GRAY_DYES) + .addOptionalTag(ConventionalItemTags.LIGHT_GRAY_DYES) + .addOptionalTag(ConventionalItemTags.CYAN_DYES) + .addOptionalTag(ConventionalItemTags.PURPLE_DYES) + .addOptionalTag(ConventionalItemTags.BLUE_DYES) + .addOptionalTag(ConventionalItemTags.BROWN_DYES) + .addOptionalTag(ConventionalItemTags.GREEN_DYES) + .addOptionalTag(ConventionalItemTags.RED_DYES) + .addOptionalTag(ConventionalItemTags.BLACK_DYES); + getOrCreateTagBuilder(ConventionalItemTags.BLACK_DYES) + .add(Items.BLACK_DYE); + getOrCreateTagBuilder(ConventionalItemTags.BLUE_DYES) + .add(Items.BLUE_DYE); + getOrCreateTagBuilder(ConventionalItemTags.BROWN_DYES) + .add(Items.BROWN_DYE); + getOrCreateTagBuilder(ConventionalItemTags.GREEN_DYES) + .add(Items.GREEN_DYE); + getOrCreateTagBuilder(ConventionalItemTags.RED_DYES) + .add(Items.RED_DYE); + getOrCreateTagBuilder(ConventionalItemTags.WHITE_DYES) + .add(Items.WHITE_DYE); + getOrCreateTagBuilder(ConventionalItemTags.YELLOW_DYES) + .add(Items.YELLOW_DYE); + getOrCreateTagBuilder(ConventionalItemTags.LIGHT_BLUE_DYES) + .add(Items.LIGHT_BLUE_DYE); + getOrCreateTagBuilder(ConventionalItemTags.LIGHT_GRAY_DYES) + .add(Items.LIGHT_GRAY_DYE); + getOrCreateTagBuilder(ConventionalItemTags.LIME_DYES) + .add(Items.LIME_DYE); + getOrCreateTagBuilder(ConventionalItemTags.MAGENTA_DYES) + .add(Items.MAGENTA_DYE); + getOrCreateTagBuilder(ConventionalItemTags.ORANGE_DYES) + .add(Items.ORANGE_DYE); + getOrCreateTagBuilder(ConventionalItemTags.PINK_DYES) + .add(Items.PINK_DYE); + getOrCreateTagBuilder(ConventionalItemTags.CYAN_DYES) + .add(Items.CYAN_DYE); + getOrCreateTagBuilder(ConventionalItemTags.GRAY_DYES) + .add(Items.GRAY_DYE); + getOrCreateTagBuilder(ConventionalItemTags.PURPLE_DYES) + .add(Items.PURPLE_DYE); + } + + private void generateConsumableTags() { + getOrCreateTagBuilder(ConventionalItemTags.POTIONS) + .add(Items.POTION) + .add(Items.SPLASH_POTION) + .add(Items.LINGERING_POTION); + } + + 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.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) + .add(Items.RABBIT) + .add(Items.MUTTON); + + getOrCreateTagBuilder(ConventionalItemTags.RAW_FISHES_FOODS) + .add(Items.COD) + .add(Items.SALMON) + .add(Items.TROPICAL_FISH) + .add(Items.PUFFERFISH); + + getOrCreateTagBuilder(ConventionalItemTags.COOKED_MEATS_FOODS) + .add(Items.COOKED_BEEF) + .add(Items.COOKED_CHICKEN) + .add(Items.COOKED_RABBIT) + .add(Items.COOKED_MUTTON); + + getOrCreateTagBuilder(ConventionalItemTags.COOKED_FISHES_FOODS) + .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.CANDIES_FOODS); + + getOrCreateTagBuilder(ConventionalItemTags.EDIBLE_WHEN_PLACED_FOODS) + .add(Items.CAKE); + + getOrCreateTagBuilder(ConventionalItemTags.FOOD_POISONING_FOODS) + .add(Items.POISONOUS_POTATO) + .add(Items.PUFFERFISH) + .add(Items.SPIDER_EYE) + .add(Items.CHICKEN) + .add(Items.ROTTEN_FLESH); + + getOrCreateTagBuilder(ConventionalItemTags.FOODS) + .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) + .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.SOUPS_FOODS) + .addOptionalTag(ConventionalItemTags.CANDIES_FOODS) + .addOptionalTag(ConventionalItemTags.EDIBLE_WHEN_PLACED_FOODS) + .addOptionalTag(ConventionalItemTags.FOOD_POISONING_FOODS); + } + + private void generateBucketTags() { + getOrCreateTagBuilder(ConventionalItemTags.EMPTY_BUCKETS) + .add(Items.BUCKET); + getOrCreateTagBuilder(ConventionalItemTags.LAVA_BUCKETS) + .add(Items.LAVA_BUCKET); + getOrCreateTagBuilder(ConventionalItemTags.ENTITY_WATER_BUCKETS) + .add(Items.AXOLOTL_BUCKET) + .add(Items.COD_BUCKET) + .add(Items.PUFFERFISH_BUCKET) + .add(Items.TADPOLE_BUCKET) + .add(Items.TROPICAL_FISH_BUCKET) + .add(Items.SALMON_BUCKET); + getOrCreateTagBuilder(ConventionalItemTags.WATER_BUCKETS) + .add(Items.WATER_BUCKET); + getOrCreateTagBuilder(ConventionalItemTags.MILK_BUCKETS) + .add(Items.MILK_BUCKET); + } + + private void generateOreAndRelatedTags() { + // Categories + getOrCreateTagBuilder(ConventionalItemTags.BRICKS) + .addOptionalTag(ConventionalItemTags.NORMAL_BRICKS) + .addOptionalTag(ConventionalItemTags.NETHER_BRICKS); + getOrCreateTagBuilder(ConventionalItemTags.DUSTS) + .addOptionalTag(ConventionalItemTags.GLOWSTONE_DUSTS) + .addOptionalTag(ConventionalItemTags.REDSTONE_DUSTS); + getOrCreateTagBuilder(ConventionalItemTags.GEMS) + .addOptionalTag(ConventionalItemTags.AMETHYST_GEMS) + .addOptionalTag(ConventionalItemTags.DIAMOND_GEMS) + .addOptionalTag(ConventionalItemTags.EMERALD_GEMS) + .addOptionalTag(ConventionalItemTags.LAPIS_GEMS) + .addOptionalTag(ConventionalItemTags.PRISMARINE_GEMS) + .addOptionalTag(ConventionalItemTags.QUARTZ_GEMS); + getOrCreateTagBuilder(ConventionalItemTags.INGOTS) + .addOptionalTag(ConventionalItemTags.COPPER_INGOTS) + .addOptionalTag(ConventionalItemTags.IRON_INGOTS) + .addOptionalTag(ConventionalItemTags.GOLD_INGOTS) + .addOptionalTag(ConventionalItemTags.NETHERITE_INGOTS); + getOrCreateTagBuilder(ConventionalItemTags.NUGGETS) + .add(Items.GOLD_NUGGET, Items.IRON_NUGGET); + copy(ConventionalBlockTags.ORES, ConventionalItemTags.ORES); + getOrCreateTagBuilder(ConventionalItemTags.ORES) + .addOptionalTag(ConventionalItemTags.NETHERITE_SCRAP_ORES) + .addOptionalTag(ConventionalItemTags.QUARTZ_ORES); + getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS) + .addOptionalTag(ConventionalItemTags.COPPER_RAW_MATERIALS) + .addOptionalTag(ConventionalItemTags.GOLD_RAW_MATERIALS) + .addOptionalTag(ConventionalItemTags.IRON_RAW_MATERIALS); + getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS) + .addOptionalTag(ConventionalItemTags.COPPER_RAW_MATERIALS) + .addOptionalTag(ConventionalItemTags.IRON_RAW_MATERIALS) + .addOptionalTag(ConventionalItemTags.GOLD_RAW_MATERIALS); + getOrCreateTagBuilder(ConventionalItemTags.RAW_BLOCKS) + .addOptionalTag(ConventionalItemTags.COPPER_RAW_BLOCKS) + .addOptionalTag(ConventionalItemTags.GOLD_RAW_BLOCKS) + .addOptionalTag(ConventionalItemTags.IRON_RAW_BLOCKS); + + // Vanilla instances + getOrCreateTagBuilder(ConventionalItemTags.NORMAL_BRICKS) + .add(Items.BRICK); + getOrCreateTagBuilder(ConventionalItemTags.NETHER_BRICKS) + .add(Items.NETHER_BRICK); + + getOrCreateTagBuilder(ConventionalItemTags.IRON_INGOTS) + .add(Items.IRON_INGOT); + getOrCreateTagBuilder(ConventionalItemTags.COPPER_INGOTS) + .add(Items.COPPER_INGOT); + getOrCreateTagBuilder(ConventionalItemTags.GOLD_INGOTS) + .add(Items.GOLD_INGOT); + getOrCreateTagBuilder(ConventionalItemTags.NETHERITE_INGOTS) + .add(Items.NETHERITE_INGOT); + + getOrCreateTagBuilder(ConventionalItemTags.IRON_RAW_BLOCKS) + .add(Items.RAW_IRON_BLOCK); + getOrCreateTagBuilder(ConventionalItemTags.COPPER_RAW_BLOCKS) + .add(Items.RAW_COPPER_BLOCK); + getOrCreateTagBuilder(ConventionalItemTags.GOLD_RAW_BLOCKS) + .add(Items.RAW_GOLD_BLOCK); + + getOrCreateTagBuilder(ConventionalItemTags.IRON_RAW_MATERIALS) + .add(Items.RAW_IRON); + getOrCreateTagBuilder(ConventionalItemTags.COPPER_RAW_MATERIALS) + .add(Items.RAW_COPPER); + getOrCreateTagBuilder(ConventionalItemTags.GOLD_RAW_MATERIALS) + .add(Items.RAW_GOLD); + + getOrCreateTagBuilder(ConventionalItemTags.REDSTONE_DUSTS) + .add(Items.REDSTONE); + getOrCreateTagBuilder(ConventionalItemTags.GLOWSTONE_DUSTS) + .add(Items.GLOWSTONE_DUST); + getOrCreateTagBuilder(ConventionalItemTags.COAL) + .addOptionalTag(ItemTags.COALS); + + getOrCreateTagBuilder(ConventionalItemTags.QUARTZ_ORES) + .add(Items.NETHER_QUARTZ_ORE); + getOrCreateTagBuilder(ConventionalItemTags.NETHERITE_SCRAP_ORES) + .add(Items.ANCIENT_DEBRIS); + + getOrCreateTagBuilder(ConventionalItemTags.QUARTZ_GEMS) + .add(Items.QUARTZ); + getOrCreateTagBuilder(ConventionalItemTags.EMERALD_GEMS) + .add(Items.EMERALD); + getOrCreateTagBuilder(ConventionalItemTags.LAPIS_GEMS) + .add(Items.LAPIS_LAZULI); + getOrCreateTagBuilder(ConventionalItemTags.DIAMOND_GEMS) + .add(Items.DIAMOND); + getOrCreateTagBuilder(ConventionalItemTags.AMETHYST_GEMS) + .add(Items.AMETHYST_SHARD); + getOrCreateTagBuilder(ConventionalItemTags.PRISMARINE_GEMS) + .add(Items.PRISMARINE_CRYSTALS); + } + + 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.BRUSHES_TOOLS) + .addOptionalTag(ConventionalItemTags.CROSSBOWS_TOOLS) + .addOptionalTag(ConventionalItemTags.FISHING_RODS_TOOLS) + .addOptionalTag(ConventionalItemTags.SHEARS_TOOLS) + .addOptionalTag(ConventionalItemTags.SHIELDS_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); + getOrCreateTagBuilder(ConventionalItemTags.CROSSBOWS_TOOLS) + .add(Items.CROSSBOW); + getOrCreateTagBuilder(ConventionalItemTags.SHEARS_TOOLS) + .add(Items.SHEARS); + getOrCreateTagBuilder(ConventionalItemTags.SHIELDS_TOOLS) + .add(Items.SHIELD); + getOrCreateTagBuilder(ConventionalItemTags.SPEARS_TOOLS) + .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) + .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); + + getOrCreateTagBuilder(ConventionalItemTags.ARMORS) + .addOptionalTag(ItemTags.HEAD_ARMOR) + .addOptionalTag(ItemTags.CHEST_ARMOR) + .addOptionalTag(ItemTags.LEG_ARMOR) + .addOptionalTag(ItemTags.FOOT_ARMOR); + + getOrCreateTagBuilder(ConventionalItemTags.ENCHANTABLES) + .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() { + BlockTagGenerator.VILLAGER_JOB_SITE_BLOCKS.stream() + .map(ItemConvertible::asItem) + .distinct() // cauldron blocks have the same item + .forEach(getOrCreateTagBuilder(ConventionalItemTags.VILLAGER_JOB_SITES)::add); + } + + 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); + + getOrCreateTagBuilder(ConventionalItemTags.WOODEN_RODS) + .add(Items.STICK); + + 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.BREEZE_RODS); + + getOrCreateTagBuilder(ConventionalItemTags.ROPES); // Generate tag so others can see it exists through JSON. + + 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() { + // Cannot pull entries from block tag because Wall Banners do not have an item form + 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) + .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) + .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) + .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) + .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) + .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) + .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) + .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) + .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) + .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) + .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) + .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) + .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) + .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) + .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) + .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) + .addTag(ConventionalItemTags.WHITE_DYED) + .addTag(ConventionalItemTags.ORANGE_DYED) + .addTag(ConventionalItemTags.MAGENTA_DYED) + .addTag(ConventionalItemTags.LIGHT_BLUE_DYED) + .addTag(ConventionalItemTags.YELLOW_DYED) + .addTag(ConventionalItemTags.LIME_DYED) + .addTag(ConventionalItemTags.PINK_DYED) + .addTag(ConventionalItemTags.GRAY_DYED) + .addTag(ConventionalItemTags.LIGHT_GRAY_DYED) + .addTag(ConventionalItemTags.CYAN_DYED) + .addTag(ConventionalItemTags.PURPLE_DYED) + .addTag(ConventionalItemTags.BLUE_DYED) + .addTag(ConventionalItemTags.BROWN_DYED) + .addTag(ConventionalItemTags.GREEN_DYED) + .addTag(ConventionalItemTags.RED_DYED) + .addTag(ConventionalItemTags.BLACK_DYED); + } + + 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.WOODEN_BARRELS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "wooden_barrels")); + getOrCreateTagBuilder(ConventionalItemTags.WOODEN_CHESTS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "wooden_chests")); + 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.GLOWSTONE_DUSTS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "glowstone_dusts")); + getOrCreateTagBuilder(ConventionalItemTags.REDSTONE_DUSTS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "redstone_dusts")); + 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")); + getOrCreateTagBuilder(ConventionalItemTags.STRINGS).addOptionalTag(new Identifier(TagUtil.C_TAG_NAMESPACE, "strings")); + } +} 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 000000000..487bec19f --- /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-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 3b4bc448a..45fa2a6a5 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/data/c/tags/blocks/barrels.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/barrels.json new file mode 100644 index 000000000..5e84e807f --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/barrels.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#c:barrels/wooden" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..e4ce49d85 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/barrels/wooden.json @@ -0,0 +1,9 @@ +{ + "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/c/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-v1/src/generated/resources/data/c/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-v1/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 similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/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-v1/src/generated/resources/data/c/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-v1/src/generated/resources/data/c/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/c/tags/blocks/chains.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chains.json new file mode 100644 index 000000000..63bbe5b42 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chains.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:chain" + ] +} \ 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 new file mode 100644 index 000000000..d1092146b --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#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 000000000..7c5abdaf3 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests/wooden.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:chest", + "minecraft:trapped_chest", + { + "id": "#c:wooden_chests", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/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-v1/src/generated/resources/data/c/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/cobblestones.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/cobblestones.json new file mode 100644 index 000000000..9efe7a63e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/cobblestones.json @@ -0,0 +1,8 @@ +{ + "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/blocks/dyed.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed.json new file mode 100644 index 000000000..ad4584578 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed.json @@ -0,0 +1,20 @@ +{ + "values": [ + "#c:dyed/white", + "#c:dyed/orange", + "#c:dyed/magenta", + "#c:dyed/light_blue", + "#c:dyed/yellow", + "#c:dyed/lime", + "#c:dyed/pink", + "#c:dyed/gray", + "#c:dyed/light_gray", + "#c:dyed/cyan", + "#c:dyed/purple", + "#c:dyed/blue", + "#c:dyed/brown", + "#c:dyed/green", + "#c:dyed/red", + "#c:dyed/black" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..d751a8001 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/black.json @@ -0,0 +1,17 @@ +{ + "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_wall_banner", + "minecraft:black_wool" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..6aa844045 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/blue.json @@ -0,0 +1,17 @@ +{ + "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_wall_banner", + "minecraft:blue_wool" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..b8307f724 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/brown.json @@ -0,0 +1,17 @@ +{ + "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_wall_banner", + "minecraft:brown_wool" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..6e5c8123b --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/cyan.json @@ -0,0 +1,17 @@ +{ + "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_wall_banner", + "minecraft:cyan_wool" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..f71d3c825 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/gray.json @@ -0,0 +1,17 @@ +{ + "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_wall_banner", + "minecraft:gray_wool" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..55e2fb08a --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/green.json @@ -0,0 +1,17 @@ +{ + "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_wall_banner", + "minecraft:green_wool" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..c13fe22e4 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/light_blue.json @@ -0,0 +1,17 @@ +{ + "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_wall_banner", + "minecraft:light_blue_wool" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..ec0eb75bf --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/light_gray.json @@ -0,0 +1,17 @@ +{ + "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_wall_banner", + "minecraft:light_gray_wool" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..5a32316c6 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/lime.json @@ -0,0 +1,17 @@ +{ + "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_wall_banner", + "minecraft:lime_wool" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..98aee6c88 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/magenta.json @@ -0,0 +1,17 @@ +{ + "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_wall_banner", + "minecraft:magenta_wool" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..22d7b60a3 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/orange.json @@ -0,0 +1,17 @@ +{ + "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_wall_banner", + "minecraft:orange_wool" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..c45b47d69 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/pink.json @@ -0,0 +1,17 @@ +{ + "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_wall_banner", + "minecraft:pink_wool" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..1d8bd2dcf --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/purple.json @@ -0,0 +1,17 @@ +{ + "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_wall_banner", + "minecraft:purple_wool" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..8e900dcea --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/red.json @@ -0,0 +1,17 @@ +{ + "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_wall_banner", + "minecraft:red_wool" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..e534cdf69 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/white.json @@ -0,0 +1,17 @@ +{ + "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_wall_banner", + "minecraft:white_wool" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..9086f0dd8 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/dyed/yellow.json @@ -0,0 +1,17 @@ +{ + "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_wall_banner", + "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-v2/src/generated/resources/data/c/tags/blocks/glass_blocks.json similarity index 89% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/glass_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/glass_blocks.json index eac52ebd9..bb30a2333 100644 --- a/fabric-convention-tags-v1/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 @@ -1,22 +1,22 @@ { "values": [ "minecraft:glass", - "minecraft:gray_stained_glass", - "minecraft:black_stained_glass", - "minecraft:orange_stained_glass", - "minecraft:blue_stained_glass", - "minecraft:brown_stained_glass", - "minecraft:cyan_stained_glass", - "minecraft:green_stained_glass", - "minecraft:light_blue_stained_glass", - "minecraft:light_gray_stained_glass", - "minecraft:lime_stained_glass", - "minecraft:magenta_stained_glass", - "minecraft:pink_stained_glass", - "minecraft:purple_stained_glass", - "minecraft:red_stained_glass", "minecraft:tinted_glass", "minecraft:white_stained_glass", - "minecraft:yellow_stained_glass" + "minecraft:orange_stained_glass", + "minecraft:magenta_stained_glass", + "minecraft:light_blue_stained_glass", + "minecraft:yellow_stained_glass", + "minecraft:lime_stained_glass", + "minecraft:pink_stained_glass", + "minecraft:gray_stained_glass", + "minecraft:light_gray_stained_glass", + "minecraft:cyan_stained_glass", + "minecraft:purple_stained_glass", + "minecraft:blue_stained_glass", + "minecraft:brown_stained_glass", + "minecraft:green_stained_glass", + "minecraft:black_stained_glass", + "minecraft:red_stained_glass" ] } \ 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-v2/src/generated/resources/data/c/tags/blocks/glass_panes.json similarity index 88% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/glass_panes.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/glass_panes.json index a9ed2b59f..93eeba400 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/glass_panes.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/glass_panes.json @@ -1,21 +1,21 @@ { "values": [ "minecraft:glass_pane", - "minecraft:gray_stained_glass_pane", - "minecraft:black_stained_glass_pane", + "minecraft:white_stained_glass_pane", "minecraft:orange_stained_glass_pane", + "minecraft:magenta_stained_glass_pane", + "minecraft:light_blue_stained_glass_pane", + "minecraft:yellow_stained_glass_pane", + "minecraft:lime_stained_glass_pane", + "minecraft:pink_stained_glass_pane", + "minecraft:gray_stained_glass_pane", + "minecraft:light_gray_stained_glass_pane", + "minecraft:cyan_stained_glass_pane", + "minecraft:purple_stained_glass_pane", "minecraft:blue_stained_glass_pane", "minecraft:brown_stained_glass_pane", - "minecraft:cyan_stained_glass_pane", "minecraft:green_stained_glass_pane", - "minecraft:light_blue_stained_glass_pane", - "minecraft:light_gray_stained_glass_pane", - "minecraft:lime_stained_glass_pane", - "minecraft:magenta_stained_glass_pane", - "minecraft:pink_stained_glass_pane", - "minecraft:purple_stained_glass_pane", - "minecraft:red_stained_glass_pane", - "minecraft:white_stained_glass_pane", - "minecraft:yellow_stained_glass_pane" + "minecraft:black_stained_glass_pane", + "minecraft:red_stained_glass_pane" ] } \ 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-v2/src/generated/resources/data/c/tags/blocks/hidden_from_recipe_viewers.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-v2/src/generated/resources/data/c/tags/blocks/hidden_from_recipe_viewers.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/ores.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores.json similarity index 86% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/ores.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores.json index 2cd9e8328..511230c3d 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/ores.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores.json @@ -1,13 +1,21 @@ { "values": [ { - "id": "#minecraft:redstone_ores", + "id": "#minecraft:coal_ores", "required": false }, { "id": "#minecraft:copper_ores", "required": false }, + { + "id": "#minecraft:diamond_ores", + "required": false + }, + { + "id": "#minecraft:emerald_ores", + "required": false + }, { "id": "#minecraft:gold_ores", "required": false @@ -16,24 +24,20 @@ "id": "#minecraft:iron_ores", "required": false }, - { - "id": "#minecraft:coal_ores", - "required": false - }, - { - "id": "#minecraft:emerald_ores", - "required": false - }, { "id": "#minecraft:lapis_ores", "required": false }, { - "id": "#minecraft:diamond_ores", + "id": "#c:ores/netherite_scrap", "required": false }, { - "id": "#c:quartz_ores", + "id": "#minecraft:redstone_ores", + "required": false + }, + { + "id": "#c:ores/quartz", "required": false } ] 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 new file mode 100644 index 000000000..910d1fb8e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores/netherite_scrap.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:ancient_debris" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..c2416f799 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ores/quartz.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:nether_quartz_ore", + { + "id": "#c:quartz_ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/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 000000000..3be1c8e22 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/player_workstations/crafting_tables.json @@ -0,0 +1,5 @@ +{ + "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 000000000..25edfef1c --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/player_workstations/furnaces.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:furnace" + ] +} \ 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-v2/src/generated/resources/data/c/tags/blocks/relocation_not_supported.json similarity index 60% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mountain.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/relocation_not_supported.json index 93d3e9e34..b92713dec 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/mountain.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/relocation_not_supported.json @@ -1,7 +1,7 @@ { "values": [ { - "id": "#minecraft:is_mountain", + "id": "#c:movement_restricted", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/end_islands.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ropes.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/end_islands.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/ropes.json 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 new file mode 100644 index 000000000..871827ea2 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/blocks.json @@ -0,0 +1,16 @@ +{ + "values": [ + { + "id": "#c:sandstone/uncolored_blocks", + "required": false + }, + { + "id": "#c: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-v2/src/generated/resources/data/c/tags/blocks/sandstone/red_blocks.json similarity index 52% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/red_sandstone_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/red_blocks.json index ad016c2e1..996a04077 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/red_sandstone_blocks.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/red_blocks.json @@ -1,8 +1,12 @@ { "values": [ "minecraft:red_sandstone", - "minecraft:chiseled_red_sandstone", "minecraft:cut_red_sandstone", - "minecraft:smooth_red_sandstone" + "minecraft:smooth_red_sandstone", + "minecraft:chiseled_red_sandstone", + { + "id": "#c:red_sandstone_blocks", + "required": false + } ] } \ No newline at end of file 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 new file mode 100644 index 000000000..38a99cb4f --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/red_slabs.json @@ -0,0 +1,11 @@ +{ + "values": [ + "minecraft:red_sandstone_slab", + "minecraft:cut_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-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 new file mode 100644 index 000000000..581969f2b --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/red_stairs.json @@ -0,0 +1,10 @@ +{ + "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-v2/src/generated/resources/data/c/tags/blocks/sandstone/slabs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/slabs.json new file mode 100644 index 000000000..1dc38421a --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/slabs.json @@ -0,0 +1,16 @@ +{ + "values": [ + { + "id": "#c:sandstone/uncolored_slabs", + "required": false + }, + { + "id": "#c:sandstone/red_slabs", + "required": false + }, + { + "id": "#c:sandstone_slabs", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..b01cb4a76 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/stairs.json @@ -0,0 +1,16 @@ +{ + "values": [ + { + "id": "#c:sandstone/uncolored_stairs", + "required": false + }, + { + "id": "#c: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-v2/src/generated/resources/data/c/tags/blocks/sandstone/uncolored_blocks.json similarity index 50% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/uncolored_sandstone_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/uncolored_blocks.json index aca09d465..83d82e02d 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/uncolored_sandstone_blocks.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/uncolored_blocks.json @@ -1,8 +1,12 @@ { "values": [ "minecraft:sandstone", - "minecraft:chiseled_sandstone", "minecraft:cut_sandstone", - "minecraft:smooth_sandstone" + "minecraft:smooth_sandstone", + "minecraft:chiseled_sandstone", + { + "id": "#c:uncolored_sandstone_blocks", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/uncolored_slabs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/uncolored_slabs.json new file mode 100644 index 000000000..2b78d3659 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/uncolored_slabs.json @@ -0,0 +1,11 @@ +{ + "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-v2/src/generated/resources/data/c/tags/blocks/sandstone/uncolored_stairs.json similarity index 57% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/sandstone_stairs.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/uncolored_stairs.json index b881ac9dc..fcfa8ed20 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/sandstone_stairs.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/sandstone/uncolored_stairs.json @@ -1,12 +1,10 @@ { "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-v2/src/generated/resources/data/c/tags/blocks/shulker_boxes.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/shulker_boxes.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/shulker_boxes.json index 50ef39ce1..8ffa83c15 100644 --- a/fabric-convention-tags-v1/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 @@ -1,21 +1,21 @@ { "values": [ "minecraft:shulker_box", + "minecraft:white_shulker_box", + "minecraft:orange_shulker_box", + "minecraft:magenta_shulker_box", + "minecraft:light_blue_shulker_box", + "minecraft:yellow_shulker_box", + "minecraft:lime_shulker_box", + "minecraft:pink_shulker_box", + "minecraft:gray_shulker_box", + "minecraft:light_gray_shulker_box", + "minecraft:cyan_shulker_box", + "minecraft:purple_shulker_box", "minecraft:blue_shulker_box", "minecraft:brown_shulker_box", - "minecraft:cyan_shulker_box", - "minecraft:gray_shulker_box", "minecraft:green_shulker_box", - "minecraft:light_blue_shulker_box", - "minecraft:light_gray_shulker_box", - "minecraft:lime_shulker_box", - "minecraft:magenta_shulker_box", - "minecraft:orange_shulker_box", - "minecraft:pink_shulker_box", - "minecraft:purple_shulker_box", "minecraft:red_shulker_box", - "minecraft:white_shulker_box", - "minecraft:yellow_shulker_box", "minecraft:black_shulker_box" ] } \ No newline at end of file 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 new file mode 100644 index 000000000..a9820b074 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/skulls.json @@ -0,0 +1,18 @@ +{ + "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/blocks/stones.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/stones.json new file mode 100644 index 000000000..9f3ad2cfd --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/stones.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:stone", + "minecraft:andesite", + "minecraft:diorite", + "minecraft:granite", + "minecraft:tuff", + "minecraft:deepslate" + ] +} \ No newline at end of file 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 000000000..b7696bea1 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks.json @@ -0,0 +1,20 @@ +{ + "values": [ + "#c:storage_blocks/bone_meal", + "#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/bone_meal.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/bone_meal.json new file mode 100644 index 000000000..98ab24a21 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/bone_meal.json @@ -0,0 +1,5 @@ +{ + "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 000000000..4b7921705 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/coal.json @@ -0,0 +1,5 @@ +{ + "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 000000000..015bec70c --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/copper.json @@ -0,0 +1,5 @@ +{ + "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 000000000..acd7f52de --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/diamond.json @@ -0,0 +1,5 @@ +{ + "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 000000000..260965642 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/dried_kelp.json @@ -0,0 +1,5 @@ +{ + "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 000000000..152063ec6 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/emerald.json @@ -0,0 +1,5 @@ +{ + "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 000000000..546dde03c --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/gold.json @@ -0,0 +1,5 @@ +{ + "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 000000000..01fb2965f --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/iron.json @@ -0,0 +1,5 @@ +{ + "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 000000000..f4ca82bbd --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/lapis.json @@ -0,0 +1,5 @@ +{ + "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 000000000..83433d44e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/netherite.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:netherite_block" + ] +} \ 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-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/raw_copper.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_copper_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/raw_copper.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_gold_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/raw_gold.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_gold_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/raw_gold.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_iron_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/raw_iron.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_iron_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/raw_iron.json 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 000000000..f5fd89c54 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/redstone.json @@ -0,0 +1,5 @@ +{ + "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 000000000..523bdc283 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/slime.json @@ -0,0 +1,5 @@ +{ + "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 000000000..ea92d03cb --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/storage_blocks/wheat.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:hay_block" + ] +} \ 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-v2/src/generated/resources/data/c/tags/blocks/villager_job_sites.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/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/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 new file mode 100644 index 000000000..18527f1e0 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_auxiliary_movement_enhancements.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:feather_falling", + "minecraft:frost_walker" + ] +} \ 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-v2/src/generated/resources/data/c/tags/enchantment/entity_defense_enhancement.json similarity index 71% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/entity_defense_enhancement.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_defense_enhancement.json index c5335f1c4..2af6d192e 100644 --- a/fabric-convention-tags-v1/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,10 +1,10 @@ { "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_enhancements.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_speed_enhancements.json new file mode 100644 index 000000000..c8eb636ba --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/entity_speed_enhancements.json @@ -0,0 +1,11 @@ +{ + "values": [ + "minecraft:soul_speed", + "minecraft:swift_sneak", + "minecraft:depth_strider", + { + "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/enchantment/fortune.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/increase_block_drops.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/fortune.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/increase_block_drops.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/looting.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/increase_entity_drops.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/enchantment/looting.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/increase_entity_drops.json diff --git a/fabric-convention-tags-v1/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 66% rename from fabric-convention-tags-v1/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 index 167fae322..c60666e38 100644 --- a/fabric-convention-tags-v1/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 @@ -1,9 +1,9 @@ { "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 diff --git a/fabric-convention-tags-v1/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 similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/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-v1/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 similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/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-v1/src/generated/resources/data/c/tags/worldgen/biome/wasteland.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-v1/src/generated/resources/data/c/tags/worldgen/biome/wasteland.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-v1/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 similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/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/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 000000000..f72d209df --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_types/teleporting_not_supported.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/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 000000000..f72d209df --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/hidden_from_recipe_viewers.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/fluids/honey.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/honey.json new file mode 100644 index 000000000..f72d209df --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/honey.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ 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-v2/src/generated/resources/data/c/tags/fluids/lava.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/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/c/tags/fluids/milk.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/milk.json new file mode 100644 index 000000000..f72d209df --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/fluids/milk.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ 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-v2/src/generated/resources/data/c/tags/fluids/water.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/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-v1/src/generated/resources/data/c/tags/worldgen/biome/vegetation_sparse.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/armors.json similarity index 53% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/vegetation_sparse.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/armors.json index 87a99b51e..dcc5f6625 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/vegetation_sparse.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/armors.json @@ -1,20 +1,19 @@ { "values": [ { - "id": "#c:savanna", + "id": "#minecraft:head_armor", "required": false }, { - "id": "#c:desert", + "id": "#minecraft:chest_armor", "required": false }, { - "id": "#c:dead", + "id": "#minecraft:leg_armor", "required": false }, - "minecraft:lush_caves", { - "id": "#c:wasteland", + "id": "#minecraft:foot_armor", "required": false } ] 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 new file mode 100644 index 000000000..5e84e807f --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#c:barrels/wooden" + ] +} \ 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-v2/src/generated/resources/data/c/tags/items/barrels/wooden.json similarity index 51% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/sandstone_slabs.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels/wooden.json index 72f7801bb..97a443783 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/sandstone_slabs.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels/wooden.json @@ -1,11 +1,12 @@ { "values": [ + "minecraft:barrel", { - "id": "#c:uncolored_sandstone_slabs", + "id": "#c:wooden_barrels", "required": false }, { - "id": "#c:red_sandstone_slabs", + "id": "#c:wooden_barrels", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/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-v1/src/generated/resources/data/c/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/c/tags/items/bricks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bricks.json new file mode 100644 index 000000000..c6ffebd0e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bricks.json @@ -0,0 +1,12 @@ +{ + "values": [ + { + "id": "#c:bricks/normal", + "required": false + }, + { + "id": "#c:bricks/nether", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..ec7ed3ee9 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bricks/nether.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:nether_brick" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..8f632e499 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/bricks/normal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:brick" + ] +} \ 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-v2/src/generated/resources/data/c/tags/items/buckets/empty.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/empty_buckets.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/empty.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/entity_water_buckets.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/entity_water.json similarity index 71% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/entity_water_buckets.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/entity_water.json index 7cecd62c1..480307618 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/entity_water_buckets.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/entity_water.json @@ -3,8 +3,8 @@ "minecraft:axolotl_bucket", "minecraft:cod_bucket", "minecraft:pufferfish_bucket", + "minecraft:tadpole_bucket", "minecraft:tropical_fish_bucket", - "minecraft:salmon_bucket", - "minecraft:tadpole_bucket" + "minecraft:salmon_bucket" ] } \ 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-v2/src/generated/resources/data/c/tags/items/buckets/lava.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/lava_buckets.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/lava.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/milk_buckets.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/milk.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/milk_buckets.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/milk.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/water_buckets.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/water.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/water_buckets.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/buckets/water.json diff --git a/fabric-convention-tags-v1/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 similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/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-v1/src/generated/resources/data/c/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-v1/src/generated/resources/data/c/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/c/tags/items/chains.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chains.json new file mode 100644 index 000000000..63bbe5b42 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chains.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:chain" + ] +} \ 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 new file mode 100644 index 000000000..d1092146b --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#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 000000000..a24680172 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests/wooden.json @@ -0,0 +1,14 @@ +{ + "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-v1/src/generated/resources/data/c/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-v1/src/generated/resources/data/c/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-v1/src/generated/resources/data/c/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-v1/src/generated/resources/data/c/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/c/tags/items/cobblestones.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/cobblestones.json new file mode 100644 index 000000000..9efe7a63e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/cobblestones.json @@ -0,0 +1,8 @@ +{ + "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/dusts.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts.json new file mode 100644 index 000000000..d0edbb6a1 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts.json @@ -0,0 +1,12 @@ +{ + "values": [ + { + "id": "#c:dusts/glowstone", + "required": false + }, + { + "id": "#c:dusts/redstone", + "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 new file mode 100644 index 000000000..3296e30a9 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/glowstone.json @@ -0,0 +1,9 @@ +{ + "values": [ + "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 new file mode 100644 index 000000000..2117ea4d9 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/redstone.json @@ -0,0 +1,9 @@ +{ + "values": [ + "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/dyed.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed.json new file mode 100644 index 000000000..ad4584578 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed.json @@ -0,0 +1,20 @@ +{ + "values": [ + "#c:dyed/white", + "#c:dyed/orange", + "#c:dyed/magenta", + "#c:dyed/light_blue", + "#c:dyed/yellow", + "#c:dyed/lime", + "#c:dyed/pink", + "#c:dyed/gray", + "#c:dyed/light_gray", + "#c:dyed/cyan", + "#c:dyed/purple", + "#c:dyed/blue", + "#c:dyed/brown", + "#c:dyed/green", + "#c:dyed/red", + "#c:dyed/black" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..174ba5e3c --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/black.json @@ -0,0 +1,16 @@ +{ + "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-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 new file mode 100644 index 000000000..ca4b83cd7 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/blue.json @@ -0,0 +1,16 @@ +{ + "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-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 new file mode 100644 index 000000000..502f5bcce --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/brown.json @@ -0,0 +1,16 @@ +{ + "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-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 new file mode 100644 index 000000000..f3e0d24c6 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/cyan.json @@ -0,0 +1,16 @@ +{ + "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-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 new file mode 100644 index 000000000..58a9ff354 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/gray.json @@ -0,0 +1,16 @@ +{ + "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-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 new file mode 100644 index 000000000..27dc84160 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/green.json @@ -0,0 +1,16 @@ +{ + "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-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 new file mode 100644 index 000000000..63e842c4e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/light_blue.json @@ -0,0 +1,16 @@ +{ + "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-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 new file mode 100644 index 000000000..5a46bc1a1 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/light_gray.json @@ -0,0 +1,16 @@ +{ + "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-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 new file mode 100644 index 000000000..56f424525 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/lime.json @@ -0,0 +1,16 @@ +{ + "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-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 new file mode 100644 index 000000000..f837aefc8 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/magenta.json @@ -0,0 +1,16 @@ +{ + "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-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 new file mode 100644 index 000000000..7fa2a7ef8 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/orange.json @@ -0,0 +1,16 @@ +{ + "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-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 new file mode 100644 index 000000000..7538cceb0 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/pink.json @@ -0,0 +1,16 @@ +{ + "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-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 new file mode 100644 index 000000000..61355c9ae --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/purple.json @@ -0,0 +1,16 @@ +{ + "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-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 new file mode 100644 index 000000000..252f4660e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/red.json @@ -0,0 +1,16 @@ +{ + "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-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 new file mode 100644 index 000000000..2e1979e81 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/white.json @@ -0,0 +1,16 @@ +{ + "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-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 new file mode 100644 index 000000000..0e353cc64 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyed/yellow.json @@ -0,0 +1,16 @@ +{ + "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-v2/src/generated/resources/data/c/tags/items/dyes.json similarity index 56% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/dyes.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes.json index 09b4b3d8c..bd2727291 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/dyes.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes.json @@ -1,67 +1,67 @@ { "values": [ { - "id": "#c:black_dyes", + "id": "#c:dyes/white", "required": false }, { - "id": "#c:blue_dyes", + "id": "#c:dyes/orange", "required": false }, { - "id": "#c:brown_dyes", + "id": "#c:dyes/magenta", "required": false }, { - "id": "#c:green_dyes", + "id": "#c:dyes/light_blue", "required": false }, { - "id": "#c:red_dyes", + "id": "#c:dyes/yellow", "required": false }, { - "id": "#c:white_dyes", + "id": "#c:dyes/lime", "required": false }, { - "id": "#c:yellow_dyes", + "id": "#c:dyes/pink", "required": false }, { - "id": "#c:light_gray_dyes", + "id": "#c:dyes/gray", "required": false }, { - "id": "#c:light_blue_dyes", + "id": "#c:dyes/light_gray", "required": false }, { - "id": "#c:lime_dyes", + "id": "#c:dyes/cyan", "required": false }, { - "id": "#c:magenta_dyes", + "id": "#c:dyes/purple", "required": false }, { - "id": "#c:orange_dyes", + "id": "#c:dyes/blue", "required": false }, { - "id": "#c:pink_dyes", + "id": "#c:dyes/brown", "required": false }, { - "id": "#c:cyan_dyes", + "id": "#c:dyes/green", "required": false }, { - "id": "#c:gray_dyes", + "id": "#c:dyes/red", "required": false }, { - "id": "#c:purple_dyes", + "id": "#c:dyes/black", "required": false } ] 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 new file mode 100644 index 000000000..affded127 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/black.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:black_dye", + { + "id": "#c:black_dyes", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..e14bd1a4d --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/blue.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:blue_dye", + { + "id": "#c:blue_dyes", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..e190092a9 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/brown.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:brown_dye", + { + "id": "#c:brown_dyes", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..3407ddaea --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/cyan.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:cyan_dye", + { + "id": "#c:cyan_dyes", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..1ba17b1d9 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/gray.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:gray_dye", + { + "id": "#c:gray_dyes", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..a04e63acc --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/green.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:green_dye", + { + "id": "#c:green_dyes", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..04dd002ec --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/light_blue.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:light_blue_dye", + { + "id": "#c:light_blue_dyes", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..25c7c0d47 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/light_gray.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:light_gray_dye", + { + "id": "#c:light_gray_dyes", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..5809417ee --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/lime.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:lime_dye", + { + "id": "#c:lime_dyes", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..fc3256c1d --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/magenta.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:magenta_dye", + { + "id": "#c:magenta_dyes", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..813536832 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/orange.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:orange_dye", + { + "id": "#c:orange_dyes", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..32c370358 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/pink.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:pink_dye", + { + "id": "#c:pink_dyes", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..67b1163e9 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/purple.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:purple_dye", + { + "id": "#c:purple_dyes", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..cc78a0e8b --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/red.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:red_dye", + { + "id": "#c:red_dyes", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..a44829794 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/white.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:white_dye", + { + "id": "#c:white_dyes", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..fd224f665 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dyes/yellow.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:yellow_dye", + { + "id": "#c:yellow_dyes", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/enchantables.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/enchantables.json new file mode 100644 index 000000000..82f724cbc --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/enchantables.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 new file mode 100644 index 000000000..a867fdccd --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods.json @@ -0,0 +1,61 @@ +{ + "values": [ + "minecraft:baked_potato", + "minecraft:pumpkin_pie", + "minecraft:honey_bottle", + "minecraft:ominous_bottle", + "minecraft:dried_kelp", + { + "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 + }, + { + "id": "#c:foods/raw_fishes", + "required": false + }, + { + "id": "#c:foods/cooked_meats", + "required": false + }, + { + "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 + }, + { + "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/berries.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/berries.json new file mode 100644 index 000000000..500bd9432 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/berries.json @@ -0,0 +1,6 @@ +{ + "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 000000000..7873bb3c3 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/breads.json @@ -0,0 +1,5 @@ +{ + "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 000000000..f72d209df --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/candies.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/items/foods/cooked_fishes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cooked_fishes.json new file mode 100644 index 000000000..4e459bea9 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cooked_fishes.json @@ -0,0 +1,6 @@ +{ + "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/foods/cooked_meats.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cooked_meats.json new file mode 100644 index 000000000..fe6f7f544 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cooked_meats.json @@ -0,0 +1,8 @@ +{ + "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/foods/cookies.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cookies.json new file mode 100644 index 000000000..a7c0dc91d --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/cookies.json @@ -0,0 +1,5 @@ +{ + "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 000000000..d1a45a922 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/edible_when_placed.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:cake" + ] +} \ 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 000000000..6b59df70e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/food_poisoning.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:poisonous_potato", + "minecraft:pufferfish", + "minecraft:spider_eye", + "minecraft:chicken", + "minecraft:rotten_flesh" + ] +} \ 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 000000000..895ad4a31 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/fruits.json @@ -0,0 +1,7 @@ +{ + "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/raw_fishes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/raw_fishes.json new file mode 100644 index 000000000..83d056aa4 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/raw_fishes.json @@ -0,0 +1,8 @@ +{ + "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/foods/raw_meats.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/raw_meats.json new file mode 100644 index 000000000..1c57ef56b --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/raw_meats.json @@ -0,0 +1,8 @@ +{ + "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/items/foods/soups.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/soups.json new file mode 100644 index 000000000..5a1a33924 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/soups.json @@ -0,0 +1,8 @@ +{ + "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 000000000..0476304c8 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/foods/vegetables.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:carrot", + "minecraft:golden_carrot", + "minecraft:potato", + "minecraft:melon_slice", + "minecraft:beetroot" + ] +} \ 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-v2/src/generated/resources/data/c/tags/items/gems.json similarity index 56% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_hot.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems.json index c6601e835..4174a54d7 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_hot.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems.json @@ -1,28 +1,27 @@ { "values": [ { - "id": "#c:jungle", + "id": "#c:gems/amethyst", "required": false }, { - "id": "#c:savanna", + "id": "#c:gems/diamond", "required": false }, { - "id": "#c:desert", + "id": "#c:gems/emerald", "required": false }, { - "id": "#c:badlands", - "required": false - }, - "minecraft:stony_peaks", - { - "id": "#c:mushroom", + "id": "#c:gems/lapis", "required": false }, { - "id": "#c:in_nether", + "id": "#c:gems/prismarine", + "required": false + }, + { + "id": "#c:gems/quartz", "required": false } ] 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 new file mode 100644 index 000000000..742ef896d --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/amethyst.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:amethyst_shard" + ] +} \ 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 new file mode 100644 index 000000000..fdf1d3712 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/diamond.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:diamond", + { + "id": "#c:diamonds", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..be8158a62 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/emerald.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:emerald", + { + "id": "#c:emeralds", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..3dbc7a77b --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/lapis.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:lapis_lazuli", + { + "id": "#c:lapis", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..150e7ff71 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/prismarine.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:prismarine_crystals" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..d03fdf616 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/gems/quartz.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:quartz", + { + "id": "#c:quartz", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/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 similarity index 89% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/glass_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/glass_blocks.json index eac52ebd9..bb30a2333 100644 --- a/fabric-convention-tags-v1/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 @@ -1,22 +1,22 @@ { "values": [ "minecraft:glass", - "minecraft:gray_stained_glass", - "minecraft:black_stained_glass", - "minecraft:orange_stained_glass", - "minecraft:blue_stained_glass", - "minecraft:brown_stained_glass", - "minecraft:cyan_stained_glass", - "minecraft:green_stained_glass", - "minecraft:light_blue_stained_glass", - "minecraft:light_gray_stained_glass", - "minecraft:lime_stained_glass", - "minecraft:magenta_stained_glass", - "minecraft:pink_stained_glass", - "minecraft:purple_stained_glass", - "minecraft:red_stained_glass", "minecraft:tinted_glass", "minecraft:white_stained_glass", - "minecraft:yellow_stained_glass" + "minecraft:orange_stained_glass", + "minecraft:magenta_stained_glass", + "minecraft:light_blue_stained_glass", + "minecraft:yellow_stained_glass", + "minecraft:lime_stained_glass", + "minecraft:pink_stained_glass", + "minecraft:gray_stained_glass", + "minecraft:light_gray_stained_glass", + "minecraft:cyan_stained_glass", + "minecraft:purple_stained_glass", + "minecraft:blue_stained_glass", + "minecraft:brown_stained_glass", + "minecraft:green_stained_glass", + "minecraft:black_stained_glass", + "minecraft:red_stained_glass" ] } \ 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-v2/src/generated/resources/data/c/tags/items/glass_panes.json similarity index 88% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/glass_panes.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/glass_panes.json index a9ed2b59f..93eeba400 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/glass_panes.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/glass_panes.json @@ -1,21 +1,21 @@ { "values": [ "minecraft:glass_pane", - "minecraft:gray_stained_glass_pane", - "minecraft:black_stained_glass_pane", + "minecraft:white_stained_glass_pane", "minecraft:orange_stained_glass_pane", + "minecraft:magenta_stained_glass_pane", + "minecraft:light_blue_stained_glass_pane", + "minecraft:yellow_stained_glass_pane", + "minecraft:lime_stained_glass_pane", + "minecraft:pink_stained_glass_pane", + "minecraft:gray_stained_glass_pane", + "minecraft:light_gray_stained_glass_pane", + "minecraft:cyan_stained_glass_pane", + "minecraft:purple_stained_glass_pane", "minecraft:blue_stained_glass_pane", "minecraft:brown_stained_glass_pane", - "minecraft:cyan_stained_glass_pane", "minecraft:green_stained_glass_pane", - "minecraft:light_blue_stained_glass_pane", - "minecraft:light_gray_stained_glass_pane", - "minecraft:lime_stained_glass_pane", - "minecraft:magenta_stained_glass_pane", - "minecraft:pink_stained_glass_pane", - "minecraft:purple_stained_glass_pane", - "minecraft:red_stained_glass_pane", - "minecraft:white_stained_glass_pane", - "minecraft:yellow_stained_glass_pane" + "minecraft:black_stained_glass_pane", + "minecraft:red_stained_glass_pane" ] } \ 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 000000000..f72d209df --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/hidden_from_recipe_viewers.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ 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-v2/src/generated/resources/data/c/tags/items/ingots.json similarity index 56% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_dry.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots.json index 1967caa48..680be1d0c 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_dry.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots.json @@ -1,19 +1,19 @@ { "values": [ { - "id": "#c:in_nether", + "id": "#c:ingots/copper", "required": false }, { - "id": "#c:badlands", + "id": "#c:ingots/iron", "required": false }, { - "id": "#c:desert", + "id": "#c:ingots/gold", "required": false }, { - "id": "#c:savanna", + "id": "#c:ingots/netherite", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/copper_ingots.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/copper.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/copper_ingots.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/copper.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/gold_ingots.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/gold.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/gold_ingots.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/gold.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/iron_ingots.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/iron.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/iron_ingots.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/iron.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/netherite_ingots.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/netherite.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/netherite_ingots.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ingots/netherite.json diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/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-v1/src/generated/resources/data/c/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-v1/src/generated/resources/data/c/tags/blocks/ores.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores.json similarity index 72% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/ores.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores.json index 2cd9e8328..551d210d5 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/ores.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores.json @@ -1,13 +1,21 @@ { "values": [ { - "id": "#minecraft:redstone_ores", + "id": "#minecraft:coal_ores", "required": false }, { "id": "#minecraft:copper_ores", "required": false }, + { + "id": "#minecraft:diamond_ores", + "required": false + }, + { + "id": "#minecraft:emerald_ores", + "required": false + }, { "id": "#minecraft:gold_ores", "required": false @@ -16,24 +24,28 @@ "id": "#minecraft:iron_ores", "required": false }, - { - "id": "#minecraft:coal_ores", - "required": false - }, - { - "id": "#minecraft:emerald_ores", - "required": false - }, { "id": "#minecraft:lapis_ores", "required": false }, { - "id": "#minecraft:diamond_ores", + "id": "#c:ores/netherite_scrap", "required": false }, { - "id": "#c:quartz_ores", + "id": "#minecraft:redstone_ores", + "required": false + }, + { + "id": "#c:ores/quartz", + "required": false + }, + { + "id": "#c:ores/netherite_scrap", + "required": false + }, + { + "id": "#c:ores/quartz", "required": false } ] 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 new file mode 100644 index 000000000..910d1fb8e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ores/netherite_scrap.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:ancient_debris" + ] +} \ 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-v2/src/generated/resources/data/c/tags/items/ores/quartz.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/quartz_ores.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/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 000000000..3be1c8e22 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/player_workstations/crafting_tables.json @@ -0,0 +1,5 @@ +{ + "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 000000000..25edfef1c --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/player_workstations/furnaces.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:furnace" + ] +} \ 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 new file mode 100644 index 000000000..592e0eb9d --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/potions.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:potion", + "minecraft:splash_potion", + "minecraft:lingering_potion" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_wet.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks.json similarity index 55% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_wet.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks.json index ffc6f8537..f2f79483b 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_wet.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks.json @@ -1,16 +1,15 @@ { "values": [ { - "id": "#c:aquatic", + "id": "#c:raw_blocks/copper", "required": false }, { - "id": "#c:swamp", + "id": "#c:raw_blocks/gold", "required": false }, - "minecraft:lush_caves", { - "id": "#c:jungle", + "id": "#c:raw_blocks/iron", "required": false } ] 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 new file mode 100644 index 000000000..1a21e230e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/copper.json @@ -0,0 +1,5 @@ +{ + "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/raw_blocks/gold.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/gold.json new file mode 100644 index 000000000..80781ce66 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/gold.json @@ -0,0 +1,5 @@ +{ + "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/raw_blocks/iron.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/iron.json new file mode 100644 index 000000000..13ed9fc65 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_blocks/iron.json @@ -0,0 +1,5 @@ +{ + "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/raw_materials.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials.json new file mode 100644 index 000000000..d344ab628 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials.json @@ -0,0 +1,28 @@ +{ + "values": [ + { + "id": "#c:raw_materials/copper", + "required": false + }, + { + "id": "#c:raw_materials/gold", + "required": false + }, + { + "id": "#c:raw_materials/iron", + "required": false + }, + { + "id": "#c:raw_materials/copper", + "required": false + }, + { + "id": "#c:raw_materials/iron", + "required": false + }, + { + "id": "#c:raw_materials/gold", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..c02e701f3 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/copper.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:raw_copper", + { + "id": "#c:raw_copper_ores", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..854588fc8 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/gold.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:raw_gold", + { + "id": "#c:raw_gold_ores", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..18311b444 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/raw_materials/iron.json @@ -0,0 +1,9 @@ +{ + "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/c/tags/items/raw_ores.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json similarity index 57% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_ores.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json index eab03e502..05aad4f4e 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/raw_ores.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json @@ -1,15 +1,15 @@ { "values": [ { - "id": "#c:raw_iron_ores", + "id": "#c:rods/wooden", "required": false }, { - "id": "#c:raw_copper_ores", + "id": "#c:rods/blaze", "required": false }, { - "id": "#c:raw_gold_ores", + "id": "#c:rods/breeze", "required": false } ] 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 000000000..5d2eff831 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/blaze.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:blaze_rod" + ] +} \ 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 000000000..8290ef56c --- /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/generated/resources/data/c/tags/items/rods/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/wooden.json new file mode 100644 index 000000000..019b63dd3 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/wooden.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:stick" + ] +} \ 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 000000000..f72d209df --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/ropes.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/items/sandstone/blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/blocks.json new file mode 100644 index 000000000..871827ea2 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/blocks.json @@ -0,0 +1,16 @@ +{ + "values": [ + { + "id": "#c:sandstone/uncolored_blocks", + "required": false + }, + { + "id": "#c: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-v2/src/generated/resources/data/c/tags/items/sandstone/red_blocks.json similarity index 52% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/red_sandstone_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/red_blocks.json index ad016c2e1..996a04077 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/red_sandstone_blocks.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/red_blocks.json @@ -1,8 +1,12 @@ { "values": [ "minecraft:red_sandstone", - "minecraft:chiseled_red_sandstone", "minecraft:cut_red_sandstone", - "minecraft:smooth_red_sandstone" + "minecraft:smooth_red_sandstone", + "minecraft:chiseled_red_sandstone", + { + "id": "#c:red_sandstone_blocks", + "required": false + } ] } \ No newline at end of file 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 new file mode 100644 index 000000000..38a99cb4f --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/red_slabs.json @@ -0,0 +1,11 @@ +{ + "values": [ + "minecraft:red_sandstone_slab", + "minecraft:cut_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-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 new file mode 100644 index 000000000..581969f2b --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/red_stairs.json @@ -0,0 +1,10 @@ +{ + "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-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 new file mode 100644 index 000000000..1dc38421a --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/slabs.json @@ -0,0 +1,16 @@ +{ + "values": [ + { + "id": "#c:sandstone/uncolored_slabs", + "required": false + }, + { + "id": "#c:sandstone/red_slabs", + "required": false + }, + { + "id": "#c:sandstone_slabs", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..b01cb4a76 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/stairs.json @@ -0,0 +1,16 @@ +{ + "values": [ + { + "id": "#c:sandstone/uncolored_stairs", + "required": false + }, + { + "id": "#c: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-v2/src/generated/resources/data/c/tags/items/sandstone/uncolored_blocks.json similarity index 50% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/uncolored_sandstone_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/uncolored_blocks.json index aca09d465..83d82e02d 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/uncolored_sandstone_blocks.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/uncolored_blocks.json @@ -1,8 +1,12 @@ { "values": [ "minecraft:sandstone", - "minecraft:chiseled_sandstone", "minecraft:cut_sandstone", - "minecraft:smooth_sandstone" + "minecraft:smooth_sandstone", + "minecraft:chiseled_sandstone", + { + "id": "#c:uncolored_sandstone_blocks", + "required": false + } ] } \ No newline at end of file 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 new file mode 100644 index 000000000..2b78d3659 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/uncolored_slabs.json @@ -0,0 +1,11 @@ +{ + "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-v2/src/generated/resources/data/c/tags/items/sandstone/uncolored_stairs.json similarity index 57% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/sandstone_stairs.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/uncolored_stairs.json index b881ac9dc..fcfa8ed20 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/sandstone_stairs.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/sandstone/uncolored_stairs.json @@ -1,12 +1,10 @@ { "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-v2/src/generated/resources/data/c/tags/items/shulker_boxes.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/shulker_boxes.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/shulker_boxes.json index 50ef39ce1..8ffa83c15 100644 --- a/fabric-convention-tags-v1/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 @@ -1,21 +1,21 @@ { "values": [ "minecraft:shulker_box", + "minecraft:white_shulker_box", + "minecraft:orange_shulker_box", + "minecraft:magenta_shulker_box", + "minecraft:light_blue_shulker_box", + "minecraft:yellow_shulker_box", + "minecraft:lime_shulker_box", + "minecraft:pink_shulker_box", + "minecraft:gray_shulker_box", + "minecraft:light_gray_shulker_box", + "minecraft:cyan_shulker_box", + "minecraft:purple_shulker_box", "minecraft:blue_shulker_box", "minecraft:brown_shulker_box", - "minecraft:cyan_shulker_box", - "minecraft:gray_shulker_box", "minecraft:green_shulker_box", - "minecraft:light_blue_shulker_box", - "minecraft:light_gray_shulker_box", - "minecraft:lime_shulker_box", - "minecraft:magenta_shulker_box", - "minecraft:orange_shulker_box", - "minecraft:pink_shulker_box", - "minecraft:purple_shulker_box", "minecraft:red_shulker_box", - "minecraft:white_shulker_box", - "minecraft:yellow_shulker_box", "minecraft:black_shulker_box" ] } \ 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 000000000..9f3ad2cfd --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/stones.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:stone", + "minecraft:andesite", + "minecraft:diorite", + "minecraft:granite", + "minecraft:tuff", + "minecraft:deepslate" + ] +} \ 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 000000000..b7696bea1 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks.json @@ -0,0 +1,20 @@ +{ + "values": [ + "#c:storage_blocks/bone_meal", + "#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/bone_meal.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/bone_meal.json new file mode 100644 index 000000000..98ab24a21 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/bone_meal.json @@ -0,0 +1,5 @@ +{ + "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 000000000..4b7921705 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/coal.json @@ -0,0 +1,5 @@ +{ + "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 000000000..015bec70c --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/copper.json @@ -0,0 +1,5 @@ +{ + "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 000000000..acd7f52de --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/diamond.json @@ -0,0 +1,5 @@ +{ + "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 000000000..260965642 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/dried_kelp.json @@ -0,0 +1,5 @@ +{ + "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 000000000..152063ec6 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/emerald.json @@ -0,0 +1,5 @@ +{ + "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 000000000..546dde03c --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/gold.json @@ -0,0 +1,5 @@ +{ + "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 000000000..01fb2965f --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/iron.json @@ -0,0 +1,5 @@ +{ + "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 000000000..f4ca82bbd --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/lapis.json @@ -0,0 +1,5 @@ +{ + "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 000000000..83433d44e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/netherite.json @@ -0,0 +1,5 @@ +{ + "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 000000000..1a21e230e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_copper.json @@ -0,0 +1,5 @@ +{ + "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 000000000..80781ce66 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_gold.json @@ -0,0 +1,5 @@ +{ + "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 000000000..13ed9fc65 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/raw_iron.json @@ -0,0 +1,5 @@ +{ + "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 000000000..f5fd89c54 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/redstone.json @@ -0,0 +1,5 @@ +{ + "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 000000000..523bdc283 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/slime.json @@ -0,0 +1,5 @@ +{ + "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 000000000..ea92d03cb --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/storage_blocks/wheat.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:hay_block" + ] +} \ 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 000000000..599801436 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/strings.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:string", + { + "id": "#c:strings", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..e6f97c30f --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools.json @@ -0,0 +1,64 @@ +{ + "values": [ + { + "id": "#minecraft:axes", + "required": false + }, + { + "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 + }, + { + "id": "#c:tools/shears", + "required": false + }, + { + "id": "#c:tools/shields", + "required": false + }, + { + "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/bows.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/bows.json new file mode 100644 index 000000000..def29d61b --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/bows.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:bow", + { + "id": "#c:bows", + "required": false + } + ] +} \ No newline at end of file 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 000000000..8b2fb219e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/brushes.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:brush" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/crossbows.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/crossbows.json new file mode 100644 index 000000000..848f97bc2 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/crossbows.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:crossbow" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..e97941e9d --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/fishing_rods.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:fishing_rod" + ] +} \ 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-v2/src/generated/resources/data/c/tags/items/tools/melee_weapons.json similarity index 51% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/axes.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/melee_weapons.json index 3d44375ba..92e665ad6 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/axes.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/melee_weapons.json @@ -1,14 +1,16 @@ { "values": [ - { - "id": "#fabric:axes", - "required": false - }, - "minecraft:diamond_axe", - "minecraft:golden_axe", + "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-v1/src/generated/resources/data/c/tags/items/pickaxes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/mining_tools.json similarity index 75% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/pickaxes.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/mining_tools.json index c9eec4d9c..4346476fd 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/pickaxes.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/mining_tools.json @@ -1,14 +1,10 @@ { "values": [ - { - "id": "#fabric:pickaxes", - "required": false - }, - "minecraft:diamond_pickaxe", - "minecraft:golden_pickaxe", "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-v1/src/generated/resources/data/c/tags/items/bows.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/ranged_weapons.json similarity index 51% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/bows.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/ranged_weapons.json index baf5c94e3..9403216f8 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/bows.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/ranged_weapons.json @@ -1,6 +1,7 @@ { "values": [ + "minecraft:bow", "minecraft:crossbow", - "minecraft:bow" + "minecraft:trident" ] } \ No newline at end of file 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 new file mode 100644 index 000000000..297436847 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shears.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:shears", + { + "id": "#c:shears", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..cb55f6df6 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/shields.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:shield", + { + "id": "#c:shields", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..5ee455d5d --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/tools/spears.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:trident", + { + "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-v2/src/generated/resources/data/c/tags/items/villager_job_sites.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/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/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 000000000..f72d209df --- /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-v1/src/generated/resources/data/minecraft/tags/items/axes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_aquatic.json similarity index 63% rename from fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/axes.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_aquatic.json index e7d63a8b5..906d6647f 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/axes.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_aquatic.json @@ -1,11 +1,11 @@ { "values": [ { - "id": "#c:axes", + "id": "#c:is_ocean", "required": false }, { - "id": "#fabric:axes", + "id": "#c:is_river", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/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-v1/src/generated/resources/data/c/tags/worldgen/biome/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-v1/src/generated/resources/data/c/tags/worldgen/biome/badlands.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_badlands.json similarity index 61% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/badlands.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_badlands.json index 533615899..3b92be4c7 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/badlands.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_badlands.json @@ -1,9 +1,5 @@ { "values": [ - { - "id": "#c:mesa", - "required": false - }, { "id": "#minecraft:is_badlands", "required": false diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/beach.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_beach.json similarity index 71% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/beach.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_beach.json index fd2cd7285..5ee39058e 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/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-v1/src/generated/resources/data/c/tags/worldgen/biome/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-v1/src/generated/resources/data/c/tags/worldgen/biome/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/c/tags/worldgen/biome/is_cave.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cave.json new file mode 100644 index 000000000..7f60f62bd --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cave.json @@ -0,0 +1,11 @@ +{ + "values": [ + "minecraft:deep_dark", + "minecraft:dripstone_caves", + "minecraft:lush_caves", + { + "id": "#c:caves", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold.json new file mode 100644 index 000000000..a5684677e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#c:is_cold/overworld" + ] +} \ No newline at end of file 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 000000000..73d3eff3b --- /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 new file mode 100644 index 000000000..dce4ac923 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold/overworld.json @@ -0,0 +1,23 @@ +{ + "values": [ + "minecraft:taiga", + "minecraft:old_growth_pine_taiga", + "minecraft:snowy_plains", + "minecraft:ice_spikes", + "minecraft:grove", + "minecraft:snowy_slopes", + "minecraft:jagged_peaks", + "minecraft:frozen_peaks", + "minecraft:snowy_beach", + "minecraft:snowy_taiga", + "minecraft:frozen_river", + "minecraft:cold_ocean", + "minecraft:frozen_ocean", + "minecraft:deep_cold_ocean", + "minecraft:deep_frozen_ocean", + { + "id": "#c:climate_cold", + "required": false + } + ] +} \ 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 new file mode 100644 index 000000000..f72d209df --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dead.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_deep_ocean.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_deep_ocean.json new file mode 100644 index 000000000..e0df3c6e6 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_deep_ocean.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#minecraft:is_deep_ocean", + "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-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation.json similarity index 54% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_coniferous.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation.json index 85eac37be..ac773567a 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_coniferous.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation.json @@ -1,8 +1,7 @@ { "values": [ - "minecraft:grove", { - "id": "#c:taiga", + "id": "#c:is_dense_vegetation/overworld", "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 new file mode 100644 index 000000000..795607e70 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation/overworld.json @@ -0,0 +1,12 @@ +{ + "values": [ + "minecraft:dark_forest", + "minecraft:old_growth_birch_forest", + "minecraft:old_growth_spruce_taiga", + "minecraft:jungle", + { + "id": "#c:vegetation_dense", + "required": false + } + ] +} \ 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-v2/src/generated/resources/data/c/tags/worldgen/biome/is_desert.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/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/c/tags/worldgen/biome/is_dry.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry.json new file mode 100644 index 000000000..fb8b1f130 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#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 000000000..73d3eff3b --- /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-v1/src/generated/resources/data/c/tags/worldgen/biome/in_nether.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/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-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/nether.json index 6dab6d4fd..d8cf8f5e3 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/in_nether.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/nether.json @@ -1,12 +1,8 @@ { "values": [ - { - "id": "#minecraft:is_nether", - "required": false - }, + "minecraft:nether_wastes", "minecraft:crimson_forest", "minecraft:warped_forest", - "minecraft:nether_wastes", "minecraft:soul_sand_valley", "minecraft:basalt_deltas" ] 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 new file mode 100644 index 000000000..b9637b737 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dry/overworld.json @@ -0,0 +1,15 @@ +{ + "values": [ + "minecraft:desert", + "minecraft:badlands", + "minecraft:wooded_badlands", + "minecraft:eroded_badlands", + "minecraft:savanna", + "minecraft:savanna_plateau", + "minecraft:windswept_savanna", + { + "id": "#c:climate_dry", + "required": false + } + ] +} \ 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 new file mode 100644 index 000000000..75a22e21f --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_end.json @@ -0,0 +1,12 @@ +{ + "values": [ + { + "id": "#minecraft:is_end", + "required": false + }, + { + "id": "#c:in_the_end", + "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-v2/src/generated/resources/data/c/tags/worldgen/biome/is_floral.json similarity index 80% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/floral.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_floral.json index f867ed625..b0a5da6a2 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/floral.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_floral.json @@ -4,7 +4,7 @@ "minecraft:meadow", "minecraft:cherry_grove", { - "id": "#c:flower_forests", + "id": "#c:is_flower_forest", "required": false } ] 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 new file mode 100644 index 000000000..9885c5224 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_flower_forest.json @@ -0,0 +1,13 @@ +{ + "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/c/tags/worldgen/biome/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-v1/src/generated/resources/data/c/tags/worldgen/biome/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-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_jungle.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hill.json similarity index 62% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_jungle.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hill.json index bc75b4b84..4cc9ec6fd 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_jungle.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hill.json @@ -1,7 +1,7 @@ { "values": [ { - "id": "#c:jungle", + "id": "#minecraft:is_hill", "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 new file mode 100644 index 000000000..91ad22241 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#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 000000000..d8cf8f5e3 --- /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 new file mode 100644 index 000000000..904a4720c --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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", + "minecraft:warm_ocean", + { + "id": "#c:climate_hot", + "required": false + } + ] +} \ 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-v2/src/generated/resources/data/c/tags/worldgen/biome/is_icy.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/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-v1/src/generated/resources/data/c/tags/worldgen/biome/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-v1/src/generated/resources/data/c/tags/worldgen/biome/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/c/tags/worldgen/biome/is_mountain.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain.json new file mode 100644 index 000000000..34425310a --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain.json @@ -0,0 +1,16 @@ +{ + "values": [ + { + "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_mountain/peak.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain/peak.json new file mode 100644 index 000000000..bea622bf3 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain/peak.json @@ -0,0 +1,11 @@ +{ + "values": [ + "minecraft:frozen_peaks", + "minecraft:jagged_peaks", + "minecraft:stony_peaks", + { + "id": "#c:mountain_peak", + "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/slope.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain/slope.json new file mode 100644 index 000000000..d9e109f37 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mountain/slope.json @@ -0,0 +1,12 @@ +{ + "values": [ + "minecraft:snowy_slopes", + "minecraft:meadow", + "minecraft:grove", + "minecraft:cherry_grove", + { + "id": "#c:mountain_slope", + "required": false + } + ] +} \ 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-v2/src/generated/resources/data/c/tags/worldgen/biome/is_mushroom.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/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/c/tags/worldgen/biome/is_nether.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_nether.json new file mode 100644 index 000000000..79f7a494a --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_nether.json @@ -0,0 +1,12 @@ +{ + "values": [ + { + "id": "#minecraft:is_nether", + "required": false + }, + { + "id": "#c:in_nether", + "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_forest.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_nether_forest.json new file mode 100644 index 000000000..36924ab50 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_nether_forest.json @@ -0,0 +1,10 @@ +{ + "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/ocean.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_ocean.json similarity index 71% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/ocean.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_ocean.json index fb0dfe4d0..641e9f7bb 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/ocean.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_ocean.json @@ -1,16 +1,16 @@ { "values": [ - { - "id": "#c:deep_ocean", - "required": false - }, - { - "id": "#c:shallow_ocean", - "required": false - }, { "id": "#minecraft:is_ocean", "required": false + }, + { + "id": "#c:is_deep_ocean", + "required": false + }, + { + "id": "#c:is_shallow_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_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 000000000..412f42f3e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_old_growth.json @@ -0,0 +1,7 @@ +{ + "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-v1/src/generated/resources/data/c/tags/worldgen/biome/in_the_end.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_outer_end_island.json similarity index 58% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/in_the_end.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_outer_end_island.json index 97dae39bb..2ea56b945 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/in_the_end.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_outer_end_island.json @@ -1,13 +1,11 @@ { "values": [ - { - "id": "#minecraft:is_end", - "required": false - }, - "minecraft:end_barrens", - "minecraft:end_midlands", "minecraft:end_highlands", - "minecraft:the_end", - "minecraft:small_end_islands" + "minecraft:end_midlands", + "minecraft:end_barrens", + { + "id": "#c:end_islands", + "required": false + } ] } \ No newline at end of file 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 new file mode 100644 index 000000000..e0903f76a --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_overworld.json @@ -0,0 +1,12 @@ +{ + "values": [ + { + "id": "#minecraft:is_overworld", + "required": false + }, + { + "id": "#c:in_the_overworld", + "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 new file mode 100644 index 000000000..c88810bc1 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_plains.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:plains", + "minecraft:sunflower_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-v2/src/generated/resources/data/c/tags/worldgen/biome/is_river.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/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-v1/src/generated/resources/data/c/tags/worldgen/biome/underground.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_savanna.json similarity index 60% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/underground.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_savanna.json index 72bedfe99..c02ae956e 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/underground.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_savanna.json @@ -1,7 +1,7 @@ { "values": [ { - "id": "#c:caves", + "id": "#minecraft:is_savanna", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/shallow_ocean.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_shallow_ocean.json similarity index 64% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/shallow_ocean.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_shallow_ocean.json index adc221c77..858efda8f 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/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/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 new file mode 100644 index 000000000..193255cf4 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy.json @@ -0,0 +1,12 @@ +{ + "values": [ + "minecraft:snowy_beach", + "minecraft:snowy_plains", + "minecraft:ice_spikes", + "minecraft:snowy_taiga", + "minecraft:grove", + "minecraft:snowy_slopes", + "minecraft:jagged_peaks", + "minecraft:frozen_peaks" + ] +} \ 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-v2/src/generated/resources/data/c/tags/worldgen/biome/is_snowy_plains.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/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/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 new file mode 100644 index 000000000..bd3b8da01 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#c:is_sparse_vegetation/overworld", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json new file mode 100644 index 000000000..3565ae395 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json @@ -0,0 +1,19 @@ +{ + "values": [ + "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 + } + ] +} \ 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-v2/src/generated/resources/data/c/tags/worldgen/biome/is_stony_shores.json similarity index 100% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/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-v1/src/generated/resources/data/c/tags/worldgen/biome/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-v1/src/generated/resources/data/c/tags/worldgen/biome/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-v1/src/generated/resources/data/c/tags/worldgen/biome/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-v1/src/generated/resources/data/c/tags/worldgen/biome/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 000000000..53794ed90 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#c: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-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json similarity index 75% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_temperate.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json index 802430f20..b1c4877ca 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_temperate.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json @@ -9,6 +9,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/blocks/sandstone_blocks.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/coniferous.json similarity index 52% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/sandstone_blocks.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/coniferous.json index 686cd2a17..add5217d0 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/blocks/sandstone_blocks.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/coniferous.json @@ -1,11 +1,12 @@ { "values": [ { - "id": "#c:uncolored_sandstone_blocks", + "id": "#c:is_taiga", "required": false }, + "minecraft:grove", { - "id": "#c:red_sandstone_blocks", + "id": "#c:tree_coniferous", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_deciduous.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/deciduous.json similarity index 60% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_deciduous.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/deciduous.json index ad7c36605..726da77bf 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_deciduous.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/deciduous.json @@ -5,6 +5,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/minecraft/tags/items/hoes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/jungle.json similarity index 61% rename from fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/hoes.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/jungle.json index 59091c6d8..d424b1fdc 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/minecraft/tags/items/hoes.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/jungle.json @@ -1,11 +1,11 @@ { "values": [ { - "id": "#c:hoes", + "id": "#c:is_jungle", "required": false }, { - "id": "#fabric:hoes", + "id": "#c:tree_jungle", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/aquatic.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/savanna.json similarity index 61% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/aquatic.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/savanna.json index 871c4feb3..575a1d68d 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/aquatic.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/savanna.json @@ -1,11 +1,11 @@ { "values": [ { - "id": "#c:ocean", + "id": "#c:is_savanna", "required": false }, { - "id": "#c:river", + "id": "#c:tree_savanna", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_savanna.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_underground.json similarity index 68% rename from fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_savanna.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_underground.json index 383900fe4..373566743 100644 --- a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/tree_savanna.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_underground.json @@ -1,7 +1,7 @@ { "values": [ { - "id": "#c:savanna", + "id": "#c:is_cave", "required": false } ] diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/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-v1/src/generated/resources/data/c/tags/worldgen/biome/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/c/tags/worldgen/biome/is_wasteland.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wasteland.json new file mode 100644 index 000000000..f72d209df --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wasteland.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet.json new file mode 100644 index 000000000..bee471c87 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#c:is_wet/overworld" + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..2976c53ca --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet/overworld.json @@ -0,0 +1,16 @@ +{ + "values": [ + "minecraft:swamp", + "minecraft:mangrove_swamp", + "minecraft:jungle", + "minecraft:bamboo_jungle", + "minecraft:sparse_jungle", + "minecraft:beach", + "minecraft:lush_caves", + "minecraft:dripstone_caves", + { + "id": "#c:climate_wet", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/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-v1/src/generated/resources/data/c/tags/worldgen/biome/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/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 000000000..2496ccf1e --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/no_default_monsters.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:mushroom_fields", + "minecraft:deep_dark" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/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 000000000..f72d209df --- /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 000000000..f72d209df --- /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/ConventionalBiomeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java new file mode 100644 index 000000000..8ec523ea8 --- /dev/null +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java @@ -0,0 +1,191 @@ +/* + * 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.biome.Biome; + +import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; + +/** + * See {@link net.minecraft.registry.tag.BiomeTags} for vanilla tags. + * Note that addition to some vanilla tags implies having certain functionality, + * and as such certain biome tags exist to mirror vanilla tags, and should be preferred + * over vanilla unless its behavior is desired. + */ +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"); + /** + * 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"); + + /** + * 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.) + */ + public static final TagKey IS_OVERWORLD = register("is_overworld"); + + 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"); + + 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_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_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"); + + /** + * 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"); + /** + * 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"); + /** + * 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"); + 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) + */ + public static final TagKey IS_WASTELAND = register("is_wasteland"); + /** + * Biomes whose flora primarily consists of dead or decaying vegetation. + */ + public static final TagKey IS_DEAD = register("is_dead"); + /** + * Biomes with a large amount of flowers. + */ + public static final TagKey IS_FLORAL = register("is_floral"); + /** + * 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"); + /** + * 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"); + + /** + * 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_NETHER_FOREST = register("is_nether_forest"); + + /** + * 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 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"); + + 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/ConventionalBlockTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java new file mode 100644 index 000000000..6813e657b --- /dev/null +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java @@ -0,0 +1,157 @@ +/* + * 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.AbstractBlock; +import net.minecraft.block.Block; +import net.minecraft.registry.tag.TagKey; + +import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; + +/** + * See {@link net.minecraft.registry.tag.BlockTags} for vanilla tags. + * Note that addition to some vanilla tags implies having certain functionality. + */ +public final class ConventionalBlockTags { + 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"); + + // Ores - vanilla instances + 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 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"); + + // 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"); + + // 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("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 + /** + * 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"); + 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 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. + *

+ * 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_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"); + 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"); + + // 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. + * Example: Chunk loaders or pipes where other mods that move blocks do not respect + * {@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. (Named skulls to match minecraft:skulls item tag) + */ + public static final TagKey SKULLS = register("skulls"); + 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. + * 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"); + + 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 new file mode 100644 index 000000000..dc6104fe7 --- /dev/null +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java @@ -0,0 +1,59 @@ +/* + * 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.enchantment.Enchantment; +import net.minecraft.registry.tag.TagKey; + +import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; + +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 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 INCREASE_ENTITY_DROPS = register("increase_entity_drops"); + /** + * For enchantments that increase the damage dealt by an item. + */ + 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_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_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. + */ + public static final TagKey ENTITY_DEFENSE_ENHANCEMENT = register("entity_defense_enhancement"); + + 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 new file mode 100644 index 000000000..f73cce529 --- /dev/null +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java @@ -0,0 +1,57 @@ +/* + * 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.entity.EntityType; +import net.minecraft.registry.tag.TagKey; + +import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; + +/** + * See {@link net.minecraft.registry.tag.EntityTypeTags} for vanilla tags. + * Note that addition to some vanilla tags implies having certain functionality. + */ +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"); + + /** + * 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"); + + /** + * 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 canUsePortals 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); + } +} 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 new file mode 100644 index 000000000..170bd5d36 --- /dev/null +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalFluidTags.java @@ -0,0 +1,47 @@ +/* + * 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.fluid.Fluid; +import net.minecraft.registry.tag.TagKey; + +import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; + +/** + * See {@link net.minecraft.registry.tag.FluidTags} for vanilla tags. + * Note that addition to some vanilla tags implies having certain functionality. + *

+ * 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 LAVA = register("lava"); + 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 new file mode 100644 index 000000000..aba897987 --- /dev/null +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -0,0 +1,294 @@ +/* + * 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.item.Item; +import net.minecraft.registry.tag.TagKey; + +import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; + +/** + * See {@link net.minecraft.registry.tag.ItemTags} for vanilla tags. + * Note that addition to some vanilla tags implies having certain functionality. + */ +public final class ConventionalItemTags { + 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"); + public static final TagKey SHEARS_TOOLS = register("tools/shears"); + /** + * 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"); + 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"); + 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 ENCHANTABLES = register("enchantables"); + + // 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"); + public static final TagKey NUGGETS = register("nuggets"); + public static final TagKey ORES = register("ores"); + 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 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"); + + // 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"); + 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 NETHERITE_SCRAP_ORES = register("ores/netherite_scrap"); + public static final TagKey QUARTZ_ORES = register("ores/quartz"); + + // Gems - vanilla instances + 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 REDSTONE_DUSTS = register("dusts/redstone"); + public static final TagKey GLOWSTONE_DUSTS = register("dusts/glowstone"); + public static final TagKey COAL = register("coal"); + + // Consumables + public static final TagKey POTIONS = register("potions"); + + // Foods + 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"); + /** + * 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. + * 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"); + 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"); + /** + * 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. + */ + 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 + /** + * Does not include entity water buckets. + */ + 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 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"); + + // 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("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("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 + /** + * Tag that holds all blocks and items that can be dyed a specific color. + * (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. + * 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"); + 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"); + + // 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_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"); + 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 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. + */ + 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"); + public static final TagKey BREEZE_RODS = register("rods/breeze"); + 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); + } +} 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 000000000..643966635 --- /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-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 94% 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 08102e4cf..98289d65e 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; @@ -35,6 +35,9 @@ import net.minecraft.registry.tag.TagKey; * For non-dynamic registry entries, the simpler {@link #isIn(TagKey, Object)} can be used. */ public final class TagUtil { + public static final String C_TAG_NAMESPACE = "c"; + public static final String FABRIC_TAG_NAMESPACE = "fabric"; + private TagUtil() { } 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 new file mode 100644 index 000000000..7cd1ad789 --- /dev/null +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java @@ -0,0 +1,50 @@ +/* + * 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.v2; + +import net.minecraft.block.Block; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.entity.EntityType; +import net.minecraft.fluid.Fluid; +import net.minecraft.item.Item; +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.minecraft.world.gen.structure.Structure; + +import net.fabricmc.fabric.api.tag.convention.v2.TagUtil; + +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); + + public TagKey registerFabric(String tagId) { + return TagKey.of(registryKey, new Identifier(TagUtil.FABRIC_TAG_NAMESPACE, tagId)); + } + + public TagKey registerC(String tagId) { + return TagKey.of(registryKey, new Identifier(TagUtil.C_TAG_NAMESPACE, tagId)); + } +} diff --git a/fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v2/icon.png b/fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v2/icon.png new file mode 100644 index 000000000..2931efbf6 Binary files /dev/null and b/fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v2/icon.png differ diff --git a/fabric-convention-tags-v2/src/main/resources/fabric.mod.json b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json new file mode 100644 index 000000000..02fa0e0dc --- /dev/null +++ b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json @@ -0,0 +1,28 @@ +{ + "schemaVersion": 1, + "id": "fabric-convention-tags-v2", + "name": "Fabric Convention Tags (v2)", + "version": "${version}", + "environment": "*", + "license": "Apache-2.0", + "icon": "assets/fabric-convention-tags-v2/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.15.6", + "minecraft": ">=1.20.5-beta.1", + "fabric-lifecycle-events-v1": "*" + }, + "mixins": [], + "description": "Contains common tags used by mods for better inter-mod compatibility.", + "custom": { + "fabric-api:module-lifecycle": "stable" + } +} 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/v2/TagUtilTest.java similarity index 76% 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/v2/TagUtilTest.java index aeb6ccf95..cd8b4accb 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/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; @@ -26,10 +26,10 @@ import net.minecraft.world.biome.BiomeKeys; 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); @@ -37,16 +37,16 @@ public class TagUtilTest implements ModInitializer { @Override 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!"); + if (!TagUtil.isIn(ConventionalEnchantmentTags.INCREASE_BLOCK_DROPS, Enchantments.FORTUNE)) { + throw new AssertionError("Failed to find fortune in c:increase_block_drops!"); } - 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-convention-tags-v1/src/testmod/resources/fabric.mod.json b/fabric-convention-tags-v2/src/testmod/resources/fabric.mod.json similarity index 71% 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 3db1e4d54..65cc19fed 100644 --- a/fabric-convention-tags-v1/src/testmod/resources/fabric.mod.json +++ b/fabric-convention-tags-v2/src/testmod/resources/fabric.mod.json @@ -6,11 +6,11 @@ "environment": "*", "license": "Apache-2.0", "depends": { - "fabric-convention-tags-v1": "*" + "fabric-convention-tags-v2": "*" }, "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/build.gradle b/fabric-data-generation-api-v1/build.gradle index bbe27e46d..8df7b38a2 100644 --- a/fabric-data-generation-api-v1/build.gradle +++ b/fabric-data-generation-api-v1/build.gradle @@ -6,7 +6,7 @@ moduleDependencies(project, [ 'fabric-networking-api-v1', 'fabric-resource-conditions-api-v1', 'fabric-item-group-api-v1', - 'fabric-recipe-api-v1', + 'fabric-recipe-api-v1' ]) dependencies { 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 21e646167..fd72db51c 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 @@ -25,6 +25,7 @@ import java.util.stream.Stream; 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; @@ -129,6 +130,20 @@ public abstract class FabricTagProvider extends TagProvider { } } + /** + * 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. */ diff --git a/gradle.properties b/gradle.properties index da0850654..51246d92a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -59,4 +59,5 @@ fabric-sound-api-v1-version=1.0.21 fabric-transfer-api-v1-version=5.1.6 fabric-transitive-access-wideners-v1-version=6.0.10 fabric-convention-tags-v1-version=1.5.17 +fabric-convention-tags-v2-version=1.0.0 fabric-client-tags-api-v1-version=1.1.11 diff --git a/settings.gradle b/settings.gradle index 3e01c0569..1b56283ec 100644 --- a/settings.gradle +++ b/settings.gradle @@ -24,7 +24,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-attachment-api-v1' include 'fabric-data-generation-api-v1' @@ -60,6 +60,7 @@ include 'fabric-transitive-access-wideners-v1' include 'deprecated' include 'deprecated:fabric-command-api-v1' include 'deprecated:fabric-commands-v0' +include 'deprecated:fabric-convention-tags-v1' include 'deprecated:fabric-keybindings-v0' include 'deprecated:fabric-models-v0' include 'deprecated:fabric-renderer-registries-v1'