mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 11:59:25 +00:00
Implement the de-facto common tags, add many new Forge tags (#9955)
https://forums.minecraftforge.net/topic/152815-common-tags-in-forge/
This commit is contained in:
1 parent
b8105ca5a6
commit
7cfed38194
572 files changed
+6186
-1984
No files matched your search
@@ -13,8 +13,11 @@ import org.apache.logging.log4j.LogManager;
|
||||
|
||||
import net.minecraftforge.common.ForgeConfigSpec.BooleanValue;
|
||||
import net.minecraftforge.common.ForgeConfigSpec.ConfigValue;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
public class ForgeConfig {
|
||||
private static final Logger LOGGER = LogManager.getLogger();
|
||||
|
||||
public static class Server {
|
||||
public final BooleanValue removeErroringBlockEntities;
|
||||
|
||||
@@ -66,11 +69,23 @@ public class ForgeConfig {
|
||||
* General configuration that doesn't need to be synchronized but needs to be available before server startup
|
||||
*/
|
||||
public static class Common {
|
||||
public enum MigrationHelperMode {
|
||||
OFF,
|
||||
ONLY_IN_DEV_ENV,
|
||||
ALWAYS
|
||||
}
|
||||
|
||||
public final ForgeConfigSpec.EnumValue<MigrationHelperMode> migrationHelperMode;
|
||||
|
||||
Common(ForgeConfigSpec.Builder builder) {
|
||||
builder.comment("[DEPRECATED / NO EFFECT]: General configuration settings")
|
||||
builder.comment("General configuration settings")
|
||||
.push("general");
|
||||
|
||||
migrationHelperMode = builder
|
||||
.comment("A config option to help developers find known legacy modded tags that have common convention equivalents when running on integrated server. Defaults to OFF.")
|
||||
.translation("forge.configgui.migrationHelperMode")
|
||||
.defineEnum("logLegacyTagWarnings", MigrationHelperMode.OFF);
|
||||
|
||||
builder.pop();
|
||||
}
|
||||
}
|
||||
@@ -174,12 +189,12 @@ public class ForgeConfig {
|
||||
|
||||
@SubscribeEvent
|
||||
public static void onLoad(final ModConfigEvent.Loading configEvent) {
|
||||
LogManager.getLogger().debug(Logging.FORGEMOD, "Loaded forge config file {}", configEvent.getConfig().getFileName());
|
||||
LOGGER.debug(Logging.FORGEMOD, "Loaded forge config file {}", configEvent.getConfig().getFileName());
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void onFileChange(final ModConfigEvent.Reloading configEvent) {
|
||||
LogManager.getLogger().debug(Logging.FORGEMOD, "Forge config just got changed on the file system!");
|
||||
LOGGER.debug(Logging.FORGEMOD, "Forge config just got changed on the file system!");
|
||||
}
|
||||
|
||||
//General
|
||||
|
||||
@@ -42,9 +42,15 @@ import net.minecraft.world.phys.Vec3;
|
||||
import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
import net.minecraftforge.common.data.ForgeBiomeTagsProvider;
|
||||
import net.minecraftforge.common.data.ForgeBlockTagsProvider;
|
||||
import net.minecraftforge.common.data.ForgeEnchantmentTagsProvider;
|
||||
import net.minecraftforge.common.data.ForgeEntityTypeTagsProvider;
|
||||
import net.minecraftforge.common.data.ForgeFluidTagsProvider;
|
||||
import net.minecraftforge.common.data.ForgeItemTagsProvider;
|
||||
import net.minecraftforge.common.data.ForgeLootTableProvider;
|
||||
import net.minecraftforge.common.data.ForgeRecipeProvider;
|
||||
import net.minecraftforge.common.data.ForgeSpriteSourceProvider;
|
||||
import net.minecraftforge.common.data.ForgeStructureTagsProvider;
|
||||
import net.minecraftforge.common.data.VanillaSoundDefinitionsProvider;
|
||||
import net.minecraftforge.common.loot.CanToolPerformAction;
|
||||
import net.minecraftforge.common.loot.LootTableIdCondition;
|
||||
@@ -105,10 +111,6 @@ import net.minecraftforge.common.crafting.ingredients.IIngredientSerializer;
|
||||
import net.minecraftforge.common.crafting.ingredients.IntersectionIngredient;
|
||||
import net.minecraftforge.common.crafting.ingredients.PartialNBTIngredient;
|
||||
import net.minecraftforge.common.crafting.ingredients.StrictNBTIngredient;
|
||||
import net.minecraftforge.common.data.ForgeBlockTagsProvider;
|
||||
import net.minecraftforge.common.data.ForgeEntityTypeTagsProvider;
|
||||
import net.minecraftforge.common.data.ForgeItemTagsProvider;
|
||||
import net.minecraftforge.common.data.ForgeRecipeProvider;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import org.apache.logging.log4j.Marker;
|
||||
import org.apache.logging.log4j.MarkerManager;
|
||||
@@ -389,10 +391,8 @@ public class ForgeMod {
|
||||
});
|
||||
modEventBus.addListener(this::preInit);
|
||||
modEventBus.addListener(this::gatherData);
|
||||
modEventBus.addListener(this::loadComplete);
|
||||
modEventBus.addListener(this::registerFluids);
|
||||
modEventBus.addListener(this::registerVanillaDisplayContexts);
|
||||
modEventBus.register(this);
|
||||
for (DeferredRegister<?> r : registries) {
|
||||
r.register(modEventBus);
|
||||
}
|
||||
@@ -426,9 +426,6 @@ public class ForgeMod {
|
||||
//VanillaPacketSplitter.register();
|
||||
}
|
||||
|
||||
public void loadComplete(FMLLoadCompleteEvent event) {
|
||||
}
|
||||
|
||||
public void serverStopping(ServerStoppingEvent evt) {
|
||||
WorldWorkerManager.clear();
|
||||
}
|
||||
@@ -450,7 +447,7 @@ public class ForgeMod {
|
||||
gen.addProvider(true, new PackMetadataGenerator(packOutput)
|
||||
.add(PackMetadataSection.TYPE, new PackMetadataSection(
|
||||
Component.translatable("pack.forge.description"),
|
||||
DetectedVersion.BUILT_IN.getPackVersion(PackType.CLIENT_RESOURCES),
|
||||
DetectedVersion.BUILT_IN.getPackVersion(PackType.SERVER_DATA),
|
||||
Optional.empty() //Arrays.stream(PackType.values()).collect(Collectors.toMap(Function.identity(), DetectedVersion.BUILT_IN::getPackVersion))
|
||||
))
|
||||
);
|
||||
@@ -459,9 +456,11 @@ public class ForgeMod {
|
||||
gen.addProvider(event.includeServer(), new ForgeItemTagsProvider(packOutput, lookupProvider, blockTags.contentsGetter(), existingFileHelper));
|
||||
gen.addProvider(event.includeServer(), new ForgeEntityTypeTagsProvider(packOutput, lookupProvider, existingFileHelper));
|
||||
gen.addProvider(event.includeServer(), new ForgeFluidTagsProvider(packOutput, lookupProvider, existingFileHelper));
|
||||
gen.addProvider(event.includeServer(), new ForgeEnchantmentTagsProvider(packOutput, lookupProvider, existingFileHelper));
|
||||
gen.addProvider(event.includeServer(), new ForgeRecipeProvider(packOutput, lookupProvider));
|
||||
gen.addProvider(event.includeServer(), new ForgeLootTableProvider(packOutput, lookupProvider));
|
||||
gen.addProvider(event.includeServer(), new ForgeBiomeTagsProvider(packOutput, lookupProvider, existingFileHelper));
|
||||
gen.addProvider(event.includeServer(), new ForgeStructureTagsProvider(packOutput, lookupProvider, existingFileHelper));
|
||||
|
||||
gen.addProvider(event.includeClient(), new ForgeSpriteSourceProvider(packOutput, existingFileHelper));
|
||||
gen.addProvider(event.includeClient(), new VanillaSoundDefinitionsProvider(packOutput, existingFileHelper));
|
||||
@@ -543,7 +542,7 @@ public class ForgeMod {
|
||||
// net.minecraft.client.multiplayer.resolver.ServerRedirectHandler.createDnsSrvRedirectHandler uses DNSContextFactory
|
||||
// to resolve DNS records, and that is initialized reflectively by NamingManager. Which in module land isn't allowed.
|
||||
// So hack it so it is. this is equivalent to doing --add-exports jdk.naming.dns/com.sun.jndi.dns=java.naming
|
||||
private void hackDNSResolver() {
|
||||
private static void hackDNSResolver() {
|
||||
try {
|
||||
var target = Class.forName("com.sun.jndi.dns.DnsContextFactory");
|
||||
var reader = Class.forName("javax.naming.spi.NamingManager");
|
||||
|
||||
@@ -53,6 +53,7 @@ public class MinecraftForge
|
||||
UsernameCache.load();
|
||||
if (FMLEnvironment.dist == Dist.CLIENT) ClientCommandHandler.init();
|
||||
DualStackUtils.initialise();
|
||||
TagConventionMigrationHelper.init();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -0,0 +1,392 @@
|
||||
/*
|
||||
* Copyright (c) Forge Development LLC and contributors
|
||||
* SPDX-License-Identifier: LGPL-2.1-only
|
||||
*/
|
||||
|
||||
package net.minecraftforge.common;
|
||||
|
||||
import net.minecraft.core.Registry;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.tags.TagKey;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public final class TagConventionMappings {
|
||||
private TagConventionMappings() {}
|
||||
|
||||
/**
|
||||
* A map of known legacy tags to their common convention equivalents.
|
||||
*/
|
||||
public static final Map<TagKey<?>, String> MAPPINGS = Map.<TagKey<?>, String>ofEntries(
|
||||
//region Blocks
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("barrels"), Tags.Blocks.BARRELS), // forge:barrels -> c:barrels
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("barrels/wooden"), Tags.Blocks.BARRELS_WOODEN),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("bookshelves"), Tags.Blocks.BOOKSHELVES),
|
||||
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("chests"), Tags.Blocks.CHESTS),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("chests/wooden"), Tags.Blocks.CHESTS_WOODEN),
|
||||
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("cobblestone"), Tags.Blocks.COBBLESTONES),
|
||||
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass"), Tags.Blocks.GLASS_BLOCKS),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass/black"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_BLACK)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass/blue"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_BLUE)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass/brown"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_BROWN)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass/colorless"), Tags.Blocks.GLASS_BLOCKS_COLORLESS),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass/cyan"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_CYAN)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass/gray"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_GRAY)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass/green"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_GREEN)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass/light_blue"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_LIGHT_BLUE)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass/light_gray"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_LIGHT_GRAY)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass/lime"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_LIME)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass/magenta"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_MAGENTA)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass/orange"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_ORANGE)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass/pink"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_PINK)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass/purple"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_PURPLE)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass/red"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_RED)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass/silica"), Tags.Blocks.GLASS_BLOCKS_CHEAP),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass/tinted"), Tags.Blocks.GLASS_BLOCKS_TINTED),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass/white"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_WHITE)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass/yellow"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_YELLOW)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass_panes"), Tags.Blocks.GLASS_PANES),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/colorless"), Tags.Blocks.GLASS_PANES_COLORLESS),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/black"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_BLACK)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/blue"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_BLUE)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/brown"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_BROWN)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/cyan"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_CYAN)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/gray"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_GRAY)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/green"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_GREEN)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/light_blue"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_LIGHT_BLUE)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/light_gray"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_LIGHT_GRAY)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/lime"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_LIME)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/magenta"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_MAGENTA)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/orange"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_ORANGE)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/pink"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_PINK)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/purple"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_PURPLE)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/red"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_RED)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/white"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_WHITE)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/yellow"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_YELLOW)),
|
||||
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("obsidian"), Tags.Blocks.OBSIDIANS),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("ores"), Tags.Blocks.ORES),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("ores/netherite_scrap"), Tags.Blocks.ORES_NETHERITE_SCRAP),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("ores/quartz"), Tags.Blocks.ORES_QUARTZ),
|
||||
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("sandstone"), Tags.Blocks.SANDSTONE_BLOCKS),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("stained_glass"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Blocks.DYED)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("stained_glass_panes"), List.of(Tags.Blocks.GLASS_PANES, Tags.Blocks.DYED)),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("stone"), Tags.Blocks.STONES),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks"), Tags.Blocks.STORAGE_BLOCKS),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/coal"), Tags.Blocks.STORAGE_BLOCKS_COAL),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/copper"), Tags.Blocks.STORAGE_BLOCKS_COPPER),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/diamond"), Tags.Blocks.STORAGE_BLOCKS_DIAMOND),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/emerald"), Tags.Blocks.STORAGE_BLOCKS_EMERALD),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/gold"), Tags.Blocks.STORAGE_BLOCKS_GOLD),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/iron"), Tags.Blocks.STORAGE_BLOCKS_IRON),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/lapis"), Tags.Blocks.STORAGE_BLOCKS_LAPIS),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/netherite"), Tags.Blocks.STORAGE_BLOCKS_NETHERITE),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/quartz"), Tags.Blocks.STORAGE_BLOCKS_QUARTZ),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/raw_copper"), Tags.Blocks.STORAGE_BLOCKS_RAW_COPPER),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/raw_gold"), Tags.Blocks.STORAGE_BLOCKS_RAW_GOLD),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/raw_iron"), Tags.Blocks.STORAGE_BLOCKS_RAW_IRON),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/redstone"), Tags.Blocks.STORAGE_BLOCKS_REDSTONE),
|
||||
//endregion
|
||||
|
||||
//region Entity Types
|
||||
legacyToCommon(Registries.ENTITY_TYPE, forgeRl("bosses"), Tags.EntityTypes.BOSSES),
|
||||
//endregion
|
||||
|
||||
//region Items
|
||||
legacyToCommon(Registries.ITEM, forgeRl("barrels"), Tags.Items.BARRELS),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("barrels/wooden"), Tags.Items.BARRELS_WOODEN),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("bookshelves"), Tags.Items.BOOKSHELVES),
|
||||
|
||||
legacyToCommon(Registries.ITEM, forgeRl("chests"), Tags.Items.CHESTS),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("chests/wooden"), Tags.Items.CHESTS_WOODEN),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("cobblestone"), Tags.Items.COBBLESTONES),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("crops"), Tags.Items.CROPS),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("crops/beetroot"), Tags.Items.CROPS_BEETROOT),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("crops/carrot"), Tags.Items.CROPS_CARROT),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("crops/potato"), Tags.Items.CROPS_POTATO),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("crops/wheat"), Tags.Items.CROPS_WHEAT),
|
||||
|
||||
legacyToCommon(Registries.ITEM, forgeRl("dusts"), Tags.Items.DUSTS),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("dusts/redstone"), Tags.Items.DUSTS_REDSTONE),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("dusts/glowstone"), Tags.Items.DUSTS_GLOWSTONE),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("dyes"), Tags.Items.DYES),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("dyes/black"), Tags.Items.DYES_BLACK),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("dyes/red"), Tags.Items.DYES_RED),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("dyes/green"), Tags.Items.DYES_GREEN),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("dyes/brown"), Tags.Items.DYES_BROWN),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("dyes/blue"), Tags.Items.DYES_BLUE),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("dyes/purple"), Tags.Items.DYES_PURPLE),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("dyes/cyan"), Tags.Items.DYES_CYAN),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("dyes/light_gray"), Tags.Items.DYES_LIGHT_GRAY),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("dyes/gray"), Tags.Items.DYES_GRAY),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("dyes/pink"), Tags.Items.DYES_PINK),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("dyes/lime"), Tags.Items.DYES_LIME),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("dyes/yellow"), Tags.Items.DYES_YELLOW),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("dyes/light_blue"), Tags.Items.DYES_LIGHT_BLUE),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("dyes/magenta"), Tags.Items.DYES_MAGENTA),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("dyes/orange"), Tags.Items.DYES_ORANGE),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("dyes/white"), Tags.Items.DYES_WHITE),
|
||||
|
||||
legacyToCommon(Registries.ITEM, forgeRl("ender_pearls"), Tags.Items.ENDER_PEARLS),
|
||||
|
||||
legacyToCommon(Registries.ITEM, forgeRl("gems"), Tags.Items.GEMS),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("gems/diamond"), Tags.Items.GEMS_DIAMOND),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("gems/emerald"), Tags.Items.GEMS_EMERALD),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("gems/amethyst"), Tags.Items.GEMS_AMETHYST),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("gems/lapis"), Tags.Items.GEMS_LAPIS),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("gems/quartz"), Tags.Items.GEMS_QUARTZ),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass"), Tags.Items.GLASS_BLOCKS),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass/black"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_BLACK)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass/blue"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_BLUE)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass/brown"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_BROWN)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass/colorless"), Tags.Items.GLASS_BLOCKS_COLORLESS),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass/cyan"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_CYAN)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass/gray"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_GRAY)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass/green"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_GREEN)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass/light_blue"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_LIGHT_BLUE)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass/light_gray"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_LIGHT_GRAY)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass/lime"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_LIME)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass/magenta"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_MAGENTA)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass/orange"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_ORANGE)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass/pink"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_PINK)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass/purple"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_PURPLE)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass/red"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_RED)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass/silica"), Tags.Items.GLASS_BLOCKS_CHEAP),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass/tinted"), Tags.Items.GLASS_BLOCKS_TINTED),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass/white"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_WHITE)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass/yellow"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_YELLOW)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass_panes"), Tags.Items.GLASS_PANES),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass_panes/black"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_BLACK)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass_panes/blue"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_BLUE)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass_panes/brown"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_BROWN)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass_panes/colorless"), Tags.Items.GLASS_PANES_COLORLESS),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass_panes/cyan"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_CYAN)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass_panes/gray"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_GRAY)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass_panes/green"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_GREEN)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass_panes/light_blue"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_LIGHT_BLUE)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass_panes/light_gray"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_LIGHT_GRAY)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass_panes/lime"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_LIME)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass_panes/magenta"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_MAGENTA)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass_panes/orange"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_ORANGE)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass_panes/pink"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_PINK)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass_panes/purple"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_PURPLE)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass_panes/red"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_RED)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass_panes/white"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_WHITE)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("glass_panes/yellow"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_YELLOW)),
|
||||
|
||||
legacyToCommon(Registries.ITEM, forgeRl("obsidian"), Tags.Items.OBSIDIANS),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("ingots"), Tags.Items.INGOTS),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("ingots/brick"), Tags.Items.BRICKS_NORMAL),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("ingots/copper"), Tags.Items.INGOTS_COPPER),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("ingots/gold"), Tags.Items.INGOTS_GOLD),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("ingots/iron"), Tags.Items.INGOTS_IRON),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("ingots/netherite"), Tags.Items.INGOTS_NETHERITE),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("ingots/nether_brick"), Tags.Items.BRICKS_NETHER),
|
||||
|
||||
legacyToCommon(Registries.ITEM, forgeRl("leather"), Tags.Items.LEATHERS),
|
||||
|
||||
legacyToCommon(Registries.ITEM, forgeRl("nuggets"), Tags.Items.NUGGETS),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("nuggets/gold"), Tags.Items.NUGGETS_GOLD),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("nuggets/iron"), Tags.Items.NUGGETS_IRON),
|
||||
|
||||
legacyToCommon(Registries.ITEM, forgeRl("ores"), Tags.Items.ORES),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("ores/netherite_scrap"), Tags.Items.ORES_NETHERITE_SCRAP),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("ores/quartz"), Tags.Items.ORES_QUARTZ),
|
||||
|
||||
legacyToCommon(Registries.ITEM, forgeRl("raw_materials"), Tags.Items.RAW_MATERIALS),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("raw_materials/copper"), Tags.Items.RAW_MATERIALS_COPPER),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("raw_materials/gold"), Tags.Items.RAW_MATERIALS_GOLD),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("raw_materials/iron"), Tags.Items.RAW_MATERIALS_IRON),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("rods"), Tags.Items.RODS),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("rods/blaze"), Tags.Items.RODS_BLAZE),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("rods/wooden"), Tags.Items.RODS_WOODEN),
|
||||
|
||||
legacyToCommon(Registries.ITEM, forgeRl("sandstone"), Tags.Items.SANDSTONE_BLOCKS),
|
||||
|
||||
legacyToCommon(Registries.ITEM, forgeRl("slimeballs"), Tags.Items.SLIME_BALLS),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("stained_glass"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Blocks.DYED)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("stained_glass_panes"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Blocks.DYED)),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("stone"), Tags.Items.STONES),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("storage_blocks"), Tags.Items.STORAGE_BLOCKS),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/coal"), Tags.Items.STORAGE_BLOCKS_COAL),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/copper"), Tags.Items.STORAGE_BLOCKS_COPPER),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/diamond"), Tags.Items.STORAGE_BLOCKS_DIAMOND),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/emerald"), Tags.Items.STORAGE_BLOCKS_EMERALD),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/gold"), Tags.Items.STORAGE_BLOCKS_GOLD),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/iron"), Tags.Items.STORAGE_BLOCKS_IRON),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/lapis"), Tags.Items.STORAGE_BLOCKS_LAPIS),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/netherite"), Tags.Items.STORAGE_BLOCKS_NETHERITE),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/quartz"), Tags.Items.STORAGE_BLOCKS_QUARTZ),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/raw_copper"), Tags.Items.STORAGE_BLOCKS_RAW_COPPER),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/raw_gold"), Tags.Items.STORAGE_BLOCKS_RAW_GOLD),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/raw_iron"), Tags.Items.STORAGE_BLOCKS_RAW_IRON),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/redstone"), Tags.Items.STORAGE_BLOCKS_REDSTONE),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("string"), Tags.Items.STRINGS),
|
||||
|
||||
legacyToCommon(Registries.ITEM, forgeRl("tools"), Tags.Items.TOOLS),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("tools/shields"), Tags.Items.TOOLS_SHIELD),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("tools/bows"), Tags.Items.TOOLS_BOW),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("tools/crossbows"), Tags.Items.TOOLS_CROSSBOW),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("tools/fishing_rods"), Tags.Items.TOOLS_FISHING_ROD),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("tools/tridents"), Tags.Items.TOOLS_SPEAR),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("tools/shears"), Tags.Items.TOOLS_SHEAR),
|
||||
|
||||
legacyToCommon(Registries.ITEM, forgeRl("armors"), Tags.Items.ARMORS),
|
||||
//endregion
|
||||
|
||||
//region Fluids
|
||||
legacyToCommon(Registries.FLUID, forgeRl("milk"), Tags.Fluids.MILK),
|
||||
//endregion
|
||||
|
||||
//region Biomes
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_void"), Tags.Biomes.IS_VOID),
|
||||
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_hot"), Tags.Biomes.IS_HOT),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_hot/overworld"), Tags.Biomes.IS_HOT_OVERWORLD),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_hot/nether"), Tags.Biomes.IS_HOT_NETHER),
|
||||
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_cold"), Tags.Biomes.IS_COLD),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_cold/overworld"), Tags.Biomes.IS_COLD_OVERWORLD),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_cold/end"), Tags.Biomes.IS_COLD_END),
|
||||
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_sparse"), Tags.Biomes.IS_SPARSE_VEGETATION),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_sparse/overworld"), Tags.Biomes.IS_SPARSE_VEGETATION_OVERWORLD),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_dense"), Tags.Biomes.IS_DENSE_VEGETATION),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_dense/overworld"), Tags.Biomes.IS_DENSE_VEGETATION_OVERWORLD),
|
||||
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_wet"), Tags.Biomes.IS_WET),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_wet/overworld"), Tags.Biomes.IS_WET_OVERWORLD),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_dry"), Tags.Biomes.IS_DRY),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_dry/overworld"), Tags.Biomes.IS_DRY_OVERWORLD),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_dry/nether"), Tags.Biomes.IS_DRY_NETHER),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_dry/end"), Tags.Biomes.IS_DRY_END),
|
||||
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_coniferous"), Tags.Biomes.IS_CONIFEROUS_TREE),
|
||||
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_mountain"), Tags.Biomes.IS_MOUNTAIN),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_peak"), Tags.Biomes.IS_MOUNTAIN_PEAK),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_slope"), Tags.Biomes.IS_MOUNTAIN_SLOPE),
|
||||
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_plains"), Tags.Biomes.IS_PLAINS),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_swamp"), Tags.Biomes.IS_SWAMP),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_desert"), Tags.Biomes.IS_DESERT),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_mushroom"), Tags.Biomes.IS_MUSHROOM),
|
||||
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_underground"), Tags.Biomes.IS_UNDERGROUND),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_cave"), Tags.Biomes.IS_CAVE),
|
||||
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_wasteland"), Tags.Biomes.IS_WASTELAND),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_dead"), Tags.Biomes.IS_DEAD),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_water"), Tags.Biomes.IS_AQUATIC),
|
||||
//endregion
|
||||
|
||||
//region Unofficial
|
||||
// These tags have technically never been included with Forge in the past, but now that common convention
|
||||
// equivalents exist that Forge does include, these mappings have been added for convenience, just in case
|
||||
// some mods have been using them as a de-facto standard.
|
||||
|
||||
// Workstations
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("crafting_table"), Tags.Blocks.PLAYER_WORKSTATIONS_CRAFTING_TABLES),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("crafting_tables"), Tags.Blocks.PLAYER_WORKSTATIONS_CRAFTING_TABLES),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("furnace"), Tags.Blocks.PLAYER_WORKSTATIONS_FURNACES),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("furnaces"), Tags.Blocks.PLAYER_WORKSTATIONS_FURNACES),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("workbench"), Tags.Blocks.PLAYER_WORKSTATIONS_CRAFTING_TABLES),
|
||||
legacyToCommon(Registries.BLOCK, forgeRl("workbenches"), Tags.Blocks.PLAYER_WORKSTATIONS_CRAFTING_TABLES),
|
||||
|
||||
legacyToCommon(Registries.ITEM, forgeRl("crafting_table"), Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("crafting_tables"), Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("furnace"), Tags.Items.PLAYER_WORKSTATIONS_FURNACES),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("furnaces"), Tags.Items.PLAYER_WORKSTATIONS_FURNACES),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("workbench"), Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("workbenches"), Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES),
|
||||
|
||||
// Foods
|
||||
legacyToCommon(Registries.ITEM, forgeRl("food"), Tags.Items.FOODS),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("foods"), Tags.Items.FOODS),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("fruit"), Tags.Items.FOODS_FRUIT),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("fruits"), Tags.Items.FOODS_FRUIT),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("vegetable"), Tags.Items.FOODS_VEGETABLE),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("vegetables"), Tags.Items.FOODS_VEGETABLE),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("berry"), Tags.Items.FOODS_BERRY),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("berries"), Tags.Items.FOODS_BERRY),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("bread"), Tags.Items.FOODS_BREAD),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("breads"), Tags.Items.FOODS_BREAD),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("cookie"), Tags.Items.FOODS_COOKIE),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("cookies"), Tags.Items.FOODS_COOKIE),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("raw_meat"), Tags.Items.FOODS_RAW_MEAT),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("raw_meats"), Tags.Items.FOODS_RAW_MEAT),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("raw_fish"), Tags.Items.FOODS_RAW_FISH),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("raw_fishes"), Tags.Items.FOODS_RAW_FISH),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("cooked_meat"), Tags.Items.FOODS_COOKED_MEAT),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("cooked_meats"), Tags.Items.FOODS_COOKED_MEAT),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("cooked_fish"), Tags.Items.FOODS_COOKED_FISH),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("cooked_fishes"), Tags.Items.FOODS_COOKED_FISH),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("soup"), Tags.Items.FOODS_SOUP),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("soups"), Tags.Items.FOODS_SOUP),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("stew"), Tags.Items.FOODS_SOUP),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("stews"), Tags.Items.FOODS_SOUP),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("candy"), Tags.Items.FOODS_CANDY),
|
||||
legacyToCommon(Registries.ITEM, forgeRl("candies"), Tags.Items.FOODS_CANDY),
|
||||
|
||||
// Fluids
|
||||
legacyToCommon(Registries.FLUID, forgeRl("water"), Tags.Fluids.WATER),
|
||||
legacyToCommon(Registries.FLUID, forgeRl("lava"), Tags.Fluids.LAVA),
|
||||
legacyToCommon(Registries.FLUID, forgeRl("honey"), Tags.Fluids.HONEY),
|
||||
|
||||
// Biomes
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_overworld"), Tags.Biomes.IS_OVERWORLD),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_nether"), Tags.Biomes.IS_NETHER),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_nether_forest"), Tags.Biomes.IS_NETHER_FOREST),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_end"), Tags.Biomes.IS_END),
|
||||
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_forest"), Tags.Biomes.IS_FOREST),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_jungle"), Tags.Biomes.IS_JUNGLE),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_savanna"), Tags.Biomes.IS_SAVANNA),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_floral"), Tags.Biomes.IS_FLORAL),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_snowy"), Tags.Biomes.IS_SNOWY),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_icy"), Tags.Biomes.IS_ICY),
|
||||
legacyToCommon(Registries.BIOME, forgeRl("is_ocean"), Tags.Biomes.IS_OCEAN)
|
||||
//endregion
|
||||
);
|
||||
|
||||
/**
|
||||
* Creates a mapping from a legacy tag to a common convention equivalent.
|
||||
* <p>
|
||||
* Example: {@code legacyToCommon(Registries.BLOCK, forgeRl("cobblestone"), Tags.Blocks.COBBLESTONES)} for {@code forge:cobblestone} -> {@code c:cobblestones}
|
||||
* </p>
|
||||
* @param registryKey Example: {@link net.minecraft.core.registries.Registries.BLOCK}
|
||||
* @param legacyTagResourceLocation Example: {@code forgeRl("cobblestone")}
|
||||
* @param replacementTag Example: {@link Tags.Blocks#COBBLESTONES}
|
||||
* @return A map entry with the legacy tag's TagKey and the suggested replacement tag ID.
|
||||
*/
|
||||
private static <T, R> Map.Entry<TagKey<T>, String> legacyToCommon(ResourceKey<Registry<T>> registryKey,
|
||||
ResourceLocation legacyTagResourceLocation,
|
||||
TagKey<R> replacementTag) {
|
||||
return Map.entry(TagKey.create(registryKey, legacyTagResourceLocation), replacementTag.toString());
|
||||
}
|
||||
|
||||
/**
|
||||
* Same as {@link #legacyToCommon(ResourceKey, ResourceLocation, TagKey)} but for multiple replacement tags.
|
||||
* This is useful when a single legacy tag is intended to be replaced by combining multiple common convention tags.
|
||||
*/
|
||||
private static <T> Map.Entry<TagKey<T>, String> legacyToCommon(ResourceKey<Registry<T>> registryKey,
|
||||
ResourceLocation legacyTagRessourceLocation,
|
||||
List<TagKey<?>> replacementTags) {
|
||||
return Map.entry(
|
||||
TagKey.create(registryKey, legacyTagRessourceLocation),
|
||||
replacementTags.stream().map(TagKey::toString).collect(Collectors.joining(" and "))
|
||||
);
|
||||
}
|
||||
|
||||
private static ResourceLocation forgeRl(String path) {
|
||||
return ResourceLocation.fromNamespaceAndPath("forge", path);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,77 @@
|
||||
/*
|
||||
* Copyright (c) Forge Development LLC and contributors
|
||||
* SPDX-License-Identifier: LGPL-2.1-only
|
||||
*/
|
||||
|
||||
package net.minecraftforge.common;
|
||||
|
||||
import net.minecraft.core.RegistryAccess;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.tags.TagKey;
|
||||
import net.minecraftforge.event.server.ServerStartingEvent;
|
||||
import net.minecraftforge.fml.loading.FMLLoader;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.jetbrains.annotations.ApiStatus;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* Internal implementation for optionally logging warnings about legacy tags along with suggestions for direct
|
||||
* replacements, in order to help modders migrate to the new tags.
|
||||
* @see ForgeConfig.Common#migrationHelperMode
|
||||
*/
|
||||
@ApiStatus.Internal
|
||||
public final class TagConventionMigrationHelper {
|
||||
private TagConventionMigrationHelper() {}
|
||||
|
||||
private static final ArrayList<TagKey<?>> FOUND_LEGACY_TAGS = new ArrayList<>();
|
||||
|
||||
static void init() {
|
||||
MinecraftForge.EVENT_BUS.addListener(TagConventionMigrationHelper::onServerStarting);
|
||||
}
|
||||
|
||||
public static void onServerStarting(ServerStartingEvent event) {
|
||||
// note: this check has to be done here because the config is not loaded until the server is starting
|
||||
var mode = ForgeConfig.COMMON.migrationHelperMode.get();
|
||||
boolean shouldRun = switch (mode) {
|
||||
case OFF -> false;
|
||||
case ONLY_IN_DEV_ENV -> !FMLLoader.isProduction();
|
||||
case ALWAYS -> true;
|
||||
};
|
||||
|
||||
if (shouldRun)
|
||||
run(event.getServer().registryAccess());
|
||||
}
|
||||
|
||||
private static void run(RegistryAccess.Frozen registryAccess) {
|
||||
registryAccess.registries().forEach(registryEntry -> {
|
||||
if (registryEntry.key().location().getNamespace().equals(ResourceLocation.DEFAULT_NAMESPACE)) {
|
||||
FOUND_LEGACY_TAGS.addAll(
|
||||
registryEntry.value().getTagNames().filter(TagConventionMappings.MAPPINGS::containsKey).toList()
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
if (FOUND_LEGACY_TAGS.isEmpty())
|
||||
return;
|
||||
|
||||
var stringBuilder = new StringBuilder("""
|
||||
~~~~~~~~ Tag migration helper ~~~~~~~~
|
||||
Warning for mod devs: Found known legacy tags that have direct common convention equivalents - consider migrating these to improve compatibility with other mods.
|
||||
Note: This feature isn't fully comprehensive - see Forge's net.minecraftforge.common.Tags class for a full list of tags.
|
||||
You can disable this message by setting "migrationHelperMode" to "OFF" in Forge's common config.
|
||||
|
||||
Here are some suggestions for replacements:""".stripIndent());
|
||||
|
||||
for (var legacyTag : FOUND_LEGACY_TAGS) {
|
||||
var replacement = TagConventionMappings.MAPPINGS.get(legacyTag);
|
||||
stringBuilder.append("\n- ").append(legacyTag).append(" -> ").append(replacement);
|
||||
}
|
||||
stringBuilder.append("\n~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
|
||||
|
||||
LogManager.getLogger().warn(stringBuilder);
|
||||
FOUND_LEGACY_TAGS.clear();
|
||||
FOUND_LEGACY_TAGS.trimToSize();
|
||||
}
|
||||
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,21 @@
|
||||
/*
|
||||
* Copyright (c) Forge Development LLC and contributors
|
||||
* SPDX-License-Identifier: LGPL-2.1-only
|
||||
*/
|
||||
|
||||
package net.minecraftforge.common.data;
|
||||
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.data.PackOutput;
|
||||
import net.minecraft.data.tags.TagsProvider;
|
||||
import net.minecraft.world.item.enchantment.Enchantment;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
public abstract class EnchantmentTagsProvider extends TagsProvider<Enchantment> {
|
||||
public EnchantmentTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, String modId, @Nullable ExistingFileHelper existingFileHelper) {
|
||||
super(output, Registries.ENCHANTMENT, lookupProvider, modId, existingFileHelper);
|
||||
}
|
||||
}
|
||||
@@ -9,104 +9,259 @@ import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.data.PackOutput;
|
||||
import net.minecraft.data.tags.BiomeTagsProvider;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.tags.BiomeTags;
|
||||
import net.minecraft.tags.TagKey;
|
||||
import net.minecraft.world.level.biome.Biome;
|
||||
import net.minecraft.world.level.biome.Biomes;
|
||||
import net.minecraftforge.common.Tags;
|
||||
import org.jetbrains.annotations.ApiStatus;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
public final class ForgeBiomeTagsProvider extends BiomeTagsProvider
|
||||
{
|
||||
import static net.minecraftforge.common.Tags.Biomes.*;
|
||||
|
||||
public ForgeBiomeTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, ExistingFileHelper existingFileHelper)
|
||||
{
|
||||
@ApiStatus.Internal
|
||||
public final class ForgeBiomeTagsProvider extends BiomeTagsProvider {
|
||||
public ForgeBiomeTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, ExistingFileHelper existingFileHelper) {
|
||||
super(output, lookupProvider, "forge", existingFileHelper);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void addTags(HolderLookup.Provider lookupProvider)
|
||||
{
|
||||
tag(Biomes.PLAINS, Tags.Biomes.IS_PLAINS);
|
||||
tag(Biomes.DESERT, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_DRY_OVERWORLD, Tags.Biomes.IS_SANDY, Tags.Biomes.IS_DESERT);
|
||||
tag(Biomes.TAIGA, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_CONIFEROUS);
|
||||
tag(Biomes.SWAMP, Tags.Biomes.IS_WET_OVERWORLD, Tags.Biomes.IS_SWAMP);
|
||||
tag(Biomes.NETHER_WASTES, Tags.Biomes.IS_HOT_NETHER, Tags.Biomes.IS_DRY_NETHER);
|
||||
tag(Biomes.THE_END, Tags.Biomes.IS_COLD_END, Tags.Biomes.IS_DRY_END);
|
||||
tag(Biomes.FROZEN_OCEAN, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_SNOWY);
|
||||
tag(Biomes.FROZEN_RIVER, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_SNOWY);
|
||||
tag(Biomes.SNOWY_PLAINS, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_SNOWY, Tags.Biomes.IS_WASTELAND, Tags.Biomes.IS_PLAINS);
|
||||
tag(Biomes.MUSHROOM_FIELDS, Tags.Biomes.IS_MUSHROOM, Tags.Biomes.IS_RARE);
|
||||
tag(Biomes.JUNGLE, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_WET_OVERWORLD, Tags.Biomes.IS_DENSE_OVERWORLD);
|
||||
tag(Biomes.SPARSE_JUNGLE, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_WET_OVERWORLD, Tags.Biomes.IS_RARE);
|
||||
tag(Biomes.BEACH, Tags.Biomes.IS_WET_OVERWORLD, Tags.Biomes.IS_SANDY);
|
||||
tag(Biomes.SNOWY_BEACH, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_SNOWY);
|
||||
tag(Biomes.DARK_FOREST, Tags.Biomes.IS_SPOOKY, Tags.Biomes.IS_DENSE_OVERWORLD);
|
||||
tag(Biomes.SNOWY_TAIGA, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_CONIFEROUS, Tags.Biomes.IS_SNOWY);
|
||||
tag(Biomes.OLD_GROWTH_PINE_TAIGA, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_CONIFEROUS);
|
||||
tag(Biomes.WINDSWEPT_FOREST, Tags.Biomes.IS_SPARSE_OVERWORLD);
|
||||
tag(Biomes.SAVANNA, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_SPARSE_OVERWORLD);
|
||||
tag(Biomes.SAVANNA_PLATEAU, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_SPARSE_OVERWORLD, Tags.Biomes.IS_RARE, Tags.Biomes.IS_SLOPE, Tags.Biomes.IS_PLATEAU);
|
||||
tag(Biomes.BADLANDS, Tags.Biomes.IS_SANDY, Tags.Biomes.IS_DRY_OVERWORLD);
|
||||
tag(Biomes.WOODED_BADLANDS, Tags.Biomes.IS_SANDY, Tags.Biomes.IS_DRY_OVERWORLD, Tags.Biomes.IS_SPARSE_OVERWORLD, Tags.Biomes.IS_SLOPE, Tags.Biomes.IS_PLATEAU);
|
||||
tag(Biomes.MEADOW, Tags.Biomes.IS_PLAINS, Tags.Biomes.IS_PLATEAU, Tags.Biomes.IS_SLOPE);
|
||||
tag(Biomes.GROVE, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_CONIFEROUS, Tags.Biomes.IS_SNOWY, Tags.Biomes.IS_SLOPE);
|
||||
tag(Biomes.SNOWY_SLOPES, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_SPARSE_OVERWORLD, Tags.Biomes.IS_SNOWY, Tags.Biomes.IS_SLOPE);
|
||||
tag(Biomes.JAGGED_PEAKS, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_SPARSE_OVERWORLD, Tags.Biomes.IS_SNOWY, Tags.Biomes.IS_PEAK);
|
||||
tag(Biomes.FROZEN_PEAKS, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_SPARSE_OVERWORLD, Tags.Biomes.IS_SNOWY, Tags.Biomes.IS_PEAK);
|
||||
tag(Biomes.STONY_PEAKS, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_PEAK);
|
||||
tag(Biomes.SMALL_END_ISLANDS, Tags.Biomes.IS_COLD_END, Tags.Biomes.IS_DRY_END);
|
||||
tag(Biomes.END_MIDLANDS, Tags.Biomes.IS_COLD_END, Tags.Biomes.IS_DRY_END);
|
||||
tag(Biomes.END_HIGHLANDS, Tags.Biomes.IS_COLD_END, Tags.Biomes.IS_DRY_END);
|
||||
tag(Biomes.END_BARRENS, Tags.Biomes.IS_COLD_END, Tags.Biomes.IS_DRY_END);
|
||||
tag(Biomes.WARM_OCEAN, Tags.Biomes.IS_HOT_OVERWORLD);
|
||||
tag(Biomes.COLD_OCEAN, Tags.Biomes.IS_COLD_OVERWORLD);
|
||||
tag(Biomes.DEEP_COLD_OCEAN, Tags.Biomes.IS_COLD_OVERWORLD);
|
||||
tag(Biomes.DEEP_FROZEN_OCEAN, Tags.Biomes.IS_COLD_OVERWORLD);
|
||||
tag(Biomes.THE_VOID, Tags.Biomes.IS_VOID);
|
||||
tag(Biomes.SUNFLOWER_PLAINS, Tags.Biomes.IS_PLAINS, Tags.Biomes.IS_RARE);
|
||||
tag(Biomes.WINDSWEPT_GRAVELLY_HILLS, Tags.Biomes.IS_SPARSE_OVERWORLD, Tags.Biomes.IS_RARE);
|
||||
tag(Biomes.FLOWER_FOREST, Tags.Biomes.IS_RARE);
|
||||
tag(Biomes.ICE_SPIKES, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_SNOWY, Tags.Biomes.IS_RARE);
|
||||
tag(Biomes.OLD_GROWTH_BIRCH_FOREST, Tags.Biomes.IS_DENSE_OVERWORLD, Tags.Biomes.IS_RARE);
|
||||
tag(Biomes.OLD_GROWTH_SPRUCE_TAIGA, Tags.Biomes.IS_DENSE_OVERWORLD, Tags.Biomes.IS_RARE);
|
||||
tag(Biomes.WINDSWEPT_SAVANNA, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_DRY_OVERWORLD, Tags.Biomes.IS_SPARSE_OVERWORLD, Tags.Biomes.IS_RARE);
|
||||
tag(Biomes.ERODED_BADLANDS, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_DRY_OVERWORLD, Tags.Biomes.IS_SPARSE_OVERWORLD, Tags.Biomes.IS_RARE);
|
||||
tag(Biomes.BAMBOO_JUNGLE, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_WET_OVERWORLD, Tags.Biomes.IS_RARE);
|
||||
tag(Biomes.LUSH_CAVES, Tags.Biomes.IS_CAVE, Tags.Biomes.IS_LUSH, Tags.Biomes.IS_WET_OVERWORLD);
|
||||
tag(Biomes.DRIPSTONE_CAVES, Tags.Biomes.IS_CAVE, Tags.Biomes.IS_SPARSE_OVERWORLD);
|
||||
tag(Biomes.SOUL_SAND_VALLEY, Tags.Biomes.IS_HOT_NETHER, Tags.Biomes.IS_DRY_NETHER);
|
||||
tag(Biomes.CRIMSON_FOREST, Tags.Biomes.IS_HOT_NETHER, Tags.Biomes.IS_DRY_NETHER);
|
||||
tag(Biomes.WARPED_FOREST, Tags.Biomes.IS_HOT_NETHER, Tags.Biomes.IS_DRY_NETHER);
|
||||
tag(Biomes.BASALT_DELTAS, Tags.Biomes.IS_HOT_NETHER, Tags.Biomes.IS_DRY_NETHER);
|
||||
tag(Biomes.MANGROVE_SWAMP, Tags.Biomes.IS_WET_OVERWORLD, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_SWAMP);
|
||||
tag(Biomes.DEEP_DARK, Tags.Biomes.IS_CAVE, Tags.Biomes.IS_RARE, Tags.Biomes.IS_SPOOKY);
|
||||
protected void addTags(HolderLookup.Provider lookupProvider) {
|
||||
tag(NO_DEFAULT_MONSTERS).add(Biomes.MUSHROOM_FIELDS).add(Biomes.DEEP_DARK);
|
||||
tag(HIDDEN_FROM_LOCATOR_SELECTION); // Create tag file for visibility
|
||||
|
||||
tag(Tags.Biomes.IS_HOT).addTag(Tags.Biomes.IS_HOT_OVERWORLD).addTag(Tags.Biomes.IS_HOT_NETHER).addOptionalTag(Tags.Biomes.IS_HOT_END.location());
|
||||
tag(Tags.Biomes.IS_COLD).addTag(Tags.Biomes.IS_COLD_OVERWORLD).addOptionalTag(Tags.Biomes.IS_COLD_NETHER.location()).addTag(Tags.Biomes.IS_COLD_END);
|
||||
tag(Tags.Biomes.IS_SPARSE).addTag(Tags.Biomes.IS_SPARSE_OVERWORLD).addOptionalTag(Tags.Biomes.IS_SPARSE_NETHER.location()).addOptionalTag(Tags.Biomes.IS_SPARSE_END.location());
|
||||
tag(Tags.Biomes.IS_DENSE).addTag(Tags.Biomes.IS_DENSE_OVERWORLD).addOptionalTag(Tags.Biomes.IS_DENSE_NETHER.location()).addOptionalTag(Tags.Biomes.IS_DENSE_END.location());
|
||||
tag(Tags.Biomes.IS_WET).addTag(Tags.Biomes.IS_WET_OVERWORLD).addOptionalTag(Tags.Biomes.IS_WET_NETHER.location()).addOptionalTag(Tags.Biomes.IS_WET_END.location());
|
||||
tag(Tags.Biomes.IS_DRY).addTag(Tags.Biomes.IS_DRY_OVERWORLD).addTag(Tags.Biomes.IS_DRY_NETHER).addTag(Tags.Biomes.IS_DRY_END);
|
||||
tag(IS_VOID).add(Biomes.THE_VOID);
|
||||
|
||||
tag(Tags.Biomes.IS_WATER).addTag(BiomeTags.IS_OCEAN).addTag(BiomeTags.IS_RIVER);
|
||||
tag(Tags.Biomes.IS_MOUNTAIN).addTag(Tags.Biomes.IS_PEAK).addTag(Tags.Biomes.IS_SLOPE);
|
||||
tag(Tags.Biomes.IS_UNDERGROUND).addTag(Tags.Biomes.IS_CAVE);
|
||||
tag(IS_END).addTags(BiomeTags.IS_END);
|
||||
tag(IS_NETHER).addTags(BiomeTags.IS_NETHER);
|
||||
tag(IS_OVERWORLD).addTags(BiomeTags.IS_OVERWORLD);
|
||||
|
||||
tag(IS_HOT_OVERWORLD)
|
||||
.add(Biomes.SWAMP)
|
||||
.add(Biomes.MANGROVE_SWAMP)
|
||||
.add(Biomes.JUNGLE)
|
||||
.add(Biomes.BAMBOO_JUNGLE)
|
||||
.add(Biomes.SPARSE_JUNGLE)
|
||||
.add(Biomes.DESERT)
|
||||
.add(Biomes.BADLANDS)
|
||||
.add(Biomes.WOODED_BADLANDS)
|
||||
.add(Biomes.ERODED_BADLANDS)
|
||||
.add(Biomes.SAVANNA)
|
||||
.add(Biomes.SAVANNA_PLATEAU)
|
||||
.add(Biomes.WINDSWEPT_SAVANNA)
|
||||
.add(Biomes.STONY_PEAKS)
|
||||
.add(Biomes.WARM_OCEAN);
|
||||
tag(IS_HOT_NETHER)
|
||||
.add(Biomes.NETHER_WASTES)
|
||||
.add(Biomes.CRIMSON_FOREST)
|
||||
.add(Biomes.WARPED_FOREST)
|
||||
.add(Biomes.SOUL_SAND_VALLEY)
|
||||
.add(Biomes.BASALT_DELTAS);
|
||||
tag(IS_HOT_END);
|
||||
tag(IS_HOT).addTag(IS_HOT_OVERWORLD).addTag(IS_HOT_NETHER).addOptionalTag(IS_HOT_END.location());
|
||||
|
||||
tag(IS_COLD_OVERWORLD)
|
||||
.add(Biomes.TAIGA)
|
||||
.add(Biomes.OLD_GROWTH_PINE_TAIGA)
|
||||
.add(Biomes.OLD_GROWTH_SPRUCE_TAIGA)
|
||||
.add(Biomes.WINDSWEPT_HILLS)
|
||||
.add(Biomes.WINDSWEPT_GRAVELLY_HILLS)
|
||||
.add(Biomes.WINDSWEPT_FOREST)
|
||||
.add(Biomes.SNOWY_PLAINS)
|
||||
.add(Biomes.ICE_SPIKES)
|
||||
.add(Biomes.GROVE)
|
||||
.add(Biomes.SNOWY_SLOPES)
|
||||
.add(Biomes.JAGGED_PEAKS)
|
||||
.add(Biomes.FROZEN_PEAKS)
|
||||
.add(Biomes.STONY_SHORE)
|
||||
.add(Biomes.SNOWY_BEACH)
|
||||
.add(Biomes.SNOWY_TAIGA)
|
||||
.add(Biomes.FROZEN_RIVER)
|
||||
.add(Biomes.COLD_OCEAN)
|
||||
.add(Biomes.FROZEN_OCEAN)
|
||||
.add(Biomes.DEEP_COLD_OCEAN)
|
||||
.add(Biomes.DEEP_FROZEN_OCEAN);
|
||||
tag(IS_COLD_NETHER);
|
||||
tag(IS_COLD_END)
|
||||
.add(Biomes.THE_END)
|
||||
.add(Biomes.SMALL_END_ISLANDS)
|
||||
.add(Biomes.END_MIDLANDS)
|
||||
.add(Biomes.END_HIGHLANDS)
|
||||
.add(Biomes.END_BARRENS);
|
||||
tag(IS_COLD).addTag(IS_COLD_OVERWORLD).addOptionalTag(IS_COLD_NETHER.location()).addTag(IS_COLD_END);
|
||||
|
||||
tag(IS_SPARSE_VEGETATION_OVERWORLD)
|
||||
.add(Biomes.WOODED_BADLANDS)
|
||||
.add(Biomes.SAVANNA)
|
||||
.add(Biomes.SAVANNA_PLATEAU)
|
||||
.add(Biomes.SPARSE_JUNGLE)
|
||||
.add(Biomes.WINDSWEPT_SAVANNA)
|
||||
.add(Biomes.WINDSWEPT_FOREST)
|
||||
.add(Biomes.WINDSWEPT_HILLS)
|
||||
.add(Biomes.WINDSWEPT_GRAVELLY_HILLS)
|
||||
.add(Biomes.SNOWY_SLOPES)
|
||||
.add(Biomes.JAGGED_PEAKS)
|
||||
.add(Biomes.FROZEN_PEAKS);
|
||||
tag(IS_SPARSE_NETHER);
|
||||
tag(IS_SPARSE_END);
|
||||
tag(IS_SPARSE_VEGETATION).addTag(IS_SPARSE_VEGETATION_OVERWORLD).addOptionalTag(IS_SPARSE_NETHER.location()).addOptionalTag(IS_SPARSE_END.location());
|
||||
|
||||
tag(IS_DENSE_VEGETATION_OVERWORLD)
|
||||
.add(Biomes.DARK_FOREST)
|
||||
.add(Biomes.OLD_GROWTH_BIRCH_FOREST)
|
||||
.add(Biomes.OLD_GROWTH_SPRUCE_TAIGA)
|
||||
.add(Biomes.JUNGLE)
|
||||
.add(Biomes.BAMBOO_JUNGLE)
|
||||
.add(Biomes.MANGROVE_SWAMP);
|
||||
tag(IS_DENSE_NETHER);
|
||||
tag(IS_DENSE_END);
|
||||
tag(IS_DENSE_VEGETATION).addTag(IS_DENSE_VEGETATION_OVERWORLD).addOptionalTag(IS_DENSE_NETHER.location()).addOptionalTag(IS_DENSE_END.location());
|
||||
|
||||
tag(IS_WET_OVERWORLD)
|
||||
.add(Biomes.SWAMP)
|
||||
.add(Biomes.MANGROVE_SWAMP)
|
||||
.add(Biomes.JUNGLE)
|
||||
.add(Biomes.BAMBOO_JUNGLE)
|
||||
.add(Biomes.SPARSE_JUNGLE)
|
||||
.add(Biomes.BEACH)
|
||||
.add(Biomes.LUSH_CAVES)
|
||||
.add(Biomes.DRIPSTONE_CAVES);
|
||||
tag(IS_WET_NETHER);
|
||||
tag(IS_WET_END);
|
||||
tag(IS_WET).addTag(IS_WET_OVERWORLD).addOptionalTag(IS_WET_NETHER.location()).addOptionalTag(IS_WET_END.location());
|
||||
|
||||
tag(IS_DRY_OVERWORLD)
|
||||
.add(Biomes.DESERT)
|
||||
.add(Biomes.BADLANDS)
|
||||
.add(Biomes.WOODED_BADLANDS)
|
||||
.add(Biomes.ERODED_BADLANDS)
|
||||
.add(Biomes.SAVANNA)
|
||||
.add(Biomes.SAVANNA_PLATEAU)
|
||||
.add(Biomes.WINDSWEPT_SAVANNA);
|
||||
tag(IS_DRY_NETHER)
|
||||
.add(Biomes.NETHER_WASTES)
|
||||
.add(Biomes.CRIMSON_FOREST)
|
||||
.add(Biomes.WARPED_FOREST)
|
||||
.add(Biomes.SOUL_SAND_VALLEY)
|
||||
.add(Biomes.BASALT_DELTAS);
|
||||
tag(IS_DRY_END)
|
||||
.add(Biomes.THE_END)
|
||||
.add(Biomes.SMALL_END_ISLANDS)
|
||||
.add(Biomes.END_MIDLANDS)
|
||||
.add(Biomes.END_HIGHLANDS)
|
||||
.add(Biomes.END_BARRENS);
|
||||
tag(IS_DRY).addTag(IS_DRY_OVERWORLD).addTag(IS_DRY_NETHER).addTag(IS_DRY_END);
|
||||
|
||||
tag(IS_CONIFEROUS_TREE).addTags(IS_TAIGA).add(Biomes.GROVE);
|
||||
tag(IS_SAVANNA_TREE).addTags(IS_SAVANNA);
|
||||
tag(IS_JUNGLE_TREE).addTags(IS_JUNGLE);
|
||||
tag(IS_DECIDUOUS_TREE).add(Biomes.FOREST).add(Biomes.FLOWER_FOREST).add(Biomes.BIRCH_FOREST).add(Biomes.DARK_FOREST).add(Biomes.OLD_GROWTH_BIRCH_FOREST).add(Biomes.WINDSWEPT_FOREST);
|
||||
|
||||
tag(IS_MOUNTAIN_SLOPE).add(Biomes.SNOWY_SLOPES).add(Biomes.MEADOW).add(Biomes.GROVE).add(Biomes.CHERRY_GROVE);
|
||||
tag(IS_MOUNTAIN_PEAK).add(Biomes.JAGGED_PEAKS).add(Biomes.FROZEN_PEAKS).add(Biomes.STONY_PEAKS);
|
||||
tag(IS_MOUNTAIN).addTag(BiomeTags.IS_MOUNTAIN).addTag(IS_MOUNTAIN_PEAK).addTag(IS_MOUNTAIN_SLOPE);
|
||||
|
||||
tag(IS_FOREST).addTags(BiomeTags.IS_FOREST);
|
||||
tag(IS_BIRCH_FOREST).add(Biomes.BIRCH_FOREST).add(Biomes.OLD_GROWTH_BIRCH_FOREST);
|
||||
tag(IS_FLOWER_FOREST).add(Biomes.FLOWER_FOREST);
|
||||
tag(IS_FLORAL).addTags(IS_FLOWER_FOREST).add(Biomes.SUNFLOWER_PLAINS).add(Biomes.CHERRY_GROVE).add(Biomes.MEADOW);
|
||||
tag(IS_BEACH).addTags(BiomeTags.IS_BEACH);
|
||||
tag(IS_STONY_SHORES).add(Biomes.STONY_SHORE);
|
||||
tag(IS_DESERT).add(Biomes.DESERT);
|
||||
tag(IS_BADLANDS).addTags(BiomeTags.IS_BADLANDS);
|
||||
tag(IS_PLAINS).add(Biomes.PLAINS).add(Biomes.SUNFLOWER_PLAINS);
|
||||
tag(IS_SNOWY_PLAINS).add(Biomes.SNOWY_PLAINS);
|
||||
tag(IS_TAIGA).addTags(BiomeTags.IS_TAIGA);
|
||||
tag(IS_HILL).addTags(BiomeTags.IS_HILL);
|
||||
tag(IS_WINDSWEPT).add(Biomes.WINDSWEPT_HILLS).add(Biomes.WINDSWEPT_GRAVELLY_HILLS).add(Biomes.WINDSWEPT_FOREST).add(Biomes.WINDSWEPT_SAVANNA);
|
||||
tag(IS_SAVANNA).addTags(BiomeTags.IS_SAVANNA);
|
||||
tag(IS_JUNGLE).addTags(BiomeTags.IS_JUNGLE);
|
||||
tag(IS_SNOWY).add(Biomes.SNOWY_BEACH).add(Biomes.SNOWY_PLAINS).add(Biomes.ICE_SPIKES).add(Biomes.SNOWY_TAIGA).add(Biomes.GROVE).add(Biomes.SNOWY_SLOPES).add(Biomes.JAGGED_PEAKS).add(Biomes.FROZEN_PEAKS);
|
||||
tag(IS_ICY).add(Biomes.ICE_SPIKES).add(Biomes.FROZEN_PEAKS);
|
||||
tag(IS_SWAMP).add(Biomes.SWAMP).add(Biomes.MANGROVE_SWAMP);
|
||||
tag(IS_OLD_GROWTH).add(Biomes.OLD_GROWTH_BIRCH_FOREST).add(Biomes.OLD_GROWTH_PINE_TAIGA).add(Biomes.OLD_GROWTH_SPRUCE_TAIGA);
|
||||
tag(IS_LUSH).add(Biomes.LUSH_CAVES);
|
||||
tag(IS_MAGICAL);
|
||||
tag(IS_MODIFIED);
|
||||
tag(IS_SANDY).add(Biomes.DESERT).add(Biomes.BADLANDS).add(Biomes.WOODED_BADLANDS).add(Biomes.ERODED_BADLANDS).add(Biomes.BEACH);
|
||||
tag(IS_MUSHROOM).add(Biomes.MUSHROOM_FIELDS);
|
||||
tag(IS_PLATEAU).add(Biomes.WOODED_BADLANDS).add(Biomes.SAVANNA_PLATEAU).add(Biomes.CHERRY_GROVE).add(Biomes.MEADOW);
|
||||
tag(IS_SPOOKY).add(Biomes.DARK_FOREST).add(Biomes.DEEP_DARK);
|
||||
tag(IS_WASTELAND);
|
||||
tag(IS_RARE).add(Biomes.SUNFLOWER_PLAINS).add(Biomes.FLOWER_FOREST).add(Biomes.OLD_GROWTH_BIRCH_FOREST).add(Biomes.OLD_GROWTH_SPRUCE_TAIGA).add(Biomes.BAMBOO_JUNGLE).add(Biomes.SPARSE_JUNGLE).add(Biomes.ERODED_BADLANDS).add(Biomes.SAVANNA_PLATEAU).add(Biomes.WINDSWEPT_SAVANNA).add(Biomes.ICE_SPIKES).add(Biomes.WINDSWEPT_GRAVELLY_HILLS).add(Biomes.MUSHROOM_FIELDS).add(Biomes.DEEP_DARK);
|
||||
|
||||
tag(IS_RIVER).addTags(BiomeTags.IS_RIVER);
|
||||
tag(IS_SHALLOW_OCEAN).add(Biomes.OCEAN).add(Biomes.LUKEWARM_OCEAN).add(Biomes.WARM_OCEAN).add(Biomes.COLD_OCEAN).add(Biomes.FROZEN_OCEAN);
|
||||
tag(IS_DEEP_OCEAN).addTags(BiomeTags.IS_DEEP_OCEAN);
|
||||
tag(IS_OCEAN).addTags(BiomeTags.IS_OCEAN).addTags(IS_SHALLOW_OCEAN).addTags(IS_DEEP_OCEAN);
|
||||
tag(IS_AQUATIC_ICY).add(Biomes.FROZEN_RIVER).add(Biomes.DEEP_FROZEN_OCEAN).add(Biomes.FROZEN_OCEAN);
|
||||
tag(IS_AQUATIC).addTag(IS_OCEAN).addTag(IS_RIVER);
|
||||
|
||||
tag(IS_CAVE).add(Biomes.LUSH_CAVES).add(Biomes.DRIPSTONE_CAVES).add(Biomes.DEEP_DARK);
|
||||
tag(IS_UNDERGROUND).addTag(IS_CAVE);
|
||||
|
||||
tag(IS_NETHER_FOREST).add(Biomes.CRIMSON_FOREST).add(Biomes.WARPED_FOREST);
|
||||
tag(IS_OUTER_END_ISLAND).add(Biomes.END_HIGHLANDS).add(Biomes.END_MIDLANDS).add(Biomes.END_BARRENS);
|
||||
|
||||
// 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
|
||||
tag(IS_MOUNTAIN_SLOPE).addOptionalTag(forgeRl("is_slope"));
|
||||
tag(IS_MOUNTAIN_PEAK).addOptionalTag(forgeRl("is_peak"));
|
||||
tagWithOptionalLegacy(IS_MOUNTAIN);
|
||||
tagWithOptionalLegacy(IS_HOT_OVERWORLD);
|
||||
tagWithOptionalLegacy(IS_HOT_NETHER);
|
||||
tagWithOptionalLegacy(IS_HOT);
|
||||
tagWithOptionalLegacy(IS_COLD_OVERWORLD);
|
||||
tagWithOptionalLegacy(IS_COLD_END);
|
||||
tagWithOptionalLegacy(IS_COLD);
|
||||
tagWithOptionalLegacy(IS_SPARSE_VEGETATION_OVERWORLD);
|
||||
tagWithOptionalLegacy(IS_SPARSE_VEGETATION);
|
||||
tag(IS_SPARSE_VEGETATION_OVERWORLD).addOptionalTag(forgeRl("is_sparse/overworld"));
|
||||
tag(IS_SPARSE_VEGETATION).addOptionalTag(forgeRl("is_sparse"));
|
||||
tag(IS_DENSE_VEGETATION_OVERWORLD).addOptionalTag(forgeRl("is_dense/overworld"));
|
||||
tag(IS_DENSE_END);
|
||||
tag(IS_DENSE_VEGETATION).addOptionalTag(forgeRl("is_dense"));
|
||||
tagWithOptionalLegacy(IS_WET_OVERWORLD);
|
||||
tagWithOptionalLegacy(IS_WET);
|
||||
tagWithOptionalLegacy(IS_DRY_OVERWORLD);
|
||||
tagWithOptionalLegacy(IS_DRY_NETHER);
|
||||
tagWithOptionalLegacy(IS_DRY_END);
|
||||
tagWithOptionalLegacy(IS_DRY);
|
||||
tagWithOptionalLegacy(IS_CONIFEROUS_TREE);
|
||||
tagWithOptionalLegacy(IS_DEAD);
|
||||
tagWithOptionalLegacy(IS_MUSHROOM);
|
||||
tagWithOptionalLegacy(IS_FLORAL);
|
||||
tag(IS_AQUATIC).addOptionalTag(forgeRl("is_water"));
|
||||
tagWithOptionalLegacy(IS_DESERT);
|
||||
tagWithOptionalLegacy(IS_PLAINS);
|
||||
tagWithOptionalLegacy(IS_SWAMP);
|
||||
tagWithOptionalLegacy(IS_SNOWY);
|
||||
tagWithOptionalLegacy(IS_WASTELAND);
|
||||
tagWithOptionalLegacy(IS_VOID);
|
||||
tagWithOptionalLegacy(IS_CAVE);
|
||||
tagWithOptionalLegacy(IS_END);
|
||||
tagWithOptionalLegacy(IS_NETHER);
|
||||
tagWithOptionalLegacy(IS_OVERWORLD);
|
||||
}
|
||||
|
||||
@SafeVarargs
|
||||
private void tag(ResourceKey<Biome> biome, TagKey<Biome>... tags)
|
||||
{
|
||||
for(TagKey<Biome> key : tags)
|
||||
{
|
||||
private void tag(ResourceKey<Biome> biome, TagKey<Biome>... tags) {
|
||||
for (TagKey<Biome> key : tags) {
|
||||
tag(key).add(biome);
|
||||
}
|
||||
}
|
||||
|
||||
private TagAppender<Biome> tagWithOptionalLegacy(TagKey<Biome> tag) {
|
||||
return tag(tag).addOptionalTag(ResourceLocation.fromNamespaceAndPath("forge", tag.location().getPath()));
|
||||
}
|
||||
|
||||
private static ResourceLocation forgeRl(String path) {
|
||||
return ResourceLocation.fromNamespaceAndPath("forge", path);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName()
|
||||
{
|
||||
public String getName() {
|
||||
return "Forge Biome Tags";
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,7 @@ package net.minecraftforge.common.data;
|
||||
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.data.PackOutput;
|
||||
import net.minecraft.data.tags.IntrinsicHolderTagsProvider;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.tags.BlockTags;
|
||||
import net.minecraft.tags.TagKey;
|
||||
@@ -15,6 +16,7 @@ import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraftforge.common.Tags;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
import org.jetbrains.annotations.ApiStatus;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Locale;
|
||||
@@ -24,29 +26,46 @@ import java.util.function.Consumer;
|
||||
// We typically don't do static imports as S2S can't remap them {as they are not qualified}, however this conflicts with vanilla and our tag class names, and our tags don't get obfed so its one line of warning.
|
||||
import static net.minecraftforge.common.Tags.Blocks.*;
|
||||
|
||||
public final class ForgeBlockTagsProvider extends BlockTagsProvider
|
||||
{
|
||||
public ForgeBlockTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, @Nullable ExistingFileHelper existingFileHelper)
|
||||
{
|
||||
@ApiStatus.Internal
|
||||
public final class ForgeBlockTagsProvider extends BlockTagsProvider {
|
||||
public ForgeBlockTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, @Nullable ExistingFileHelper existingFileHelper) {
|
||||
super(output, lookupProvider, "forge", existingFileHelper);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public void addTags(HolderLookup.Provider p_256380_)
|
||||
{
|
||||
public void addTags(HolderLookup.Provider p_256380_) {
|
||||
tag(BARRELS).addTag(BARRELS_WOODEN);
|
||||
tag(BARRELS_WOODEN).add(Blocks.BARREL);
|
||||
tag(BOOKSHELVES).add(Blocks.BOOKSHELF);
|
||||
tag(BUDDING_BLOCKS).add(Blocks.BUDDING_AMETHYST);
|
||||
tag(BUDS).add(Blocks.SMALL_AMETHYST_BUD).add(Blocks.MEDIUM_AMETHYST_BUD).add(Blocks.LARGE_AMETHYST_BUD);
|
||||
tag(CHAINS).add(Blocks.CHAIN);
|
||||
tag(CHESTS).addTags(CHESTS_ENDER, CHESTS_TRAPPED, CHESTS_WOODEN);
|
||||
tag(CHESTS_ENDER).add(Blocks.ENDER_CHEST);
|
||||
tag(CHESTS_TRAPPED).add(Blocks.TRAPPED_CHEST);
|
||||
tag(CHESTS_WOODEN).add(Blocks.CHEST, Blocks.TRAPPED_CHEST);
|
||||
tag(COBBLESTONE).addTags(COBBLESTONE_NORMAL, COBBLESTONE_INFESTED, COBBLESTONE_MOSSY, COBBLESTONE_DEEPSLATE);
|
||||
tag(CLUSTERS).add(Blocks.AMETHYST_CLUSTER);
|
||||
tag(COBBLESTONES).addTags(COBBLESTONE_NORMAL, COBBLESTONE_INFESTED, COBBLESTONE_MOSSY, COBBLESTONE_DEEPSLATE);
|
||||
tag(COBBLESTONE_NORMAL).add(Blocks.COBBLESTONE);
|
||||
tag(COBBLESTONE_INFESTED).add(Blocks.INFESTED_COBBLESTONE);
|
||||
tag(COBBLESTONE_MOSSY).add(Blocks.MOSSY_COBBLESTONE);
|
||||
tag(COBBLESTONE_DEEPSLATE).add(Blocks.COBBLED_DEEPSLATE);
|
||||
tag(CONCRETES).add(Blocks.WHITE_CONCRETE, Blocks.ORANGE_CONCRETE, Blocks.MAGENTA_CONCRETE, Blocks.LIGHT_BLUE_CONCRETE, Blocks.YELLOW_CONCRETE, Blocks.LIME_CONCRETE, Blocks.PINK_CONCRETE, Blocks.GRAY_CONCRETE, Blocks.LIGHT_GRAY_CONCRETE, Blocks.CYAN_CONCRETE, Blocks.PURPLE_CONCRETE, Blocks.BLUE_CONCRETE, Blocks.BROWN_CONCRETE, Blocks.GREEN_CONCRETE, Blocks.RED_CONCRETE, Blocks.BLACK_CONCRETE);
|
||||
addColored(DYED, "{color}_banner");
|
||||
addColored(DYED, "{color}_bed");
|
||||
addColored(DYED, "{color}_candle");
|
||||
addColored(DYED, "{color}_carpet");
|
||||
addColored(DYED, "{color}_concrete");
|
||||
addColored(DYED, "{color}_concrete_powder");
|
||||
addColored(DYED, "{color}_glazed_terracotta");
|
||||
addColored(DYED, "{color}_shulker_box");
|
||||
addColored(DYED, "{color}_stained_glass");
|
||||
addColored(DYED, "{color}_stained_glass_pane");
|
||||
addColored(DYED, "{color}_terracotta");
|
||||
addColored(DYED, "{color}_wall_banner");
|
||||
addColored(DYED, "{color}_wool");
|
||||
addColoredTags(tag(DYED)::addTag, DYED);
|
||||
tag(END_STONES).add(Blocks.END_STONE);
|
||||
tag(ENDERMAN_PLACE_ON_BLACKLIST);
|
||||
tag(FENCE_GATES).addTags(FENCE_GATES_WOODEN);
|
||||
@@ -54,24 +73,27 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider
|
||||
tag(FENCES).addTags(FENCES_NETHER_BRICK, FENCES_WOODEN);
|
||||
tag(FENCES_NETHER_BRICK).add(Blocks.NETHER_BRICK_FENCE);
|
||||
tag(FENCES_WOODEN).addTag(BlockTags.WOODEN_FENCES);
|
||||
tag(GLASS).addTags(GLASS_COLORLESS, STAINED_GLASS, GLASS_TINTED);
|
||||
tag(GLASS_COLORLESS).add(Blocks.GLASS);
|
||||
tag(GLASS_SILICA).add(Blocks.GLASS, Blocks.BLACK_STAINED_GLASS, Blocks.BLUE_STAINED_GLASS, Blocks.BROWN_STAINED_GLASS, Blocks.CYAN_STAINED_GLASS, Blocks.GRAY_STAINED_GLASS, Blocks.GREEN_STAINED_GLASS, Blocks.LIGHT_BLUE_STAINED_GLASS, Blocks.LIGHT_GRAY_STAINED_GLASS, Blocks.LIME_STAINED_GLASS, Blocks.MAGENTA_STAINED_GLASS, Blocks.ORANGE_STAINED_GLASS, Blocks.PINK_STAINED_GLASS, Blocks.PURPLE_STAINED_GLASS, Blocks.RED_STAINED_GLASS, Blocks.WHITE_STAINED_GLASS, Blocks.YELLOW_STAINED_GLASS);
|
||||
tag(GLASS_TINTED).add(Blocks.TINTED_GLASS);
|
||||
addColored(tag(STAINED_GLASS)::add, GLASS, "{color}_stained_glass");
|
||||
tag(GLASS_PANES).addTags(GLASS_PANES_COLORLESS, STAINED_GLASS_PANES);
|
||||
tag(GLASS_BLOCKS).addTags(GLASS_BLOCKS_COLORLESS, GLASS_BLOCKS_CHEAP, GLASS_BLOCKS_TINTED);
|
||||
tag(GLASS_BLOCKS_COLORLESS).add(Blocks.GLASS);
|
||||
tag(GLASS_BLOCKS_CHEAP).add(Blocks.GLASS, Blocks.WHITE_STAINED_GLASS, Blocks.ORANGE_STAINED_GLASS, Blocks.MAGENTA_STAINED_GLASS, Blocks.LIGHT_BLUE_STAINED_GLASS, Blocks.YELLOW_STAINED_GLASS, Blocks.LIME_STAINED_GLASS, Blocks.PINK_STAINED_GLASS, Blocks.GRAY_STAINED_GLASS, Blocks.LIGHT_GRAY_STAINED_GLASS, Blocks.CYAN_STAINED_GLASS, Blocks.PURPLE_STAINED_GLASS, Blocks.BLUE_STAINED_GLASS, Blocks.BROWN_STAINED_GLASS, Blocks.GREEN_STAINED_GLASS, Blocks.RED_STAINED_GLASS, Blocks.BLACK_STAINED_GLASS);
|
||||
tag(GLASS_BLOCKS_TINTED).add(Blocks.TINTED_GLASS);
|
||||
tag(GLASS_PANES).addTags(GLASS_PANES_COLORLESS).add(Blocks.WHITE_STAINED_GLASS_PANE, Blocks.ORANGE_STAINED_GLASS_PANE, Blocks.MAGENTA_STAINED_GLASS_PANE, Blocks.LIGHT_BLUE_STAINED_GLASS_PANE, Blocks.YELLOW_STAINED_GLASS_PANE, Blocks.LIME_STAINED_GLASS_PANE, Blocks.PINK_STAINED_GLASS_PANE, Blocks.GRAY_STAINED_GLASS_PANE, Blocks.LIGHT_GRAY_STAINED_GLASS_PANE, Blocks.CYAN_STAINED_GLASS_PANE, Blocks.PURPLE_STAINED_GLASS_PANE, Blocks.BLUE_STAINED_GLASS_PANE, Blocks.BROWN_STAINED_GLASS_PANE, Blocks.GREEN_STAINED_GLASS_PANE, Blocks.RED_STAINED_GLASS_PANE, Blocks.BLACK_STAINED_GLASS_PANE);
|
||||
tag(GLASS_PANES_COLORLESS).add(Blocks.GLASS_PANE);
|
||||
addColored(tag(STAINED_GLASS_PANES)::add, GLASS_PANES, "{color}_stained_glass_pane");
|
||||
tag(GLAZED_TERRACOTTAS).add(Blocks.WHITE_GLAZED_TERRACOTTA, Blocks.ORANGE_GLAZED_TERRACOTTA, Blocks.MAGENTA_GLAZED_TERRACOTTA, Blocks.LIGHT_BLUE_GLAZED_TERRACOTTA, Blocks.YELLOW_GLAZED_TERRACOTTA, Blocks.LIME_GLAZED_TERRACOTTA, Blocks.PINK_GLAZED_TERRACOTTA, Blocks.GRAY_GLAZED_TERRACOTTA, Blocks.LIGHT_GRAY_GLAZED_TERRACOTTA, Blocks.CYAN_GLAZED_TERRACOTTA, Blocks.PURPLE_GLAZED_TERRACOTTA, Blocks.BLUE_GLAZED_TERRACOTTA, Blocks.BROWN_GLAZED_TERRACOTTA, Blocks.GREEN_GLAZED_TERRACOTTA, Blocks.RED_GLAZED_TERRACOTTA, Blocks.BLACK_GLAZED_TERRACOTTA);
|
||||
tag(GRAVEL).add(Blocks.GRAVEL);
|
||||
tag(SKULLS).add(Blocks.SKELETON_SKULL, Blocks.SKELETON_WALL_SKULL, Blocks.WITHER_SKELETON_SKULL, Blocks.WITHER_SKELETON_WALL_SKULL, Blocks.PLAYER_HEAD, Blocks.PLAYER_WALL_HEAD, Blocks.ZOMBIE_HEAD, Blocks.ZOMBIE_WALL_HEAD, Blocks.CREEPER_HEAD, Blocks.CREEPER_WALL_HEAD, Blocks.PIGLIN_HEAD, Blocks.PIGLIN_WALL_HEAD, Blocks.DRAGON_HEAD, Blocks.DRAGON_WALL_HEAD);
|
||||
tag(HIDDEN_FROM_RECIPE_VIEWERS);
|
||||
tag(NETHERRACK).add(Blocks.NETHERRACK);
|
||||
tag(OBSIDIAN).add(Blocks.OBSIDIAN);
|
||||
tag(OBSIDIANS_NORMAL).add(Blocks.OBSIDIAN);
|
||||
tag(OBSIDIANS_CRYING).add(Blocks.CRYING_OBSIDIAN);
|
||||
tag(OBSIDIANS).addTags(OBSIDIANS_NORMAL, OBSIDIANS_CRYING);
|
||||
tag(ORE_BEARING_GROUND_DEEPSLATE).add(Blocks.DEEPSLATE);
|
||||
tag(ORE_BEARING_GROUND_NETHERRACK).add(Blocks.NETHERRACK);
|
||||
tag(ORE_BEARING_GROUND_STONE).add(Blocks.STONE);
|
||||
tag(ORE_RATES_DENSE).add(Blocks.COPPER_ORE, Blocks.DEEPSLATE_COPPER_ORE, Blocks.DEEPSLATE_LAPIS_ORE, Blocks.DEEPSLATE_REDSTONE_ORE, Blocks.LAPIS_ORE, Blocks.REDSTONE_ORE);
|
||||
tag(ORE_RATES_SINGULAR).add(Blocks.ANCIENT_DEBRIS, Blocks.COAL_ORE, Blocks.DEEPSLATE_COAL_ORE, Blocks.DEEPSLATE_DIAMOND_ORE, Blocks.DEEPSLATE_EMERALD_ORE, Blocks.DEEPSLATE_GOLD_ORE, Blocks.DEEPSLATE_IRON_ORE, Blocks.DIAMOND_ORE, Blocks.EMERALD_ORE, Blocks.GOLD_ORE, Blocks.IRON_ORE, Blocks.NETHER_QUARTZ_ORE);
|
||||
tag(ORE_RATES_SPARSE).add(Blocks.NETHER_GOLD_ORE);
|
||||
tag(ORES).addTags(ORES_COAL, ORES_COPPER, ORES_DIAMOND, ORES_EMERALD, ORES_GOLD, ORES_IRON, ORES_LAPIS, ORES_REDSTONE, ORES_QUARTZ, ORES_NETHERITE_SCRAP);
|
||||
tag(ORES).addTags(ORES_COAL, ORES_COPPER, ORES_DIAMOND, ORES_EMERALD, ORES_GOLD, ORES_IRON, ORES_LAPIS, ORES_NETHERITE_SCRAP, ORES_REDSTONE, ORES_QUARTZ);
|
||||
tag(ORES_COAL).addTag(BlockTags.COAL_ORES);
|
||||
tag(ORES_COPPER).addTag(BlockTags.COPPER_ORES);
|
||||
tag(ORES_DIAMOND).addTag(BlockTags.DIAMOND_ORES);
|
||||
@@ -85,60 +107,189 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider
|
||||
tag(ORES_IN_GROUND_DEEPSLATE).add(Blocks.DEEPSLATE_COAL_ORE, Blocks.DEEPSLATE_COPPER_ORE, Blocks.DEEPSLATE_DIAMOND_ORE, Blocks.DEEPSLATE_EMERALD_ORE, Blocks.DEEPSLATE_GOLD_ORE, Blocks.DEEPSLATE_IRON_ORE, Blocks.DEEPSLATE_LAPIS_ORE, Blocks.DEEPSLATE_REDSTONE_ORE);
|
||||
tag(ORES_IN_GROUND_NETHERRACK).add(Blocks.NETHER_GOLD_ORE, Blocks.NETHER_QUARTZ_ORE);
|
||||
tag(ORES_IN_GROUND_STONE).add(Blocks.COAL_ORE, Blocks.COPPER_ORE, Blocks.DIAMOND_ORE, Blocks.EMERALD_ORE, Blocks.GOLD_ORE, Blocks.IRON_ORE, Blocks.LAPIS_ORE, Blocks.REDSTONE_ORE);
|
||||
tag(PLAYER_WORKSTATIONS_CRAFTING_TABLES).add(Blocks.CRAFTING_TABLE);
|
||||
tag(PLAYER_WORKSTATIONS_FURNACES).add(Blocks.FURNACE);
|
||||
tag(SAND).addTags(SAND_COLORLESS, SAND_RED);
|
||||
tag(RELOCATION_NOT_SUPPORTED);
|
||||
tag(ROPES);
|
||||
tag(SAND_COLORLESS).add(Blocks.SAND);
|
||||
tag(SAND_RED).add(Blocks.RED_SAND);
|
||||
tag(SANDSTONE).add(Blocks.SANDSTONE, Blocks.CUT_SANDSTONE, Blocks.CHISELED_SANDSTONE, Blocks.SMOOTH_SANDSTONE, Blocks.RED_SANDSTONE, Blocks.CUT_RED_SANDSTONE, Blocks.CHISELED_RED_SANDSTONE, Blocks.SMOOTH_RED_SANDSTONE);
|
||||
tag(STONE).add(Blocks.ANDESITE, Blocks.DIORITE, Blocks.GRANITE, Blocks.INFESTED_STONE, Blocks.STONE, Blocks.POLISHED_ANDESITE, Blocks.POLISHED_DIORITE, Blocks.POLISHED_GRANITE, Blocks.DEEPSLATE, Blocks.POLISHED_DEEPSLATE, Blocks.INFESTED_DEEPSLATE, Blocks.TUFF);
|
||||
tag(STORAGE_BLOCKS).addTags(STORAGE_BLOCKS_AMETHYST, STORAGE_BLOCKS_COAL, STORAGE_BLOCKS_COPPER, STORAGE_BLOCKS_DIAMOND, STORAGE_BLOCKS_EMERALD, STORAGE_BLOCKS_GOLD, STORAGE_BLOCKS_IRON, STORAGE_BLOCKS_LAPIS, STORAGE_BLOCKS_QUARTZ, STORAGE_BLOCKS_RAW_COPPER, STORAGE_BLOCKS_RAW_GOLD, STORAGE_BLOCKS_RAW_IRON, STORAGE_BLOCKS_REDSTONE, STORAGE_BLOCKS_NETHERITE);
|
||||
tag(STORAGE_BLOCKS_AMETHYST).add(Blocks.AMETHYST_BLOCK);
|
||||
|
||||
tag(SANDSTONE_RED_BLOCKS).add(Blocks.RED_SANDSTONE, Blocks.CUT_RED_SANDSTONE, Blocks.CHISELED_RED_SANDSTONE, Blocks.SMOOTH_RED_SANDSTONE);
|
||||
tag(SANDSTONE_UNCOLORED_BLOCKS).add(Blocks.SANDSTONE, Blocks.CUT_SANDSTONE, Blocks.CHISELED_SANDSTONE, Blocks.SMOOTH_SANDSTONE);
|
||||
tag(SANDSTONE_BLOCKS).addTags(SANDSTONE_RED_BLOCKS, SANDSTONE_UNCOLORED_BLOCKS);
|
||||
tag(SANDSTONE_RED_SLABS).add(Blocks.RED_SANDSTONE_SLAB, Blocks.CUT_RED_SANDSTONE_SLAB, Blocks.SMOOTH_RED_SANDSTONE_SLAB);
|
||||
tag(SANDSTONE_UNCOLORED_SLABS).add(Blocks.SANDSTONE_SLAB, Blocks.CUT_SANDSTONE_SLAB, Blocks.SMOOTH_SANDSTONE_SLAB);
|
||||
tag(SANDSTONE_SLABS).addTags(SANDSTONE_RED_SLABS, SANDSTONE_UNCOLORED_SLABS);
|
||||
tag(SANDSTONE_RED_STAIRS).add(Blocks.RED_SANDSTONE_STAIRS, Blocks.SMOOTH_RED_SANDSTONE_STAIRS);
|
||||
tag(SANDSTONE_UNCOLORED_STAIRS).add(Blocks.SANDSTONE_STAIRS, Blocks.SMOOTH_SANDSTONE_STAIRS);
|
||||
tag(SANDSTONE_STAIRS).addTags(SANDSTONE_RED_STAIRS, SANDSTONE_UNCOLORED_STAIRS);
|
||||
|
||||
tag(STONES).add(Blocks.ANDESITE, Blocks.DIORITE, Blocks.GRANITE, Blocks.STONE, Blocks.DEEPSLATE, Blocks.TUFF);
|
||||
tag(STORAGE_BLOCKS).addTags(STORAGE_BLOCKS_BONE_MEAL, STORAGE_BLOCKS_COAL,
|
||||
STORAGE_BLOCKS_COPPER, STORAGE_BLOCKS_DIAMOND, STORAGE_BLOCKS_DRIED_KELP,
|
||||
STORAGE_BLOCKS_EMERALD, STORAGE_BLOCKS_GOLD, STORAGE_BLOCKS_IRON,
|
||||
STORAGE_BLOCKS_LAPIS, STORAGE_BLOCKS_NETHERITE, STORAGE_BLOCKS_RAW_COPPER,
|
||||
STORAGE_BLOCKS_RAW_GOLD, STORAGE_BLOCKS_RAW_IRON, STORAGE_BLOCKS_REDSTONE,
|
||||
STORAGE_BLOCKS_SLIME, STORAGE_BLOCKS_WHEAT);
|
||||
tag(STORAGE_BLOCKS_BONE_MEAL).add(Blocks.BONE_BLOCK);
|
||||
tag(STORAGE_BLOCKS_COAL).add(Blocks.COAL_BLOCK);
|
||||
tag(STORAGE_BLOCKS_COPPER).add(Blocks.COPPER_BLOCK);
|
||||
tag(STORAGE_BLOCKS_DIAMOND).add(Blocks.DIAMOND_BLOCK);
|
||||
tag(STORAGE_BLOCKS_DRIED_KELP).add(Blocks.DRIED_KELP_BLOCK);
|
||||
tag(STORAGE_BLOCKS_EMERALD).add(Blocks.EMERALD_BLOCK);
|
||||
tag(STORAGE_BLOCKS_GOLD).add(Blocks.GOLD_BLOCK);
|
||||
tag(STORAGE_BLOCKS_IRON).add(Blocks.IRON_BLOCK);
|
||||
tag(STORAGE_BLOCKS_LAPIS).add(Blocks.LAPIS_BLOCK);
|
||||
tag(STORAGE_BLOCKS_QUARTZ).add(Blocks.QUARTZ_BLOCK);
|
||||
tag(STORAGE_BLOCKS_NETHERITE).add(Blocks.NETHERITE_BLOCK);
|
||||
tag(STORAGE_BLOCKS_RAW_COPPER).add(Blocks.RAW_COPPER_BLOCK);
|
||||
tag(STORAGE_BLOCKS_RAW_GOLD).add(Blocks.RAW_GOLD_BLOCK);
|
||||
tag(STORAGE_BLOCKS_RAW_IRON).add(Blocks.RAW_IRON_BLOCK);
|
||||
tag(STORAGE_BLOCKS_REDSTONE).add(Blocks.REDSTONE_BLOCK);
|
||||
tag(STORAGE_BLOCKS_NETHERITE).add(Blocks.NETHERITE_BLOCK);
|
||||
tag(STORAGE_BLOCKS_SLIME).add(Blocks.SLIME_BLOCK);
|
||||
tag(STORAGE_BLOCKS_WHEAT).add(Blocks.HAY_BLOCK);
|
||||
tag(VILLAGER_JOB_SITES).add(
|
||||
Blocks.BARREL, Blocks.BLAST_FURNACE, Blocks.BREWING_STAND, Blocks.CARTOGRAPHY_TABLE,
|
||||
Blocks.CAULDRON, Blocks.WATER_CAULDRON, Blocks.LAVA_CAULDRON, Blocks.POWDER_SNOW_CAULDRON,
|
||||
Blocks.COMPOSTER, Blocks.FLETCHING_TABLE, Blocks.GRINDSTONE, Blocks.LECTERN,
|
||||
Blocks.LOOM, Blocks.SMITHING_TABLE, Blocks.SMOKER, Blocks.STONECUTTER);
|
||||
|
||||
// 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
|
||||
tagWithOptionalLegacy(BARRELS);
|
||||
tagWithOptionalLegacy(BARRELS_WOODEN);
|
||||
tagWithOptionalLegacy(BOOKSHELVES);
|
||||
tagWithOptionalLegacy(CHESTS);
|
||||
tag(CHESTS_ENDER);
|
||||
tag(CHESTS_TRAPPED);
|
||||
tagWithOptionalLegacy(CHESTS_WOODEN);
|
||||
tag(COBBLESTONES).addOptionalTag(forgeRl("cobblestone"));
|
||||
tag(DYED_BLACK)
|
||||
.addOptionalTag(forgeRl("glass/black"))
|
||||
.addOptionalTag(forgeRl("stained_glass/black"));
|
||||
tag(DYED_BLUE)
|
||||
.addOptionalTag(forgeRl("glass/blue"))
|
||||
.addOptionalTag(forgeRl("stained_glass/blue"));
|
||||
tag(DYED_BROWN)
|
||||
.addOptionalTag(forgeRl("glass/brown"))
|
||||
.addOptionalTag(forgeRl("stained_glass/brown"));
|
||||
tag(DYED_CYAN)
|
||||
.addOptionalTag(forgeRl("glass/cyan"))
|
||||
.addOptionalTag(forgeRl("stained_glass/cyan"));
|
||||
tag(DYED_GRAY)
|
||||
.addOptionalTag(forgeRl("glass/gray"))
|
||||
.addOptionalTag(forgeRl("stained_glass/gray"));
|
||||
tag(DYED_GREEN)
|
||||
.addOptionalTag(forgeRl("glass/green"))
|
||||
.addOptionalTag(forgeRl("stained_glass/green"));
|
||||
tag(DYED_LIGHT_BLUE)
|
||||
.addOptionalTag(forgeRl("glass/light_blue"))
|
||||
.addOptionalTag(forgeRl("stained_glass/light_blue"));
|
||||
tag(DYED_LIGHT_GRAY)
|
||||
.addOptionalTag(forgeRl("glass/light_gray"))
|
||||
.addOptionalTag(forgeRl("stained_glass/light_gray"));
|
||||
tag(DYED_LIME)
|
||||
.addOptionalTag(forgeRl("glass/lime"))
|
||||
.addOptionalTag(forgeRl("stained_glass/lime"));
|
||||
tag(DYED_MAGENTA)
|
||||
.addOptionalTag(forgeRl("glass/magenta"))
|
||||
.addOptionalTag(forgeRl("stained_glass/magenta"));
|
||||
tag(DYED_MAGENTA)
|
||||
.addOptionalTag(forgeRl("glass/magenta"))
|
||||
.addOptionalTag(forgeRl("stained_glass/magenta"));
|
||||
tag(DYED_ORANGE)
|
||||
.addOptionalTag(forgeRl("glass/orange"))
|
||||
.addOptionalTag(forgeRl("stained_glass/orange"));
|
||||
tag(DYED_PINK)
|
||||
.addOptionalTag(forgeRl("glass/pink"))
|
||||
.addOptionalTag(forgeRl("stained_glass/pink"));
|
||||
tag(DYED_PURPLE)
|
||||
.addOptionalTag(forgeRl("glass/purple"))
|
||||
.addOptionalTag(forgeRl("stained_glass/purple"));
|
||||
tag(DYED_RED)
|
||||
.addOptionalTag(forgeRl("glass/red"))
|
||||
.addOptionalTag(forgeRl("stained_glass/red"));
|
||||
tag(DYED_WHITE)
|
||||
.addOptionalTag(forgeRl("glass/white"))
|
||||
.addOptionalTag(forgeRl("stained_glass/white"));
|
||||
tag(DYED_YELLOW)
|
||||
.addOptionalTag(forgeRl("glass/yellow"))
|
||||
.addOptionalTag(forgeRl("stained_glass/yellow"));
|
||||
tagWithOptionalLegacy(ENDERMAN_PLACE_ON_BLACKLIST);
|
||||
tag(GLASS_BLOCKS).addOptionalTag(forgeRl("glass"));
|
||||
tag(GLASS_BLOCKS_COLORLESS).addOptionalTag(forgeRl("glass_colorless"));
|
||||
tag(GLASS_BLOCKS_CHEAP).addOptionalTag(forgeRl("glass_silica"));
|
||||
tag(GLASS_BLOCKS_TINTED).addOptionalTag(forgeRl("glass_tinted"));
|
||||
tag(GLASS_PANES_COLORLESS).addOptionalTag(forgeRl("glass_panes_colorless"));
|
||||
tag(OBSIDIANS).addOptionalTag(forgeRl("obsidian"));
|
||||
tagWithOptionalLegacy(ORES);
|
||||
tagWithOptionalLegacy(ORES_QUARTZ);
|
||||
tagWithOptionalLegacy(ORES_NETHERITE_SCRAP);
|
||||
tag(STONES).addOptionalTag(forgeRl("stone"));
|
||||
tagWithOptionalLegacy(STORAGE_BLOCKS);
|
||||
tagWithOptionalLegacy(STORAGE_BLOCKS_COAL);
|
||||
tagWithOptionalLegacy(STORAGE_BLOCKS_COPPER);
|
||||
tagWithOptionalLegacy(STORAGE_BLOCKS_DIAMOND);
|
||||
tagWithOptionalLegacy(STORAGE_BLOCKS_EMERALD);
|
||||
tagWithOptionalLegacy(STORAGE_BLOCKS_GOLD);
|
||||
tagWithOptionalLegacy(STORAGE_BLOCKS_IRON);
|
||||
tagWithOptionalLegacy(STORAGE_BLOCKS_LAPIS);
|
||||
tagWithOptionalLegacy(STORAGE_BLOCKS_RAW_COPPER);
|
||||
tagWithOptionalLegacy(STORAGE_BLOCKS_RAW_GOLD);
|
||||
tagWithOptionalLegacy(STORAGE_BLOCKS_RAW_IRON);
|
||||
tagWithOptionalLegacy(STORAGE_BLOCKS_REDSTONE);
|
||||
tagWithOptionalLegacy(STORAGE_BLOCKS_NETHERITE);
|
||||
tag(RELOCATION_NOT_SUPPORTED)
|
||||
.addOptionalTag(forgeRl("relocation_not_supported"))
|
||||
.addOptionalTag(forgeRl("immovable"));
|
||||
tag(SANDSTONE_BLOCKS).addOptionalTag(forgeRl("sandstone"));
|
||||
}
|
||||
|
||||
private void addColored(Consumer<Block> consumer, TagKey<Block> group, String pattern)
|
||||
{
|
||||
/**
|
||||
* Shorthand for {@code tag(tag).addOptionalTag(forgeRl(tag.location().getPath()))}
|
||||
*/
|
||||
private IntrinsicHolderTagsProvider.IntrinsicTagAppender<Block> tagWithOptionalLegacy(TagKey<Block> tag) {
|
||||
IntrinsicHolderTagsProvider.IntrinsicTagAppender<Block> tagAppender = tag(tag);
|
||||
tagAppender.addOptionalTag(forgeRl(tag.location().getPath()));
|
||||
return tagAppender;
|
||||
}
|
||||
|
||||
private void addColored(TagKey<Block> group, String pattern) {
|
||||
String prefix = group.location().getPath().toUpperCase(Locale.ENGLISH) + '_';
|
||||
for (DyeColor color : DyeColor.values())
|
||||
{
|
||||
ResourceLocation key = ResourceLocation.fromNamespaceAndPath("minecraft", pattern.replace("{color}", color.getName()));
|
||||
for (var color : DyeColor.values()) {
|
||||
var key = ResourceLocation.fromNamespaceAndPath("minecraft", pattern.replace("{color}", color.getName()));
|
||||
TagKey<Block> tag = getForgeTag(prefix + color.getName());
|
||||
Block block = ForgeRegistries.BLOCKS.getValue(key);
|
||||
if (block == null || block == Blocks.AIR)
|
||||
throw new IllegalStateException("Unknown vanilla block: " + key.toString());
|
||||
var block = ForgeRegistries.BLOCKS.getValue(key);
|
||||
if (block == null || block == Blocks.AIR)
|
||||
throw new IllegalStateException("Unknown vanilla block: " + key);
|
||||
tag(tag).add(block);
|
||||
consumer.accept(block);
|
||||
}
|
||||
}
|
||||
|
||||
private static void addColoredTags(Consumer<TagKey<Block>> consumer, TagKey<Block> group) {
|
||||
String prefix = group.location().getPath().toUpperCase(Locale.ENGLISH) + '_';
|
||||
for (var color : DyeColor.values()) {
|
||||
TagKey<Block> tag = getForgeTag(prefix + color.getName());
|
||||
consumer.accept(tag);
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private TagKey<Block> getForgeTag(String name)
|
||||
{
|
||||
try
|
||||
{
|
||||
private static TagKey<Block> getForgeTag(String name) {
|
||||
try {
|
||||
name = name.toUpperCase(Locale.ENGLISH);
|
||||
return (TagKey<Block>) Tags.Blocks.class.getDeclaredField(name).get(null);
|
||||
}
|
||||
catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e)
|
||||
{
|
||||
} catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) {
|
||||
throw new IllegalStateException(Tags.Blocks.class.getName() + " is missing tag name: " + name);
|
||||
}
|
||||
}
|
||||
|
||||
private static ResourceLocation forgeRl(String path) {
|
||||
return ResourceLocation.fromNamespaceAndPath("forge", path);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName()
|
||||
{
|
||||
public String getName() {
|
||||
return "Forge Block Tags";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
/*
|
||||
* Copyright (c) Forge Development LLC and contributors
|
||||
* SPDX-License-Identifier: LGPL-2.1-only
|
||||
*/
|
||||
|
||||
package net.minecraftforge.common.data;
|
||||
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.data.PackOutput;
|
||||
import net.minecraft.world.item.enchantment.Enchantments;
|
||||
import org.jetbrains.annotations.ApiStatus;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
import static net.minecraftforge.common.Tags.Enchantments.*;
|
||||
|
||||
@ApiStatus.Internal
|
||||
public final class ForgeEnchantmentTagsProvider extends EnchantmentTagsProvider {
|
||||
public ForgeEnchantmentTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, ExistingFileHelper existingFileHelper) {
|
||||
super(output, lookupProvider, "forge", existingFileHelper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addTags(HolderLookup.Provider lookupProvider) {
|
||||
tag(INCREASE_BLOCK_DROPS)
|
||||
.add(Enchantments.FORTUNE);
|
||||
tag(INCREASE_ENTITY_DROPS)
|
||||
.add(Enchantments.LOOTING);
|
||||
tag(WEAPON_DAMAGE_ENHANCEMENTS)
|
||||
.add(Enchantments.SHARPNESS)
|
||||
.add(Enchantments.SMITE)
|
||||
.add(Enchantments.BANE_OF_ARTHROPODS)
|
||||
.add(Enchantments.POWER)
|
||||
.add(Enchantments.IMPALING);
|
||||
tag(ENTITY_SPEED_ENHANCEMENTS)
|
||||
.add(Enchantments.SOUL_SPEED)
|
||||
.add(Enchantments.SWIFT_SNEAK)
|
||||
.add(Enchantments.DEPTH_STRIDER);
|
||||
tag(ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS)
|
||||
.add(Enchantments.FEATHER_FALLING)
|
||||
.add(Enchantments.FROST_WALKER);
|
||||
tag(ENTITY_DEFENSE_ENHANCEMENTS)
|
||||
.add(Enchantments.PROTECTION)
|
||||
.add(Enchantments.BLAST_PROTECTION)
|
||||
.add(Enchantments.PROJECTILE_PROTECTION)
|
||||
.add(Enchantments.FIRE_PROTECTION)
|
||||
.add(Enchantments.RESPIRATION)
|
||||
.add(Enchantments.FEATHER_FALLING);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return "Forge Enchantment Tags";
|
||||
}
|
||||
}
|
||||
@@ -8,28 +8,41 @@ package net.minecraftforge.common.data;
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.data.PackOutput;
|
||||
import net.minecraft.data.tags.EntityTypeTagsProvider;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
import net.minecraftforge.common.Tags;
|
||||
import org.jetbrains.annotations.ApiStatus;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
public class ForgeEntityTypeTagsProvider extends EntityTypeTagsProvider
|
||||
{
|
||||
import static net.minecraftforge.common.Tags.EntityTypes.*;
|
||||
|
||||
public ForgeEntityTypeTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, ExistingFileHelper existingFileHelper)
|
||||
{
|
||||
@ApiStatus.Internal
|
||||
public final class ForgeEntityTypeTagsProvider extends EntityTypeTagsProvider {
|
||||
public ForgeEntityTypeTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, ExistingFileHelper existingFileHelper) {
|
||||
super(output, lookupProvider, "forge", existingFileHelper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addTags(HolderLookup.Provider lookupProvider)
|
||||
{
|
||||
tag(Tags.EntityTypes.BOSSES).add(EntityType.ENDER_DRAGON, EntityType.WITHER);
|
||||
public void addTags(HolderLookup.Provider lookupProvider) {
|
||||
tag(BOSSES).add(EntityType.ENDER_DRAGON, EntityType.WITHER);
|
||||
tag(MINECARTS).add(EntityType.MINECART, EntityType.CHEST_MINECART, EntityType.FURNACE_MINECART, EntityType.HOPPER_MINECART, EntityType.SPAWNER_MINECART, EntityType.TNT_MINECART, EntityType.COMMAND_BLOCK_MINECART);
|
||||
tag(BOATS).add(EntityType.BOAT, EntityType.CHEST_BOAT);
|
||||
tag(CAPTURING_NOT_SUPPORTED);
|
||||
tag(TELEPORTING_NOT_SUPPORTED);
|
||||
|
||||
// Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability.
|
||||
// TODO: Remove backwards compat tag entries in 1.22
|
||||
tag(BOSSES).addOptionalTag(forgeRl("bosses"));
|
||||
tag(MINECARTS).addOptionalTag(forgeRl("minecarts"));
|
||||
tag(BOATS).addOptionalTag(forgeRl("boats"));
|
||||
}
|
||||
|
||||
private static ResourceLocation forgeRl(String path) {
|
||||
return ResourceLocation.fromNamespaceAndPath("forge", path);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName()
|
||||
{
|
||||
public String getName() {
|
||||
return "Forge EntityType Tags";
|
||||
}
|
||||
}
|
||||
@@ -8,27 +8,51 @@ package net.minecraftforge.common.data;
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.data.PackOutput;
|
||||
import net.minecraft.data.tags.FluidTagsProvider;
|
||||
import net.minecraft.data.tags.IntrinsicHolderTagsProvider;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.tags.TagKey;
|
||||
import net.minecraft.world.level.material.Fluid;
|
||||
import net.minecraftforge.common.ForgeMod;
|
||||
import net.minecraftforge.common.Tags.Fluids;
|
||||
import org.jetbrains.annotations.ApiStatus;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
public final class ForgeFluidTagsProvider extends FluidTagsProvider
|
||||
{
|
||||
public ForgeFluidTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, ExistingFileHelper existingFileHelper)
|
||||
{
|
||||
import static net.minecraftforge.common.Tags.Fluids.*;
|
||||
|
||||
@ApiStatus.Internal
|
||||
public final class ForgeFluidTagsProvider extends FluidTagsProvider {
|
||||
public ForgeFluidTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, ExistingFileHelper existingFileHelper) {
|
||||
super(output, lookupProvider, "forge", existingFileHelper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addTags(HolderLookup.Provider lookupProvider)
|
||||
{
|
||||
tag(Fluids.MILK).addOptional(ForgeMod.MILK.getId()).addOptional(ForgeMod.FLOWING_MILK.getId());
|
||||
public void addTags(HolderLookup.Provider lookupProvider) {
|
||||
tag(WATER).add(net.minecraft.world.level.material.Fluids.WATER).add(net.minecraft.world.level.material.Fluids.FLOWING_WATER);
|
||||
tag(LAVA).add(net.minecraft.world.level.material.Fluids.LAVA).add(net.minecraft.world.level.material.Fluids.FLOWING_LAVA);
|
||||
tag(MILK).addOptional(ForgeMod.MILK.getId()).addOptional(ForgeMod.FLOWING_MILK.getId());
|
||||
tag(GASEOUS);
|
||||
tag(HONEY);
|
||||
tag(POTION);
|
||||
tag(SUSPICIOUS_STEW);
|
||||
tag(MUSHROOM_STEW);
|
||||
tag(RABBIT_STEW);
|
||||
tag(BEETROOT_SOUP);
|
||||
tag(HIDDEN_FROM_RECIPE_VIEWERS);
|
||||
|
||||
// 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
|
||||
tagWithOptionalLegacy(MILK);
|
||||
tagWithOptionalLegacy(HONEY);
|
||||
}
|
||||
|
||||
private IntrinsicHolderTagsProvider.IntrinsicTagAppender<Fluid> tagWithOptionalLegacy(TagKey<Fluid> tag) {
|
||||
IntrinsicHolderTagsProvider.IntrinsicTagAppender<Fluid> tagAppender = tag(tag);
|
||||
tagAppender.addOptionalTag(ResourceLocation.fromNamespaceAndPath("forge", tag.location().getPath()));
|
||||
return tagAppender;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName()
|
||||
{
|
||||
public String getName() {
|
||||
return "Forge Fluid Tags";
|
||||
}
|
||||
}
|
||||
@@ -6,7 +6,9 @@
|
||||
package net.minecraftforge.common.data;
|
||||
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
import net.minecraft.data.PackOutput;
|
||||
import net.minecraft.data.tags.IntrinsicHolderTagsProvider;
|
||||
import net.minecraft.data.tags.ItemTagsProvider;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.tags.ItemTags;
|
||||
@@ -16,47 +18,90 @@ import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.Items;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraftforge.common.Tags;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
import org.jetbrains.annotations.ApiStatus;
|
||||
|
||||
import java.util.Locale;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
public final class ForgeItemTagsProvider extends ItemTagsProvider
|
||||
{
|
||||
public ForgeItemTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, CompletableFuture<TagLookup<Block>> blockTagProvider, ExistingFileHelper existingFileHelper)
|
||||
{
|
||||
@ApiStatus.Internal
|
||||
public final class ForgeItemTagsProvider extends ItemTagsProvider {
|
||||
public ForgeItemTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, CompletableFuture<TagLookup<Block>> blockTagProvider, ExistingFileHelper existingFileHelper) {
|
||||
super(output, lookupProvider, blockTagProvider, "forge", existingFileHelper);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public void addTags(HolderLookup.Provider lookupProvider)
|
||||
{
|
||||
public void addTags(HolderLookup.Provider lookupProvider) {
|
||||
copy(Tags.Blocks.BARRELS, Tags.Items.BARRELS);
|
||||
copy(Tags.Blocks.BARRELS_WOODEN, Tags.Items.BARRELS_WOODEN);
|
||||
tag(Tags.Items.BONES).add(Items.BONE);
|
||||
copy(Tags.Blocks.BOOKSHELVES, Tags.Items.BOOKSHELVES);
|
||||
tag(Tags.Items.BRICKS).addTags(Tags.Items.BRICKS_NORMAL, Tags.Items.BRICKS_NETHER);
|
||||
tag(Tags.Items.BRICKS_NORMAL).add(Items.BRICK);
|
||||
tag(Tags.Items.BRICKS_NETHER).add(Items.NETHER_BRICK);
|
||||
tag(Tags.Items.BUCKETS_EMPTY).add(Items.BUCKET);
|
||||
tag(Tags.Items.BUCKETS_WATER).add(Items.WATER_BUCKET);
|
||||
tag(Tags.Items.BUCKETS_LAVA).add(Items.LAVA_BUCKET);
|
||||
tag(Tags.Items.BUCKETS_MILK).add(Items.MILK_BUCKET);
|
||||
tag(Tags.Items.BUCKETS_POWDER_SNOW).add(Items.POWDER_SNOW_BUCKET);
|
||||
tag(Tags.Items.BUCKETS_ENTITY_WATER).add(Items.AXOLOTL_BUCKET, Items.COD_BUCKET, Items.PUFFERFISH_BUCKET, Items.TADPOLE_BUCKET, Items.TROPICAL_FISH_BUCKET, Items.SALMON_BUCKET);
|
||||
tag(Tags.Items.BUCKETS).addTags(Tags.Items.BUCKETS_EMPTY, Tags.Items.BUCKETS_WATER, Tags.Items.BUCKETS_LAVA, Tags.Items.BUCKETS_MILK, Tags.Items.BUCKETS_POWDER_SNOW, Tags.Items.BUCKETS_ENTITY_WATER);
|
||||
copy(Tags.Blocks.BUDDING_BLOCKS, Tags.Items.BUDDING_BLOCKS);
|
||||
copy(Tags.Blocks.BUDS, Tags.Items.BUDS);
|
||||
copy(Tags.Blocks.CHAINS, Tags.Items.CHAINS);
|
||||
copy(Tags.Blocks.CHESTS, Tags.Items.CHESTS);
|
||||
copy(Tags.Blocks.CHESTS_ENDER, Tags.Items.CHESTS_ENDER);
|
||||
copy(Tags.Blocks.CHESTS_TRAPPED, Tags.Items.CHESTS_TRAPPED);
|
||||
copy(Tags.Blocks.CHESTS_WOODEN, Tags.Items.CHESTS_WOODEN);
|
||||
copy(Tags.Blocks.COBBLESTONE, Tags.Items.COBBLESTONE);
|
||||
copy(Tags.Blocks.CLUSTERS, Tags.Items.CLUSTERS);
|
||||
copy(Tags.Blocks.COBBLESTONES, Tags.Items.COBBLESTONES);
|
||||
copy(Tags.Blocks.COBBLESTONE_NORMAL, Tags.Items.COBBLESTONE_NORMAL);
|
||||
copy(Tags.Blocks.COBBLESTONE_INFESTED, Tags.Items.COBBLESTONE_INFESTED);
|
||||
copy(Tags.Blocks.COBBLESTONE_MOSSY, Tags.Items.COBBLESTONE_MOSSY);
|
||||
copy(Tags.Blocks.COBBLESTONE_DEEPSLATE, Tags.Items.COBBLESTONE_DEEPSLATE);
|
||||
tag(Tags.Items.CROPS).addTags(Tags.Items.CROPS_BEETROOT, Tags.Items.CROPS_CARROT, Tags.Items.CROPS_NETHER_WART, Tags.Items.CROPS_POTATO, Tags.Items.CROPS_WHEAT);
|
||||
copy(Tags.Blocks.CONCRETES, Tags.Items.CONCRETES);
|
||||
tag(Tags.Items.CONCRETE_POWDERS)
|
||||
.add(Items.WHITE_CONCRETE_POWDER, Items.ORANGE_CONCRETE_POWDER, Items.MAGENTA_CONCRETE_POWDER,
|
||||
Items.LIGHT_BLUE_CONCRETE_POWDER, Items.YELLOW_CONCRETE_POWDER, Items.LIME_CONCRETE_POWDER,
|
||||
Items.PINK_CONCRETE_POWDER, Items.GRAY_CONCRETE_POWDER, Items.LIGHT_GRAY_CONCRETE_POWDER,
|
||||
Items.CYAN_CONCRETE_POWDER, Items.PURPLE_CONCRETE_POWDER, Items.BLUE_CONCRETE_POWDER,
|
||||
Items.BROWN_CONCRETE_POWDER, Items.GREEN_CONCRETE_POWDER, Items.RED_CONCRETE_POWDER,
|
||||
Items.BLACK_CONCRETE_POWDER);
|
||||
tag(Tags.Items.CROPS).addTags(
|
||||
Tags.Items.CROPS_BEETROOT, Tags.Items.CROPS_CACTUS, Tags.Items.CROPS_CARROT,
|
||||
Tags.Items.CROPS_COCOA_BEAN, Tags.Items.CROPS_MELON, Tags.Items.CROPS_NETHER_WART,
|
||||
Tags.Items.CROPS_POTATO, Tags.Items.CROPS_PUMPKIN, Tags.Items.CROPS_SUGAR_CANE,
|
||||
Tags.Items.CROPS_WHEAT
|
||||
);
|
||||
tag(Tags.Items.CROPS_BEETROOT).add(Items.BEETROOT);
|
||||
tag(Tags.Items.CROPS_CACTUS).add(Items.CACTUS);
|
||||
tag(Tags.Items.CROPS_CARROT).add(Items.CARROT);
|
||||
tag(Tags.Items.CROPS_COCOA_BEAN).add(Items.COCOA_BEANS);
|
||||
tag(Tags.Items.CROPS_MELON).add(Items.MELON);
|
||||
tag(Tags.Items.CROPS_NETHER_WART).add(Items.NETHER_WART);
|
||||
tag(Tags.Items.CROPS_POTATO).add(Items.POTATO);
|
||||
tag(Tags.Items.CROPS_PUMPKIN).add(Items.PUMPKIN);
|
||||
tag(Tags.Items.CROPS_SUGAR_CANE).add(Items.SUGAR_CANE);
|
||||
tag(Tags.Items.CROPS_WHEAT).add(Items.WHEAT);
|
||||
tag(Tags.Items.DUSTS).addTags(Tags.Items.DUSTS_GLOWSTONE, Tags.Items.DUSTS_PRISMARINE, Tags.Items.DUSTS_REDSTONE);
|
||||
addColored(Tags.Items.DYED, "{color}_banner");
|
||||
addColored(Tags.Items.DYED, "{color}_bed");
|
||||
addColored(Tags.Items.DYED, "{color}_candle");
|
||||
addColored(Tags.Items.DYED, "{color}_carpet");
|
||||
addColored(Tags.Items.DYED, "{color}_concrete");
|
||||
addColored(Tags.Items.DYED, "{color}_concrete_powder");
|
||||
addColored(Tags.Items.DYED, "{color}_glazed_terracotta");
|
||||
addColored(Tags.Items.DYED, "{color}_shulker_box");
|
||||
addColored(Tags.Items.DYED, "{color}_stained_glass");
|
||||
addColored(Tags.Items.DYED, "{color}_stained_glass_pane");
|
||||
addColored(Tags.Items.DYED, "{color}_terracotta");
|
||||
addColored(Tags.Items.DYED, "{color}_wool");
|
||||
addColoredTags(tag(Tags.Items.DYED)::addTags, Tags.Items.DYED);
|
||||
tag(Tags.Items.DUSTS).addTags(Tags.Items.DUSTS_GLOWSTONE, Tags.Items.DUSTS_REDSTONE);
|
||||
tag(Tags.Items.DUSTS_GLOWSTONE).add(Items.GLOWSTONE_DUST);
|
||||
tag(Tags.Items.DUSTS_PRISMARINE).add(Items.PRISMARINE_SHARD);
|
||||
tag(Tags.Items.DUSTS_REDSTONE).add(Items.REDSTONE);
|
||||
addColored(tag(Tags.Items.DYES)::addTags, Tags.Items.DYES, "{color}_dye");
|
||||
addColored(Tags.Items.DYES, "{color}_dye");
|
||||
addColoredTags(tag(Tags.Items.DYES)::addTags, Tags.Items.DYES);
|
||||
tag(Tags.Items.EGGS).add(Items.EGG);
|
||||
tag(Tags.Items.ENCHANTING_FUELS).addTag(Tags.Items.GEMS_LAPIS);
|
||||
copy(Tags.Blocks.END_STONES, Tags.Items.END_STONES);
|
||||
@@ -67,6 +112,34 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider
|
||||
copy(Tags.Blocks.FENCES, Tags.Items.FENCES);
|
||||
copy(Tags.Blocks.FENCES_NETHER_BRICK, Tags.Items.FENCES_NETHER_BRICK);
|
||||
copy(Tags.Blocks.FENCES_WOODEN, Tags.Items.FENCES_WOODEN);
|
||||
tag(Tags.Items.FERTILIZERS).add(Items.BONE_MEAL);
|
||||
tag(Tags.Items.FOODS_FRUIT).add(Items.APPLE, Items.GOLDEN_APPLE, Items.ENCHANTED_GOLDEN_APPLE, Items.CHORUS_FRUIT, Items.MELON_SLICE);
|
||||
tag(Tags.Items.FOODS_VEGETABLE).add(Items.CARROT, Items.GOLDEN_CARROT, Items.POTATO, Items.BEETROOT);
|
||||
tag(Tags.Items.FOODS_BERRY).add(Items.SWEET_BERRIES, Items.GLOW_BERRIES);
|
||||
tag(Tags.Items.FOODS_BREAD).add(Items.BREAD);
|
||||
tag(Tags.Items.FOODS_COOKIE).add(Items.COOKIE);
|
||||
tag(Tags.Items.FOODS_RAW_MEAT).add(Items.BEEF, Items.PORKCHOP, Items.CHICKEN, Items.RABBIT, Items.MUTTON);
|
||||
tag(Tags.Items.FOODS_RAW_FISH).add(Items.COD, Items.SALMON, Items.TROPICAL_FISH, Items.PUFFERFISH);
|
||||
tag(Tags.Items.FOODS_COOKED_MEAT).add(Items.COOKED_BEEF, Items.COOKED_PORKCHOP, Items.COOKED_CHICKEN, Items.COOKED_RABBIT, Items.COOKED_MUTTON);
|
||||
tag(Tags.Items.FOODS_COOKED_FISH).add(Items.COOKED_COD, Items.COOKED_SALMON);
|
||||
tag(Tags.Items.FOODS_SOUP).add(Items.BEETROOT_SOUP, Items.MUSHROOM_STEW, Items.RABBIT_STEW, Items.SUSPICIOUS_STEW);
|
||||
tag(Tags.Items.FOODS_CANDY);
|
||||
tag(Tags.Items.FOODS_PIE).add(Items.PUMPKIN_PIE); // Todo: Move tag to `c:foods/pie` when Fabric#4144 is merged
|
||||
tag(Tags.Items.FOODS_EDIBLE_WHEN_PLACED).add(Items.CAKE);
|
||||
tag(Tags.Items.FOODS_FOOD_POISONING).add(Items.POISONOUS_POTATO, Items.PUFFERFISH, Items.SPIDER_EYE, Items.CHICKEN, Items.ROTTEN_FLESH);
|
||||
tag(Tags.Items.FOODS_GOLDEN).add(Items.GOLDEN_APPLE, Items.ENCHANTED_GOLDEN_APPLE, Items.GOLDEN_CARROT);
|
||||
tag(Tags.Items.FOODS)
|
||||
.add(Items.BAKED_POTATO, Items.HONEY_BOTTLE, Items.OMINOUS_BOTTLE, Items.DRIED_KELP)
|
||||
.addTags(Tags.Items.FOODS_FRUIT, Tags.Items.FOODS_VEGETABLE, Tags.Items.FOODS_BERRY, Tags.Items.FOODS_BREAD, Tags.Items.FOODS_COOKIE,
|
||||
Tags.Items.FOODS_RAW_MEAT, Tags.Items.FOODS_RAW_FISH, Tags.Items.FOODS_COOKED_MEAT, Tags.Items.FOODS_COOKED_FISH,
|
||||
Tags.Items.FOODS_SOUP, Tags.Items.FOODS_CANDY, Tags.Items.FOODS_PIE, Tags.Items.FOODS_GOLDEN,
|
||||
Tags.Items.FOODS_EDIBLE_WHEN_PLACED, Tags.Items.FOODS_FOOD_POISONING);
|
||||
tag(Tags.Items.ANIMAL_FOODS)
|
||||
.addTags(ItemTags.ARMADILLO_FOOD, ItemTags.AXOLOTL_FOOD, ItemTags.BEE_FOOD, ItemTags.CAMEL_FOOD,
|
||||
ItemTags.CAT_FOOD, ItemTags.CHICKEN_FOOD, ItemTags.COW_FOOD, ItemTags.FOX_FOOD, ItemTags.FROG_FOOD,
|
||||
ItemTags.GOAT_FOOD, ItemTags.HOGLIN_FOOD, ItemTags.HORSE_FOOD, ItemTags.LLAMA_FOOD, ItemTags.OCELOT_FOOD,
|
||||
ItemTags.PANDA_FOOD, ItemTags.PARROT_FOOD, ItemTags.PIG_FOOD, ItemTags.PIGLIN_FOOD, ItemTags.RABBIT_FOOD,
|
||||
ItemTags.SHEEP_FOOD, ItemTags.SNIFFER_FOOD, ItemTags.STRIDER_FOOD, ItemTags.TURTLE_FOOD, ItemTags.WOLF_FOOD);
|
||||
tag(Tags.Items.GEMS).addTags(Tags.Items.GEMS_AMETHYST, Tags.Items.GEMS_DIAMOND, Tags.Items.GEMS_EMERALD, Tags.Items.GEMS_LAPIS, Tags.Items.GEMS_PRISMARINE, Tags.Items.GEMS_QUARTZ);
|
||||
tag(Tags.Items.GEMS_AMETHYST).add(Items.AMETHYST_SHARD);
|
||||
tag(Tags.Items.GEMS_DIAMOND).add(Items.DIAMOND);
|
||||
@@ -74,30 +147,36 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider
|
||||
tag(Tags.Items.GEMS_LAPIS).add(Items.LAPIS_LAZULI);
|
||||
tag(Tags.Items.GEMS_PRISMARINE).add(Items.PRISMARINE_CRYSTALS);
|
||||
tag(Tags.Items.GEMS_QUARTZ).add(Items.QUARTZ);
|
||||
copy(Tags.Blocks.GLASS, Tags.Items.GLASS);
|
||||
copy(Tags.Blocks.GLASS_TINTED, Tags.Items.GLASS_TINTED);
|
||||
copy(Tags.Blocks.GLASS_SILICA, Tags.Items.GLASS_SILICA);
|
||||
copyColored(Tags.Blocks.GLASS, Tags.Items.GLASS);
|
||||
copy(Tags.Blocks.GLASS_BLOCKS, Tags.Items.GLASS_BLOCKS);
|
||||
copy(Tags.Blocks.GLASS_BLOCKS_COLORLESS, Tags.Items.GLASS_BLOCKS_COLORLESS);
|
||||
copy(Tags.Blocks.GLASS_BLOCKS_TINTED, Tags.Items.GLASS_BLOCKS_TINTED);
|
||||
copy(Tags.Blocks.GLASS_BLOCKS_CHEAP, Tags.Items.GLASS_BLOCKS_CHEAP);
|
||||
copy(Tags.Blocks.GLASS_PANES, Tags.Items.GLASS_PANES);
|
||||
copyColored(Tags.Blocks.GLASS_PANES, Tags.Items.GLASS_PANES);
|
||||
copy(Tags.Blocks.GLASS_PANES_COLORLESS, Tags.Items.GLASS_PANES_COLORLESS);
|
||||
copy(Tags.Blocks.GLAZED_TERRACOTTAS, Tags.Items.GLAZED_TERRACOTTAS);
|
||||
copy(Tags.Blocks.GRAVEL, Tags.Items.GRAVEL);
|
||||
tag(Tags.Items.GUNPOWDER).add(Items.GUNPOWDER);
|
||||
tag(Tags.Items.HEADS).add(Items.CREEPER_HEAD, Items.DRAGON_HEAD, Items.PLAYER_HEAD, Items.SKELETON_SKULL, Items.WITHER_SKELETON_SKULL, Items.ZOMBIE_HEAD);
|
||||
tag(Tags.Items.INGOTS).addTags(Tags.Items.INGOTS_BRICK, Tags.Items.INGOTS_COPPER, Tags.Items.INGOTS_GOLD, Tags.Items.INGOTS_IRON, Tags.Items.INGOTS_NETHERITE, Tags.Items.INGOTS_NETHER_BRICK);
|
||||
tag(Tags.Items.INGOTS_BRICK).add(Items.BRICK);
|
||||
tag(Tags.Items.HIDDEN_FROM_RECIPE_VIEWERS);
|
||||
tag(Tags.Items.INGOTS).addTags(Tags.Items.INGOTS_COPPER, Tags.Items.INGOTS_GOLD, Tags.Items.INGOTS_IRON, Tags.Items.INGOTS_NETHERITE);
|
||||
tag(Tags.Items.INGOTS_COPPER).add(Items.COPPER_INGOT);
|
||||
tag(Tags.Items.INGOTS_GOLD).add(Items.GOLD_INGOT);
|
||||
tag(Tags.Items.INGOTS_IRON).add(Items.IRON_INGOT);
|
||||
tag(Tags.Items.INGOTS_NETHERITE).add(Items.NETHERITE_INGOT);
|
||||
tag(Tags.Items.INGOTS_NETHER_BRICK).add(Items.NETHER_BRICK);
|
||||
tag(Tags.Items.LEATHER).add(Items.LEATHER);
|
||||
tag(Tags.Items.LEATHERS).add(Items.LEATHER);
|
||||
tag(Tags.Items.MUSHROOMS).add(Items.BROWN_MUSHROOM, Items.RED_MUSHROOM);
|
||||
tag(Tags.Items.MUSIC_DISCS).add(Items.MUSIC_DISC_13, Items.MUSIC_DISC_CAT, Items.MUSIC_DISC_BLOCKS, Items.MUSIC_DISC_CHIRP,
|
||||
Items.MUSIC_DISC_FAR, Items.MUSIC_DISC_MALL, Items.MUSIC_DISC_MELLOHI, Items.MUSIC_DISC_STAL, Items.MUSIC_DISC_STRAD,
|
||||
Items.MUSIC_DISC_WARD, Items.MUSIC_DISC_11, Items.MUSIC_DISC_WAIT, Items.MUSIC_DISC_OTHERSIDE, Items.MUSIC_DISC_5,
|
||||
Items.MUSIC_DISC_PIGSTEP, Items.MUSIC_DISC_RELIC, Items.MUSIC_DISC_CREATOR, Items.MUSIC_DISC_CREATOR_MUSIC_BOX,
|
||||
Items.MUSIC_DISC_PRECIPICE);
|
||||
tag(Tags.Items.NETHER_STARS).add(Items.NETHER_STAR);
|
||||
copy(Tags.Blocks.NETHERRACK, Tags.Items.NETHERRACK);
|
||||
tag(Tags.Items.NUGGETS).addTags(Tags.Items.NUGGETS_IRON, Tags.Items.NUGGETS_GOLD);
|
||||
tag(Tags.Items.NUGGETS).addTags(Tags.Items.NUGGETS_GOLD, Tags.Items.NUGGETS_IRON);
|
||||
tag(Tags.Items.NUGGETS_IRON).add(Items.IRON_NUGGET);
|
||||
tag(Tags.Items.NUGGETS_GOLD).add(Items.GOLD_NUGGET);
|
||||
copy(Tags.Blocks.OBSIDIAN, Tags.Items.OBSIDIAN);
|
||||
copy(Tags.Blocks.OBSIDIANS, Tags.Items.OBSIDIANS);
|
||||
copy(Tags.Blocks.OBSIDIANS_NORMAL, Tags.Items.OBSIDIANS_NORMAL);
|
||||
copy(Tags.Blocks.OBSIDIANS_CRYING, Tags.Items.OBSIDIANS_CRYING);
|
||||
copy(Tags.Blocks.ORE_BEARING_GROUND_DEEPSLATE, Tags.Items.ORE_BEARING_GROUND_DEEPSLATE);
|
||||
copy(Tags.Blocks.ORE_BEARING_GROUND_NETHERRACK, Tags.Items.ORE_BEARING_GROUND_NETHERRACK);
|
||||
copy(Tags.Blocks.ORE_BEARING_GROUND_STONE, Tags.Items.ORE_BEARING_GROUND_STONE);
|
||||
@@ -118,117 +197,255 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider
|
||||
copy(Tags.Blocks.ORES_IN_GROUND_DEEPSLATE, Tags.Items.ORES_IN_GROUND_DEEPSLATE);
|
||||
copy(Tags.Blocks.ORES_IN_GROUND_NETHERRACK, Tags.Items.ORES_IN_GROUND_NETHERRACK);
|
||||
copy(Tags.Blocks.ORES_IN_GROUND_STONE, Tags.Items.ORES_IN_GROUND_STONE);
|
||||
copy(Tags.Blocks.PLAYER_WORKSTATIONS_CRAFTING_TABLES, Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES);
|
||||
copy(Tags.Blocks.PLAYER_WORKSTATIONS_FURNACES, Tags.Items.PLAYER_WORKSTATIONS_FURNACES);
|
||||
tag(Tags.Items.RAW_MATERIALS).addTags(Tags.Items.RAW_MATERIALS_COPPER, Tags.Items.RAW_MATERIALS_GOLD, Tags.Items.RAW_MATERIALS_IRON);
|
||||
tag(Tags.Items.RAW_MATERIALS_COPPER).add(Items.RAW_COPPER);
|
||||
tag(Tags.Items.RAW_MATERIALS_GOLD).add(Items.RAW_GOLD);
|
||||
tag(Tags.Items.RAW_MATERIALS_IRON).add(Items.RAW_IRON);
|
||||
tag(Tags.Items.RODS).addTags(Tags.Items.RODS_BLAZE, Tags.Items.RODS_WOODEN);
|
||||
tag(Tags.Items.RODS).addTags(Tags.Items.RODS_WOODEN, Tags.Items.RODS_BLAZE, Tags.Items.RODS_BREEZE);
|
||||
tag(Tags.Items.RODS_BLAZE).add(Items.BLAZE_ROD);
|
||||
tag(Tags.Items.RODS_BREEZE).add(Items.BREEZE_ROD);
|
||||
tag(Tags.Items.RODS_WOODEN).add(Items.STICK);
|
||||
copy(Tags.Blocks.ROPES, Tags.Items.ROPES);
|
||||
copy(Tags.Blocks.SAND, Tags.Items.SAND);
|
||||
copy(Tags.Blocks.SAND_COLORLESS, Tags.Items.SAND_COLORLESS);
|
||||
copy(Tags.Blocks.SAND_RED, Tags.Items.SAND_RED);
|
||||
copy(Tags.Blocks.SANDSTONE, Tags.Items.SANDSTONE);
|
||||
copy(Tags.Blocks.SANDSTONE_BLOCKS, Tags.Items.SANDSTONE_BLOCKS);
|
||||
copy(Tags.Blocks.SANDSTONE_SLABS, Tags.Items.SANDSTONE_SLABS);
|
||||
copy(Tags.Blocks.SANDSTONE_STAIRS, Tags.Items.SANDSTONE_STAIRS);
|
||||
copy(Tags.Blocks.SANDSTONE_RED_BLOCKS, Tags.Items.SANDSTONE_RED_BLOCKS);
|
||||
copy(Tags.Blocks.SANDSTONE_RED_SLABS, Tags.Items.SANDSTONE_RED_SLABS);
|
||||
copy(Tags.Blocks.SANDSTONE_RED_STAIRS, Tags.Items.SANDSTONE_RED_STAIRS);
|
||||
copy(Tags.Blocks.SANDSTONE_UNCOLORED_BLOCKS, Tags.Items.SANDSTONE_UNCOLORED_BLOCKS);
|
||||
copy(Tags.Blocks.SANDSTONE_UNCOLORED_SLABS, Tags.Items.SANDSTONE_UNCOLORED_SLABS);
|
||||
copy(Tags.Blocks.SANDSTONE_UNCOLORED_STAIRS, Tags.Items.SANDSTONE_UNCOLORED_STAIRS);
|
||||
tag(Tags.Items.SEEDS).addTags(Tags.Items.SEEDS_BEETROOT, Tags.Items.SEEDS_MELON, Tags.Items.SEEDS_PUMPKIN, Tags.Items.SEEDS_WHEAT);
|
||||
tag(Tags.Items.SEEDS_BEETROOT).add(Items.BEETROOT_SEEDS);
|
||||
tag(Tags.Items.SEEDS_MELON).add(Items.MELON_SEEDS);
|
||||
tag(Tags.Items.SEEDS_PUMPKIN).add(Items.PUMPKIN_SEEDS);
|
||||
tag(Tags.Items.SEEDS_WHEAT).add(Items.WHEAT_SEEDS);
|
||||
tag(Tags.Items.SHEARS).add(Items.SHEARS);
|
||||
tag(Tags.Items.SLIMEBALLS).add(Items.SLIME_BALL);
|
||||
copy(Tags.Blocks.STAINED_GLASS, Tags.Items.STAINED_GLASS);
|
||||
copy(Tags.Blocks.STAINED_GLASS_PANES, Tags.Items.STAINED_GLASS_PANES);
|
||||
copy(Tags.Blocks.STONE, Tags.Items.STONE);
|
||||
tag(Tags.Items.SLIME_BALLS).add(Items.SLIME_BALL);
|
||||
tag(Tags.Items.SHULKER_BOXES)
|
||||
.add(Items.SHULKER_BOX, Items.WHITE_SHULKER_BOX, Items.ORANGE_SHULKER_BOX,
|
||||
Items.MAGENTA_SHULKER_BOX, Items.LIGHT_BLUE_SHULKER_BOX, Items.YELLOW_SHULKER_BOX,
|
||||
Items.LIME_SHULKER_BOX, Items.PINK_SHULKER_BOX, Items.GRAY_SHULKER_BOX,
|
||||
Items.LIGHT_GRAY_SHULKER_BOX, Items.CYAN_SHULKER_BOX, Items.PURPLE_SHULKER_BOX,
|
||||
Items.BLUE_SHULKER_BOX, Items.BROWN_SHULKER_BOX, Items.GREEN_SHULKER_BOX,
|
||||
Items.RED_SHULKER_BOX, Items.BLACK_SHULKER_BOX);
|
||||
copy(Tags.Blocks.STONES, Tags.Items.STONES);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_AMETHYST, Tags.Items.STORAGE_BLOCKS_AMETHYST);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_BONE_MEAL, Tags.Items.STORAGE_BLOCKS_BONE_MEAL);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_COAL, Tags.Items.STORAGE_BLOCKS_COAL);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_COPPER, Tags.Items.STORAGE_BLOCKS_COPPER);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_DIAMOND, Tags.Items.STORAGE_BLOCKS_DIAMOND);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_DRIED_KELP, Tags.Items.STORAGE_BLOCKS_DRIED_KELP);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_EMERALD, Tags.Items.STORAGE_BLOCKS_EMERALD);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_GOLD, Tags.Items.STORAGE_BLOCKS_GOLD);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_IRON, Tags.Items.STORAGE_BLOCKS_IRON);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_LAPIS, Tags.Items.STORAGE_BLOCKS_LAPIS);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_QUARTZ, Tags.Items.STORAGE_BLOCKS_QUARTZ);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_REDSTONE, Tags.Items.STORAGE_BLOCKS_REDSTONE);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_NETHERITE, Tags.Items.STORAGE_BLOCKS_NETHERITE);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_RAW_COPPER, Tags.Items.STORAGE_BLOCKS_RAW_COPPER);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_RAW_GOLD, Tags.Items.STORAGE_BLOCKS_RAW_GOLD);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_RAW_IRON, Tags.Items.STORAGE_BLOCKS_RAW_IRON);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_NETHERITE, Tags.Items.STORAGE_BLOCKS_NETHERITE);
|
||||
tag(Tags.Items.STRING).add(Items.STRING);
|
||||
tag(Tags.Items.TOOLS_SHIELDS).add(Items.SHIELD);
|
||||
tag(Tags.Items.TOOLS_BOWS).add(Items.BOW);
|
||||
tag(Tags.Items.TOOLS_CROSSBOWS).add(Items.CROSSBOW);
|
||||
tag(Tags.Items.TOOLS_FISHING_RODS).add(Items.FISHING_ROD);
|
||||
tag(Tags.Items.TOOLS_TRIDENTS).add(Items.TRIDENT);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_REDSTONE, Tags.Items.STORAGE_BLOCKS_REDSTONE);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_SLIME, Tags.Items.STORAGE_BLOCKS_SLIME);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_WHEAT, Tags.Items.STORAGE_BLOCKS_WHEAT);
|
||||
tag(Tags.Items.STRINGS).add(Items.STRING);
|
||||
tag(Tags.Items.VILLAGER_JOB_SITES).add(
|
||||
Items.BARREL, Items.BLAST_FURNACE, Items.BREWING_STAND, Items.CARTOGRAPHY_TABLE,
|
||||
Items.CAULDRON, Items.COMPOSTER, Items.FLETCHING_TABLE, Items.GRINDSTONE,
|
||||
Items.LECTERN, Items.LOOM, Items.SMITHING_TABLE, Items.SMOKER, Items.STONECUTTER);
|
||||
|
||||
// Tools and Armors
|
||||
tag(Tags.Items.TOOLS_SHIELD).add(Items.SHIELD);
|
||||
tag(Tags.Items.TOOLS_BOW).add(Items.BOW);
|
||||
tag(Tags.Items.TOOLS_BRUSH).add(Items.BRUSH);
|
||||
tag(Tags.Items.TOOLS_CROSSBOW).add(Items.CROSSBOW);
|
||||
tag(Tags.Items.TOOLS_FISHING_ROD).add(Items.FISHING_ROD);
|
||||
tag(Tags.Items.TOOLS_SHEAR).add(Items.SHEARS);
|
||||
tag(Tags.Items.TOOLS_SPEAR).add(Items.TRIDENT);
|
||||
tag(Tags.Items.TOOLS_MACE).add(Items.MACE);
|
||||
tag(Tags.Items.TOOLS_IGNITER).add(Items.FLINT_AND_STEEL);
|
||||
tag(Tags.Items.MINING_TOOL_TOOLS).add(Items.WOODEN_PICKAXE, Items.STONE_PICKAXE, Items.IRON_PICKAXE, Items.GOLDEN_PICKAXE, Items.DIAMOND_PICKAXE, Items.NETHERITE_PICKAXE);
|
||||
tag(Tags.Items.MELEE_WEAPON_TOOLS).add(
|
||||
Items.MACE, Items.TRIDENT,
|
||||
Items.WOODEN_SWORD, Items.STONE_SWORD, Items.GOLDEN_SWORD, Items.IRON_SWORD, Items.DIAMOND_SWORD, Items.NETHERITE_SWORD,
|
||||
Items.WOODEN_AXE, Items.STONE_AXE, Items.GOLDEN_AXE, Items.IRON_AXE, Items.DIAMOND_AXE, Items.NETHERITE_AXE
|
||||
);
|
||||
tag(Tags.Items.RANGED_WEAPON_TOOLS).add(Items.BOW, Items.CROSSBOW, Items.TRIDENT);
|
||||
tag(Tags.Items.TOOLS)
|
||||
.addTags(ItemTags.SWORDS, ItemTags.AXES, ItemTags.PICKAXES, ItemTags.SHOVELS, ItemTags.HOES)
|
||||
.addTags(Tags.Items.TOOLS_SHIELDS, Tags.Items.TOOLS_BOWS, Tags.Items.TOOLS_CROSSBOWS, Tags.Items.TOOLS_FISHING_RODS, Tags.Items.TOOLS_TRIDENTS);
|
||||
tag(Tags.Items.ARMORS_HELMETS).add(Items.LEATHER_HELMET, Items.TURTLE_HELMET, Items.CHAINMAIL_HELMET, Items.IRON_HELMET, Items.GOLDEN_HELMET, Items.DIAMOND_HELMET, Items.NETHERITE_HELMET);
|
||||
tag(Tags.Items.ARMORS_CHESTPLATES).add(Items.LEATHER_CHESTPLATE, Items.CHAINMAIL_CHESTPLATE, Items.IRON_CHESTPLATE, Items.GOLDEN_CHESTPLATE, Items.DIAMOND_CHESTPLATE, Items.NETHERITE_CHESTPLATE);
|
||||
tag(Tags.Items.ARMORS_LEGGINGS).add(Items.LEATHER_LEGGINGS, Items.CHAINMAIL_LEGGINGS, Items.IRON_LEGGINGS, Items.GOLDEN_LEGGINGS, Items.DIAMOND_LEGGINGS, Items.NETHERITE_LEGGINGS);
|
||||
tag(Tags.Items.ARMORS_BOOTS).add(Items.LEATHER_BOOTS, Items.CHAINMAIL_BOOTS, Items.IRON_BOOTS, Items.GOLDEN_BOOTS, Items.DIAMOND_BOOTS, Items.NETHERITE_BOOTS);
|
||||
tag(Tags.Items.ARMORS).addTags(Tags.Items.ARMORS_HELMETS, Tags.Items.ARMORS_CHESTPLATES, Tags.Items.ARMORS_LEGGINGS, Tags.Items.ARMORS_BOOTS);
|
||||
.addTags(ItemTags.AXES, ItemTags.HOES, ItemTags.PICKAXES, ItemTags.SHOVELS, ItemTags.SWORDS)
|
||||
.addTags(Tags.Items.TOOLS_BOW, Tags.Items.TOOLS_BRUSH, Tags.Items.TOOLS_CROSSBOW, Tags.Items.TOOLS_FISHING_ROD, Tags.Items.TOOLS_SHEAR, Tags.Items.TOOLS_IGNITER, Tags.Items.TOOLS_SHIELD, Tags.Items.TOOLS_SPEAR, Tags.Items.TOOLS_MACE, Tags.Items.MINING_TOOL_TOOLS, Tags.Items.MELEE_WEAPON_TOOLS, Tags.Items.RANGED_WEAPON_TOOLS);
|
||||
tag(Tags.Items.ARMORS).addTags(ItemTags.HEAD_ARMOR, ItemTags.CHEST_ARMOR, ItemTags.LEG_ARMOR, ItemTags.FOOT_ARMOR);
|
||||
tag(Tags.Items.ENCHANTABLES).addTags(ItemTags.ARMOR_ENCHANTABLE, ItemTags.EQUIPPABLE_ENCHANTABLE, ItemTags.WEAPON_ENCHANTABLE, ItemTags.SWORD_ENCHANTABLE, ItemTags.MINING_ENCHANTABLE, ItemTags.MINING_LOOT_ENCHANTABLE, ItemTags.FISHING_ENCHANTABLE, ItemTags.TRIDENT_ENCHANTABLE, ItemTags.BOW_ENCHANTABLE, ItemTags.CROSSBOW_ENCHANTABLE, ItemTags.MACE_ENCHANTABLE, ItemTags.FIRE_ASPECT_ENCHANTABLE, ItemTags.DURABILITY_ENCHANTABLE, ItemTags.VANISHING_ENCHANTABLE);
|
||||
|
||||
// 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
|
||||
tagWithOptionalLegacy(Tags.Items.BONES);
|
||||
tag(Tags.Items.BRICKS_NORMAL).addOptionalTag(forgeRl("ingots/brick"));
|
||||
tag(Tags.Items.BRICKS_NETHER).addOptionalTag(forgeRl("ingots/nether_brick"));
|
||||
tagWithOptionalLegacy(Tags.Items.CROPS);
|
||||
tagWithOptionalLegacy(Tags.Items.CROPS_BEETROOT);
|
||||
tagWithOptionalLegacy(Tags.Items.CROPS_CARROT);
|
||||
tagWithOptionalLegacy(Tags.Items.CROPS_NETHER_WART);
|
||||
tagWithOptionalLegacy(Tags.Items.CROPS_POTATO);
|
||||
tagWithOptionalLegacy(Tags.Items.CROPS_WHEAT);
|
||||
tagWithOptionalLegacy(Tags.Items.DUSTS);
|
||||
tagWithOptionalLegacy(Tags.Items.DUSTS_GLOWSTONE);
|
||||
tagWithOptionalLegacy(Tags.Items.DUSTS_REDSTONE);
|
||||
tagColoredWithOptionalLegacy(Tags.Items.DYES);
|
||||
tag(Tags.Items.DYED_BLACK)
|
||||
.addOptionalTag(forgeRl("glass/black"))
|
||||
.addOptionalTag(forgeRl("stained_glass/black"));
|
||||
tag(Tags.Items.DYED_BLUE)
|
||||
.addOptionalTag(forgeRl("glass/blue"))
|
||||
.addOptionalTag(forgeRl("stained_glass/blue"));
|
||||
tag(Tags.Items.DYED_BROWN)
|
||||
.addOptionalTag(forgeRl("glass/brown"))
|
||||
.addOptionalTag(forgeRl("stained_glass/brown"));
|
||||
tag(Tags.Items.DYED_CYAN)
|
||||
.addOptionalTag(forgeRl("glass/cyan"))
|
||||
.addOptionalTag(forgeRl("stained_glass/cyan"));
|
||||
tag(Tags.Items.DYED_GRAY)
|
||||
.addOptionalTag(forgeRl("glass/gray"))
|
||||
.addOptionalTag(forgeRl("stained_glass/gray"));
|
||||
tag(Tags.Items.DYED_GREEN)
|
||||
.addOptionalTag(forgeRl("glass/green"))
|
||||
.addOptionalTag(forgeRl("stained_glass/green"));
|
||||
tag(Tags.Items.DYED_LIGHT_BLUE)
|
||||
.addOptionalTag(forgeRl("glass/light_blue"))
|
||||
.addOptionalTag(forgeRl("stained_glass/light_blue"));
|
||||
tag(Tags.Items.DYED_LIGHT_GRAY)
|
||||
.addOptionalTag(forgeRl("glass/light_gray"))
|
||||
.addOptionalTag(forgeRl("stained_glass/light_gray"));
|
||||
tag(Tags.Items.DYED_LIME)
|
||||
.addOptionalTag(forgeRl("glass/lime"))
|
||||
.addOptionalTag(forgeRl("stained_glass/lime"));
|
||||
tag(Tags.Items.DYED_MAGENTA)
|
||||
.addOptionalTag(forgeRl("glass/magenta"))
|
||||
.addOptionalTag(forgeRl("stained_glass/magenta"));
|
||||
tag(Tags.Items.DYED_MAGENTA)
|
||||
.addOptionalTag(forgeRl("glass/magenta"))
|
||||
.addOptionalTag(forgeRl("stained_glass/magenta"));
|
||||
tag(Tags.Items.DYED_ORANGE)
|
||||
.addOptionalTag(forgeRl("glass/orange"))
|
||||
.addOptionalTag(forgeRl("stained_glass/orange"));
|
||||
tag(Tags.Items.DYED_PINK)
|
||||
.addOptionalTag(forgeRl("glass/pink"))
|
||||
.addOptionalTag(forgeRl("stained_glass/pink"));
|
||||
tag(Tags.Items.DYED_PURPLE)
|
||||
.addOptionalTag(forgeRl("glass/purple"))
|
||||
.addOptionalTag(forgeRl("stained_glass/purple"));
|
||||
tag(Tags.Items.DYED_RED)
|
||||
.addOptionalTag(forgeRl("glass/red"))
|
||||
.addOptionalTag(forgeRl("stained_glass/red"));
|
||||
tag(Tags.Items.DYED_WHITE)
|
||||
.addOptionalTag(forgeRl("glass/white"))
|
||||
.addOptionalTag(forgeRl("stained_glass/white"));
|
||||
tag(Tags.Items.DYED_YELLOW)
|
||||
.addOptionalTag(forgeRl("glass/yellow"))
|
||||
.addOptionalTag(forgeRl("stained_glass/yellow"));
|
||||
tagWithOptionalLegacy(Tags.Items.ENDER_PEARLS);
|
||||
tagWithOptionalLegacy(Tags.Items.GEMS);
|
||||
tagWithOptionalLegacy(Tags.Items.GEMS_AMETHYST);
|
||||
tagWithOptionalLegacy(Tags.Items.GEMS_DIAMOND);
|
||||
tagWithOptionalLegacy(Tags.Items.GEMS_EMERALD);
|
||||
tagWithOptionalLegacy(Tags.Items.GEMS_LAPIS);
|
||||
tagWithOptionalLegacy(Tags.Items.GEMS_PRISMARINE);
|
||||
tagWithOptionalLegacy(Tags.Items.GEMS_QUARTZ);
|
||||
tagWithOptionalLegacy(Tags.Items.INGOTS);
|
||||
tagWithOptionalLegacy(Tags.Items.INGOTS_COPPER);
|
||||
tagWithOptionalLegacy(Tags.Items.INGOTS_GOLD);
|
||||
tagWithOptionalLegacy(Tags.Items.INGOTS_IRON);
|
||||
tagWithOptionalLegacy(Tags.Items.INGOTS_NETHERITE);
|
||||
tag(Tags.Items.LEATHERS).addOptionalTag(forgeRl("leather"));
|
||||
tagWithOptionalLegacy(Tags.Items.NUGGETS);
|
||||
tagWithOptionalLegacy(Tags.Items.NUGGETS_IRON);
|
||||
tagWithOptionalLegacy(Tags.Items.NUGGETS_GOLD);
|
||||
tagWithOptionalLegacy(Tags.Items.RAW_MATERIALS);
|
||||
tagWithOptionalLegacy(Tags.Items.RAW_MATERIALS_COPPER);
|
||||
tagWithOptionalLegacy(Tags.Items.RAW_MATERIALS_GOLD);
|
||||
tagWithOptionalLegacy(Tags.Items.RAW_MATERIALS_IRON);
|
||||
tagWithOptionalLegacy(Tags.Items.RODS);
|
||||
tagWithOptionalLegacy(Tags.Items.RODS_BLAZE);
|
||||
tagWithOptionalLegacy(Tags.Items.RODS_WOODEN);
|
||||
tag(Tags.Items.SLIME_BALLS).addOptionalTag(forgeRl("slimeballs"));
|
||||
tagWithOptionalLegacy(Tags.Items.STRINGS);
|
||||
tagWithOptionalLegacy(Tags.Items.TOOLS);
|
||||
tagWithOptionalLegacy(Tags.Items.ARMORS);
|
||||
tag(Tags.Items.TOOLS_SHIELD).addOptionalTag(forgeRl("tools/shields"));
|
||||
tag(Tags.Items.TOOLS_BOW).addOptionalTag(forgeRl("tools/bows"));
|
||||
tag(Tags.Items.TOOLS_BRUSH).addOptionalTag(forgeRl("tools/brushes"));
|
||||
tag(Tags.Items.TOOLS_CROSSBOW).addOptionalTag(forgeRl("tools/crossbows"));
|
||||
tag(Tags.Items.TOOLS_FISHING_ROD).addOptionalTag(forgeRl("tools/fishing_rods"));
|
||||
tag(Tags.Items.TOOLS_SHEAR).addOptionalTag(forgeRl("shears")); // yes, it's forge:shears not forge:tools/shears
|
||||
tag(Tags.Items.TOOLS_SPEAR).addOptionalTag(forgeRl("tools/tridents"));
|
||||
}
|
||||
|
||||
private void addColored(Consumer<TagKey<Item>> consumer, TagKey<Item> group, String pattern)
|
||||
{
|
||||
/**
|
||||
* Shorthand for {@code tag(tag).addOptionalTag(forgeRl(tag.location().getPath()))}
|
||||
*/
|
||||
private IntrinsicHolderTagsProvider.IntrinsicTagAppender<Item> tagWithOptionalLegacy(TagKey<Item> tag) {
|
||||
IntrinsicHolderTagsProvider.IntrinsicTagAppender<Item> tagAppender = tag(tag);
|
||||
tagAppender.addOptionalTag(forgeRl(tag.location().getPath()));
|
||||
return tagAppender;
|
||||
}
|
||||
|
||||
private void tagColoredWithOptionalLegacy(TagKey<Item> group) {
|
||||
String prefix = group.location().getPath().toUpperCase(Locale.ENGLISH) + '_';
|
||||
for (DyeColor color : DyeColor.values())
|
||||
{
|
||||
ResourceLocation key = ResourceLocation.fromNamespaceAndPath("minecraft", pattern.replace("{color}", color.getName()));
|
||||
for (DyeColor color : DyeColor.values()) {
|
||||
TagKey<Item> tag = getForgeItemTag(prefix + color.getName());
|
||||
Item item = ForgeRegistries.ITEMS.getValue(key);
|
||||
if (item == null || item == Items.AIR)
|
||||
throw new IllegalStateException("Unknown vanilla item: " + key.toString());
|
||||
tagWithOptionalLegacy(tag);
|
||||
}
|
||||
}
|
||||
|
||||
private void addColored(TagKey<Item> group, String pattern) {
|
||||
String prefix = group.location().getPath().toUpperCase(Locale.ENGLISH) + '_';
|
||||
for (DyeColor color : DyeColor.values()) {
|
||||
ResourceLocation key = ResourceLocation.fromNamespaceAndPath("minecraft", pattern.replace("{color}", color.getName()));
|
||||
TagKey<Item> tag = getForgeItemTag(prefix + color.getName());
|
||||
Item item = BuiltInRegistries.ITEM.get(key);
|
||||
if (item == null || item == Items.AIR)
|
||||
throw new IllegalStateException("Unknown vanilla item: " + key);
|
||||
tag(tag).add(item);
|
||||
}
|
||||
}
|
||||
|
||||
private static void addColoredTags(Consumer<TagKey<Item>> consumer, TagKey<Item> group) {
|
||||
String prefix = group.location().getPath().toUpperCase(Locale.ENGLISH) + '_';
|
||||
for (DyeColor color : DyeColor.values()) {
|
||||
TagKey<Item> tag = getForgeItemTag(prefix + color.getName());
|
||||
consumer.accept(tag);
|
||||
}
|
||||
}
|
||||
|
||||
private void copyColored(TagKey<Block> blockGroup, TagKey<Item> itemGroup)
|
||||
{
|
||||
String blockPre = blockGroup.location().getPath().toUpperCase(Locale.ENGLISH) + '_';
|
||||
String itemPre = itemGroup.location().getPath().toUpperCase(Locale.ENGLISH) + '_';
|
||||
for (DyeColor color : DyeColor.values())
|
||||
{
|
||||
TagKey<Block> from = getForgeBlockTag(blockPre + color.getName());
|
||||
TagKey<Item> to = getForgeItemTag(itemPre + color.getName());
|
||||
copy(from, to);
|
||||
}
|
||||
copy(getForgeBlockTag(blockPre + "colorless"), getForgeItemTag(itemPre + "colorless"));
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private TagKey<Block> getForgeBlockTag(String name)
|
||||
{
|
||||
try
|
||||
{
|
||||
private static TagKey<Block> getForgeBlockTag(String name) {
|
||||
try {
|
||||
name = name.toUpperCase(Locale.ENGLISH);
|
||||
return (TagKey<Block>)Tags.Blocks.class.getDeclaredField(name).get(null);
|
||||
}
|
||||
catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e)
|
||||
{
|
||||
return (TagKey<Block>) Tags.Blocks.class.getDeclaredField(name).get(null);
|
||||
} catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) {
|
||||
throw new IllegalStateException(Tags.Blocks.class.getName() + " is missing tag name: " + name);
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private TagKey<Item> getForgeItemTag(String name)
|
||||
{
|
||||
try
|
||||
{
|
||||
private static TagKey<Item> getForgeItemTag(String name) {
|
||||
try {
|
||||
name = name.toUpperCase(Locale.ENGLISH);
|
||||
return (TagKey<Item>)Tags.Items.class.getDeclaredField(name).get(null);
|
||||
}
|
||||
catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e)
|
||||
{
|
||||
return (TagKey<Item>) Tags.Items.class.getDeclaredField(name).get(null);
|
||||
} catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) {
|
||||
throw new IllegalStateException(Tags.Items.class.getName() + " is missing tag name: " + name);
|
||||
}
|
||||
}
|
||||
|
||||
private static ResourceLocation forgeRl(String path) {
|
||||
return ResourceLocation.fromNamespaceAndPath("forge", path);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName()
|
||||
{
|
||||
public String getName() {
|
||||
return "Forge Item Tags";
|
||||
}
|
||||
}
|
||||
@@ -43,8 +43,8 @@ import java.util.Set;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
public final class ForgeRecipeProvider extends VanillaRecipeProvider {
|
||||
private final Map<Item, TagKey<Item>> replacements = new HashMap<>();
|
||||
private final Set<ResourceLocation> excludes = new HashSet<>();
|
||||
private final Map<Item, TagKey<Item>> replacements = HashMap.newHashMap(12);
|
||||
private final Set<ResourceLocation> excludes = HashSet.newHashSet(16);
|
||||
|
||||
public ForgeRecipeProvider(PackOutput packOutput, CompletableFuture<HolderLookup.Provider> lookup) {
|
||||
super(packOutput, lookup);
|
||||
@@ -76,7 +76,7 @@ public final class ForgeRecipeProvider extends VanillaRecipeProvider {
|
||||
replace(Blocks.COBBLESTONE, Tags.Items.COBBLESTONE_NORMAL);
|
||||
replace(Blocks.COBBLED_DEEPSLATE, Tags.Items.COBBLESTONE_DEEPSLATE);
|
||||
|
||||
replace(Items.STRING, Tags.Items.STRING);
|
||||
replace(Items.STRING, Tags.Items.STRINGS);
|
||||
exclude(getConversionRecipeName(Blocks.WHITE_WOOL, Items.STRING));
|
||||
|
||||
exclude(Blocks.GOLD_BLOCK);
|
||||
@@ -196,7 +196,7 @@ public final class ForgeRecipeProvider extends VanillaRecipeProvider {
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private <T, R> R getField(Class<T> clz, T inst, int index) {
|
||||
private static <T, R> R getField(Class<T> clz, T inst, int index) {
|
||||
Field fld = clz.getDeclaredFields()[index];
|
||||
fld.setAccessible(true);
|
||||
try {
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
/*
|
||||
* Copyright (c) Forge Development LLC and contributors
|
||||
* SPDX-License-Identifier: LGPL-2.1-only
|
||||
*/
|
||||
|
||||
package net.minecraftforge.common.data;
|
||||
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.data.PackOutput;
|
||||
import net.minecraft.data.tags.StructureTagsProvider;
|
||||
import net.minecraftforge.common.Tags;
|
||||
import org.jetbrains.annotations.ApiStatus;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
@ApiStatus.Internal
|
||||
public final class ForgeStructureTagsProvider extends StructureTagsProvider {
|
||||
public ForgeStructureTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, ExistingFileHelper existingFileHelper) {
|
||||
super(output, lookupProvider, "forge", existingFileHelper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addTags(HolderLookup.Provider lookupProvider) {
|
||||
tag(Tags.Structures.HIDDEN_FROM_DISPLAYERS);
|
||||
tag(Tags.Structures.HIDDEN_FROM_LOCATOR_SELECTION);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return "Forge Structure Tags";
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user