1.21.6 - New EventBus 7

A full rewrite and redesign of the library that offers much better performance, new features and fixes all previous design flaws
See the migration guide here: https://gist.github.com/PaintNinja/ad82c224aecee25efac1ea3e2cf19b91

Co-authored-by: Paint_Ninja <[email protected]>
This commit is contained in:
LexManosandPaint_Ninja committed 2025-06-18 02:53:58 -07:00
1 parent a02f3f9841
commit 5e8942e0a7
642 files changed
+7258 -6187

No files matched your search

@@ -0,0 +1,127 @@
/*
* Copyright (c) Forge Development LLC and contributors
* SPDX-License-Identifier: LGPL-2.1-only
*/
package net.minecraftforge.common;
import net.minecraftforge.eventbus.api.bus.BusGroup;
import net.minecraftforge.eventbus.api.listener.EventListener;
import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
import net.minecraftforge.unsafe.UnsafeHacks;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodHandles.Lookup;
import java.util.Collection;
/**
* A small helper class to aid Forge modders in migrating from EventBus 6 to the new EventBus 7.
* <br>
* Refer to the migration guide mentioned in the Forge 1.21.6 announcement or ask in the Forge Discord for help with
* migrating your mod to the new system.
*/
public final class EventBusMigrationHelper {
public static final EventBusMigrationHelper INSTANCE = new EventBusMigrationHelper(BusGroup.DEFAULT);
private final BusGroup group;
public EventBusMigrationHelper(BusGroup group) {
this.group = group;
}
/**
* A version of {@link BusGroup#register(Lookup, Class)} that doesn't require a lookup. It is strongly recommended
* to use the BusGroup method directly with {@code MethodHandles.lookup()} as the first argument, as this migration
* helper method relies on JDK internals that may break without notice.
* @param clazz the class containing static event listener methods that you want to register.
* @return a collection of {@link EventListener} instances that were registered, can be passed to
* {@link BusGroup#unregister(Collection)} to unregister them later.
* @see BusGroup#register(Lookup, Class)
*/
public Collection<EventListener> register(Class<?> clazz) {
return registerListeners(group, clazz);
}
/**
* A version of {@link BusGroup#register(Lookup, Object)} that doesn't require a lookup. It is strongly recommended
* to use the BusGroup method directly with {@code MethodHandles.lookup()} as the first argument, as this migration
* helper method relies on JDK internals that may break without notice.
* @param instance the instance of a class containing instance and static event listener methods that you want to register.
* @return a collection of {@link EventListener} instances that were registered, can be passed to
* {@link BusGroup#unregister(Collection)} to unregister them later.
* @see BusGroup#register(Lookup, Object)
*/
public Collection<EventListener> register(Object instance) {
return registerListeners(group, instance);
}
private static Collection<EventListener> registerListeners(BusGroup group, Object instance) {
final class DodgyLookup {
private DodgyLookup() {}
private static final Lookup INSTANCE;
static {
try {
var lookupField = Lookup.class.getDeclaredField("IMPL_LOOKUP");
UnsafeHacks.setAccessible(lookupField);
INSTANCE = (Lookup) lookupField.get(null);
} catch (NoSuchFieldException | IllegalAccessException e) {
throw new RuntimeException(e);
}
}
}
if (instance.getClass() == Class.class) {
Class<?> clazz = (Class<?>) instance;
return group.register(DodgyLookup.INSTANCE.in(clazz), clazz);
} else {
return group.register(DodgyLookup.INSTANCE.in(instance.getClass()), instance);
}
}
/**
* The unique name of this BusGroup.
*/
public String name() {
return group.name();
}
/**
* Registers all static methods annotated with {@link SubscribeEvent} in the given class.
*
* @param callerLookup {@code MethodHandles.lookup()} from the class containing listeners
* @param utilityClassWithStaticListeners the class containing the static listeners
* @return A collection of the registered listeners, which can be used to optionally unregister them later
*
* @apiNote This method only registers static listeners.
* <p>If you want to register both instance and static methods, use
* {@link BusGroup#register(MethodHandles.Lookup, Object)} instead.</p>
*/
public Collection<EventListener> register(MethodHandles.Lookup callerLookup, Class<?> utilityClassWithStaticListeners) {
return group.register(callerLookup, utilityClassWithStaticListeners);
}
/**
* Registers all methods annotated with {@link SubscribeEvent} in the given object.
*
* @param callerLookup {@code MethodHandles.lookup()} from the class containing the listeners
* @param listener the object containing the static and/or instance listeners
* @return A collection of the registered listeners, which can be used to optionally unregister them later
*
* @apiNote If you know all the listeners are static methods, use
* {@link BusGroup#register(MethodHandles.Lookup, Class)} instead for better registration performance.
*/
public Collection<EventListener> register(MethodHandles.Lookup callerLookup, Object listener) {
return group.register(callerLookup, listener);
}
/**
* Unregisters the given listeners from this BusGroup.
* @param listeners A collection of listeners to unregister, obtained from
* {@link #register(Class)} or {@link #register(Object)}
* {@link #register(MethodHandles.Lookup, Class)} or {@link #register(MethodHandles.Lookup, Object)}
*/
public void unregister(Collection<EventListener> listeners) {
group.unregister(listeners);
}
}
@@ -5,7 +5,6 @@
package net.minecraftforge.common;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.Logging;
import net.minecraftforge.fml.event.config.ModConfigEvent;
import org.apache.commons.lang3.tuple.Pair;
@@ -16,7 +15,7 @@ import net.minecraftforge.common.ForgeConfigSpec.ConfigValue;
import org.apache.logging.log4j.Logger;
public class ForgeConfig {
private static final Logger LOGGER = LogManager.getLogger();
static final Logger LOGGER = LogManager.getLogger();
public static class Server {
public final BooleanValue removeErroringBlockEntities;
@@ -152,13 +151,11 @@ public class ForgeConfig {
SERVER = specPair.getLeft();
}
@SubscribeEvent
public static void onLoad(final ModConfigEvent.Loading configEvent) {
static void onLoad(final ModConfigEvent.Loading configEvent) {
LOGGER.debug(Logging.FORGEMOD, "Loaded forge config file {}", configEvent.getConfig().getFileName());
}
@SubscribeEvent
public static void onFileChange(final ModConfigEvent.Reloading configEvent) {
static void onFileChange(final ModConfigEvent.Reloading configEvent) {
LOGGER.debug(Logging.FORGEMOD, "Forge config just got changed on the file system!");
}
@@ -127,11 +127,7 @@ import net.minecraft.world.level.biome.MobSpawnSettings;
import net.minecraftforge.common.crafting.conditions.ConditionCodec;
import net.minecraftforge.common.crafting.conditions.ICondition;
import net.minecraftforge.common.crafting.ingredients.IIngredientSerializer;
import net.minecraftforge.common.util.BlockSnapshot;
import net.minecraftforge.common.util.BrainBuilder;
import net.minecraftforge.common.util.Lazy;
import net.minecraftforge.common.util.MavenVersionStringHelper;
import net.minecraftforge.common.util.MutableHashedLinkedMap;
import net.minecraftforge.common.util.*;
import net.minecraftforge.entity.IEntityAdditionalSpawnData;
import net.minecraftforge.event.AnvilUpdateEvent;
import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
@@ -157,11 +153,11 @@ import net.minecraftforge.event.entity.player.AttackEntityEvent;
import net.minecraftforge.event.entity.player.CriticalHitEvent;
import net.minecraftforge.event.entity.player.PlayerEvent;
import net.minecraftforge.event.entity.living.LivingGetProjectileEvent;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.event.level.BlockEvent;
import net.minecraftforge.event.level.NoteBlockEvent;
import net.minecraftforge.event.level.ChunkEvent;
import net.minecraftforge.event.network.CustomPayloadEvent;
import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.fluids.FluidType;
import net.minecraftforge.fml.LogicalSide;
import net.minecraftforge.fml.ModList;
@@ -215,7 +211,7 @@ public final class ForgeHooks {
private ForgeHooks() {}
public static void fireLightingCalculatedEvent(ChunkAccess chunk) {
MinecraftForge.EVENT_BUS.post(new ChunkEvent.LightingCalculated(chunk));
ChunkEvent.LightingCalculated.BUS.post(new ChunkEvent.LightingCalculated(chunk));
}
public static boolean canContinueUsing(@NotNull ItemStack from, @NotNull ItemStack to) {
@@ -233,37 +229,39 @@ public final class ForgeHooks {
}
public static Brain<?> onLivingMakeBrain(LivingEntity entity, Brain<?> originalBrain, Dynamic<?> dynamic) {
if (!LivingMakeBrainEvent.BUS.hasListeners())
return originalBrain;
BrainBuilder<?> brainBuilder = originalBrain.createBuilder();
LivingMakeBrainEvent event = new LivingMakeBrainEvent(entity, brainBuilder);
MinecraftForge.EVENT_BUS.post(event);
LivingMakeBrainEvent.BUS.post(new LivingMakeBrainEvent(entity, brainBuilder));
return brainBuilder.makeBrain(dynamic);
}
public static boolean onLivingAttack(LivingEntity entity, DamageSource src, float amount) {
return entity instanceof Player || !MinecraftForge.EVENT_BUS.post(new LivingAttackEvent(entity, src, amount));
return entity instanceof Player || !LivingAttackEvent.BUS.post(new LivingAttackEvent(entity, src, amount));
}
public static boolean onPlayerAttack(LivingEntity entity, DamageSource src, float amount) {
return !MinecraftForge.EVENT_BUS.post(new LivingAttackEvent(entity, src, amount));
return !LivingAttackEvent.BUS.post(new LivingAttackEvent(entity, src, amount));
}
public static boolean onLivingUseTotem(LivingEntity entity, DamageSource damageSource, ItemStack totem, InteractionHand hand) {
return !MinecraftForge.EVENT_BUS.post(new LivingUseTotemEvent(entity, damageSource, totem, hand));
return !LivingUseTotemEvent.BUS.post(new LivingUseTotemEvent(entity, damageSource, totem, hand));
}
public static float onLivingHurt(LivingEntity entity, DamageSource src, float amount) {
LivingHurtEvent event = new LivingHurtEvent(entity, src, amount);
return (MinecraftForge.EVENT_BUS.post(event) ? 0 : event.getAmount());
return LivingHurtEvent.BUS.post(event) ? 0 : event.getAmount();
}
public static float onLivingDamage(LivingEntity entity, DamageSource src, float amount) {
LivingDamageEvent event = new LivingDamageEvent(entity, src, amount);
return (MinecraftForge.EVENT_BUS.post(event) ? 0 : event.getAmount());
return LivingDamageEvent.BUS.post(event) ? 0 : event.getAmount();
}
public static InteractionResult onInteractEntityAt(Entity entity, Player player, Vec3 vec3d, InteractionHand hand) {
var ret = ForgeEventFactory.onEntityInteractSpecific(player, entity, hand, vec3d);
if (ret.isCanceled())
var ret = new PlayerInteractEvent.EntityInteractSpecific(player, hand, entity, vec3d);
if (PlayerInteractEvent.EntityInteractSpecific.BUS.post(ret))
return ret.getCancellationResult();
return entity.interactAt(player, vec3d, hand);
}
@@ -281,7 +279,7 @@ public final class ForgeHooks {
public static double getEntityVisibilityMultiplier(LivingEntity entity, Entity lookingEntity, double originalMultiplier){
LivingEvent.LivingVisibilityEvent event = new LivingEvent.LivingVisibilityEvent(entity, lookingEntity, originalMultiplier);
MinecraftForge.EVENT_BUS.post(event);
LivingEvent.LivingVisibilityEvent.BUS.post(event);
return Math.max(0,event.getVisibilityModifier());
}
@@ -310,33 +308,33 @@ public final class ForgeHooks {
}
public static void onLivingJump(LivingEntity entity) {
MinecraftForge.EVENT_BUS.post(new LivingJumpEvent(entity));
LivingJumpEvent.BUS.post(new LivingJumpEvent(entity));
}
@SuppressWarnings("resource")
@Nullable
public static ItemEntity onPlayerTossEvent(@NotNull Player player, @NotNull ItemStack item, boolean includeName) {
player.captureDrops(Lists.newArrayList());
player.captureDrops(new ArrayList<>());
ItemEntity ret = player.drop(item, false, includeName);
player.captureDrops(null);
if (ret == null)
return null;
ItemTossEvent event = new ItemTossEvent(ret, player);
if (MinecraftForge.EVENT_BUS.post(event))
var event = new ItemTossEvent(ret, player);
if (ItemTossEvent.BUS.post(event))
return null;
if (!player.level().isClientSide)
player.getCommandSenderWorld().addFreshEntity(event.getEntity());
player.level().addFreshEntity(event.getEntity());
return event.getEntity();
}
@Nullable
public static Component onServerChatSubmittedEvent(ServerPlayer player, Component message) {
var plain = message.getContents() instanceof LiteralContents literalContents ? literalContents.text() : "";
ServerChatEvent event = new ServerChatEvent(player, plain, message);
return MinecraftForge.EVENT_BUS.post(event) ? null : event.getMessage();
var event = new ServerChatEvent(player, plain, message);
return ServerChatEvent.BUS.post(event) ? null : event.getMessage();
}
static final Pattern URL_PATTERN = Pattern.compile(
@@ -439,12 +437,11 @@ public final class ForgeHooks {
level.sendBlockUpdated(pos, state, state, 3);
}
var event = new BlockEvent.BreakEvent(level, pos, state, entityPlayer);
event.setCanceled(preCancelEvent);
MinecraftForge.EVENT_BUS.post(event);
var event = new BlockEvent.BreakEvent(level, pos, state, entityPlayer, preCancelEvent ? Result.DENY : Result.DEFAULT);
var eventIsDenied = BlockEvent.BreakEvent.BUS.fire(event).getResult().isDenied();
// Handle if the event is canceled
if (event.isCanceled()) {
// Handle if the event is cancelled
if (eventIsDenied) {
// Let the client know the block still exists
entityPlayer.connection.send(new ClientboundBlockUpdatePacket(level, pos));
@@ -456,7 +453,7 @@ public final class ForgeHooks {
entityPlayer.connection.send(pkt);
}
}
return event.isCanceled() ? -1 : event.getExpToDrop();
return eventIsDenied ? -1 : event.getExpToDrop();
}
public static InteractionResult onPlaceItemIntoWorld(@NotNull UseOnContext context) {
@@ -494,12 +491,12 @@ public final class ForgeHooks {
if (blockSnapshots.size() > 1)
eventResult = ForgeEventFactory.onMultiBlockPlace(player, blockSnapshots, side);
else if (blockSnapshots.size() == 1)
eventResult = ForgeEventFactory.onBlockPlace(player, blockSnapshots.get(0), side);
eventResult = ForgeEventFactory.onBlockPlace(player, blockSnapshots.getFirst(), side);
if (eventResult) {
ret = InteractionResult.FAIL; // cancel placement
// revert back all captured blocks
for (BlockSnapshot blocksnapshot : Lists.reverse(blockSnapshots)) {
for (BlockSnapshot blocksnapshot : blockSnapshots.reversed()) {
level.restoringBlockSnapshots = true;
blocksnapshot.restore(true, false);
level.restoringBlockSnapshots = false;
@@ -527,7 +524,7 @@ public final class ForgeHooks {
public static boolean onAnvilChange(AnvilMenu container, @NotNull ItemStack left, @NotNull ItemStack right, Container outputSlot, String name, long baseCost, Player player) {
AnvilUpdateEvent e = new AnvilUpdateEvent(left, right, name, baseCost, player);
if (MinecraftForge.EVENT_BUS.post(e)) return false;
if (AnvilUpdateEvent.BUS.post(e)) return false;
if (e.getOutput().isEmpty()) return true;
outputSlot.setItem(0, e.getOutput());
@@ -539,8 +536,8 @@ public final class ForgeHooks {
public static boolean onGrindstoneTake(Container inputSlots, ContainerLevelAccess access, Function<Level, Integer> xpFunction) {
access.execute((l,p) -> {
int xp = xpFunction.apply(l);
GrindstoneEvent.OnTakeItem e = new GrindstoneEvent.OnTakeItem(inputSlots.getItem(0), inputSlots.getItem(1), xp);
if (MinecraftForge.EVENT_BUS.post(e))
var e = new GrindstoneEvent.OnTakeItem(inputSlots.getItem(0), inputSlots.getItem(1), xp);
if (GrindstoneEvent.OnTakeItem.BUS.post(e))
return;
if (l instanceof ServerLevel server)
@@ -578,14 +575,14 @@ public final class ForgeHooks {
}
public static boolean onPlayerAttackTarget(Player player, Entity target) {
if (MinecraftForge.EVENT_BUS.post(new AttackEntityEvent(player, target))) return false;
if (AttackEntityEvent.BUS.post(new AttackEntityEvent(player, target))) return false;
ItemStack stack = player.getMainHandItem();
return stack.isEmpty() || !stack.getItem().onLeftClickEntity(stack, player, target);
}
public static InteractionResult onItemRightClick(Player player, InteractionHand hand) {
var evt = ForgeEventFactory.onRightClickItem(player, hand);
return evt.isCanceled() ? evt.getCancellationResult() : null;
var evt = new PlayerInteractEvent.RightClickItem(player, hand);
return PlayerInteractEvent.RightClickItem.BUS.post(evt) ? evt.getCancellationResult() : null;
}
public static GameType onChangeGameType(Player player, GameType currentGameType, GameType newGameType) {
@@ -593,7 +590,7 @@ public final class ForgeHooks {
return currentGameType;
var evt = new PlayerEvent.PlayerChangeGameModeEvent(player, currentGameType, newGameType);
if (MinecraftForge.EVENT_BUS.post(evt))
if (PlayerEvent.PlayerChangeGameModeEvent.BUS.post(evt))
return currentGameType;
return evt.getNewGameMode();
@@ -654,19 +651,19 @@ public final class ForgeHooks {
}
public static boolean onCropsGrowPre(Level level, BlockPos pos, BlockState state, boolean def) {
var result = MinecraftForge.EVENT_BUS.fire(new BlockEvent.CropGrowEvent.Pre(level,pos,state)).getResult();
var result = BlockEvent.CropGrowEvent.Pre.BUS.fire(new BlockEvent.CropGrowEvent.Pre(level, pos, state)).getResult();
return (result.isAllowed() || (def && result.isDefault()));
}
public static void onCropsGrowPost(Level level, BlockPos pos, BlockState state) {
MinecraftForge.EVENT_BUS.post(new BlockEvent.CropGrowEvent.Post(level, pos, state, level.getBlockState(pos)));
BlockEvent.CropGrowEvent.Post.BUS.post(new BlockEvent.CropGrowEvent.Post(level, pos, state, level.getBlockState(pos)));
}
@Nullable
public static CriticalHitEvent getCriticalHit(Player player, Entity target, boolean vanillaCritical, float damageModifier) {
CriticalHitEvent hitResult = new CriticalHitEvent(player, target, damageModifier, vanillaCritical);
MinecraftForge.EVENT_BUS.post(hitResult);
if (hitResult.getResult() == Event.Result.ALLOW || (vanillaCritical && hitResult.getResult() == Event.Result.DEFAULT))
CriticalHitEvent.BUS.post(hitResult);
if (hitResult.getResult().isAllowed() || (vanillaCritical && hitResult.getResult().isDefault()))
return hitResult;
return null;
}
@@ -675,9 +672,8 @@ public final class ForgeHooks {
* Hook to fire {@link LivingGetProjectileEvent}. Returns the ammo to be used.
*/
public static ItemStack getProjectile(LivingEntity entity, ItemStack projectileWeaponItem, ItemStack projectile) {
LivingGetProjectileEvent event = new LivingGetProjectileEvent(entity, projectileWeaponItem, projectile);
MinecraftForge.EVENT_BUS.post(event);
return event.getProjectileItemStack();
var event = new LivingGetProjectileEvent(entity, projectileWeaponItem, projectile);
return LivingGetProjectileEvent.BUS.fire(event).getProjectileItemStack();
}
/**
@@ -717,8 +713,8 @@ public final class ForgeHooks {
}
public static int onNoteChange(Level level, BlockPos pos, BlockState state, int old, int _new) {
NoteBlockEvent.Change event = new NoteBlockEvent.Change(level, pos, state, old, _new);
if (MinecraftForge.EVENT_BUS.post(event))
var event = new NoteBlockEvent.Change(level, pos, state, old, _new);
if (NoteBlockEvent.Change.BUS.post(event))
return -1;
return event.getVanillaNoteId();
}
@@ -962,14 +958,14 @@ public final class ForgeHooks {
return true;
var mask = player.getItemBySlot(EquipmentSlot.HEAD);
return !mask.isMonsterDisguise(player, monster) || MinecraftForge.EVENT_BUS.post(new MonsterDisguiseEvent(monster, player));
return !mask.isMonsterDisguise(player, monster) || MonsterDisguiseEvent.BUS.post(new MonsterDisguiseEvent(monster, player));
};
}
private static final Lazy<Map<String, StructuresBecomeConfiguredFix.Conversion>> FORGE_CONVERSION_MAP = Lazy.concurrentOf(() -> {
Map<String, StructuresBecomeConfiguredFix.Conversion> map = new HashMap<>();
MinecraftForge.EVENT_BUS.post(new RegisterStructureConversionsEvent(map));
return ImmutableMap.copyOf(map);
RegisterStructureConversionsEvent.BUS.post(new RegisterStructureConversionsEvent(map));
return Map.copyOf(map);
});
// DO NOT CALL from within RegisterStructureConversionsEvent, otherwise you'll get a deadlock
@@ -1032,8 +1028,8 @@ public final class ForgeHooks {
entity.setAirSupply(entity.getAirSupply() - breatheEvent.getConsumeAirAmount());
if (entity.getAirSupply() <= -20) {
var drownEvent = ForgeEventFactory.onLivingDrown(entity, entity.getAirSupply() <= -20, 2.0F, 8);
if (!drownEvent.isCanceled() && drownEvent.isDrowning()) {
var drownEvent = new LivingDrownEvent(entity, entity.getAirSupply() <= -20, 2.0F, 8);
if (!LivingDrownEvent.BUS.post(drownEvent) && drownEvent.isDrowning()) {
entity.setAirSupply(0);
Vec3 vec3 = entity.getDeltaMovement();
@@ -1129,7 +1125,7 @@ public final class ForgeHooks {
// Should we always fire this, even if the channel consumed the packet?
if (!event.getSource().getPacketHandled()) {
MinecraftForge.EVENT_BUS.post(event);
CustomPayloadEvent.BUS.fire(event);
return event.getSource().getPacketHandled();
}
@@ -19,73 +19,83 @@ import net.minecraftforge.event.entity.player.PlayerEvent;
import net.minecraftforge.event.level.ChunkEvent;
import net.minecraftforge.event.network.ConnectionStartEvent;
import net.minecraftforge.event.server.ServerStoppingEvent;
import net.minecraftforge.eventbus.api.EventPriority;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.event.TickEvent.ServerTickEvent;
import net.minecraftforge.eventbus.api.bus.BusGroup;
import net.minecraftforge.eventbus.api.listener.Priority;
import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
import net.minecraftforge.fml.LogicalSide;
import net.minecraftforge.network.filters.NetworkFilters;
import net.minecraftforge.common.util.LogicalSidedProvider;
import net.minecraftforge.server.command.ForgeCommand;
import net.minecraftforge.server.permission.events.PermissionGatherEvent;
import net.minecraftforge.server.command.ConfigCommand;
import org.jetbrains.annotations.ApiStatus;
public class ForgeInternalHandler {
@SubscribeEvent(priority = EventPriority.HIGH)
public void onEntityJoinWorld(EntityJoinLevelEvent event) {
import java.lang.invoke.MethodHandles;
@ApiStatus.Internal
public final class ForgeInternalHandler {
static void register() {
BusGroup.DEFAULT.register(MethodHandles.lookup(), ForgeInternalHandler.class);
}
@SubscribeEvent(priority = Priority.HIGH)
static boolean onEntityJoinWorld(EntityJoinLevelEvent event) {
Entity entity = event.getEntity();
if (entity.getClass().equals(ItemEntity.class)) {
if (entity.getClass() == ItemEntity.class) {
ItemStack stack = ((ItemEntity)entity).getItem();
Item item = stack.getItem();
if (item.hasCustomEntity(stack)) {
Entity newEntity = item.createEntity(event.getLevel(), entity, stack);
if (newEntity != null) {
entity.discard();
event.setCanceled(true);
@SuppressWarnings("resource")
var executor = LogicalSidedProvider.WORKQUEUE.get(event.getLevel().isClientSide ? LogicalSide.CLIENT : LogicalSide.SERVER);
executor.schedule(new TickTask(0, () -> event.getLevel().addFreshEntity(newEntity)));
return true;
}
}
}
return false;
}
@SubscribeEvent
public void onServerTick(ServerTickEvent.Pre event) {
static void onServerTick(ServerTickEvent.Pre event) {
WorldWorkerManager.tick(true);
}
@SubscribeEvent
public void onServerTick(ServerTickEvent.Post event) {
static void onServerTick(ServerTickEvent.Post event) {
WorldWorkerManager.tick(false);
}
// @SubscribeEvent
// public void checkSettings(ClientTickEvent event) {
// static void checkSettings(ClientTickEvent event) {
// if (event.phase == Phase.END)
// CloudRenderer.updateCloudSettings();
// }
@SubscribeEvent
public void onChunkUnload(ChunkEvent.Unload event) {
static void onChunkUnload(ChunkEvent.Unload event) {
if (!event.getLevel().isClientSide())
FarmlandWaterManager.removeTickets(event.getChunk());
}
/*
@SubscribeEvent
public void playerChangeDimension(PlayerEvent.PlayerChangedDimensionEvent event) {
static void playerChangeDimension(PlayerEvent.PlayerChangedDimensionEvent event) {
if (event.getPlayer() instanceof ServerPlayerEntity)
DimensionManager.rebuildPlayerMap(((ServerPlayerEntity)event.getPlayer()).server.getPlayerList(), true);
}
*/
@SubscribeEvent
public void playerLogin(PlayerEvent.PlayerLoggedInEvent event) {
static void playerLogin(PlayerEvent.PlayerLoggedInEvent event) {
UsernameCache.setUsername(event.getEntity().getUUID(), event.getEntity().getGameProfile().getName());
}
@SubscribeEvent
public void onCommandsRegister(RegisterCommandsEvent event) {
static void onCommandsRegister(RegisterCommandsEvent event) {
new ForgeCommand(event.getDispatcher());
ConfigCommand.register(event.getDispatcher());
}
@@ -93,7 +103,7 @@ public class ForgeInternalHandler {
private static LootModifierManager INSTANCE;
@SubscribeEvent
public void onResourceReload(AddReloadListenerEvent event) {
static void onResourceReload(AddReloadListenerEvent event) {
INSTANCE = new LootModifierManager(event.getRegistries());
event.addListener(INSTANCE);
}
@@ -105,30 +115,27 @@ public class ForgeInternalHandler {
}
@SubscribeEvent
public void resourceReloadListeners(AddReloadListenerEvent event) {
static void resourceReloadListeners(AddReloadListenerEvent event) {
event.addListener(CreativeModeTabRegistry.getReloadListener());
}
@SubscribeEvent(priority = EventPriority.HIGHEST)
public void builtinMobSpawnBlocker(EntityJoinLevelEvent event) {
if(event.getEntity() instanceof Mob mob && mob.isSpawnCancelled())
event.setCanceled(true);
@SubscribeEvent(priority = Priority.HIGHEST)
static boolean builtinMobSpawnBlocker(EntityJoinLevelEvent event) {
return event.getEntity() instanceof Mob mob && mob.isSpawnCancelled();
}
@SubscribeEvent
public void onConnectionStart(ConnectionStartEvent event) {
static void onConnectionStart(ConnectionStartEvent event) {
NetworkFilters.injectIfNecessary(event.getConnection());
}
@SubscribeEvent
public void serverStopping(ServerStoppingEvent evt) {
static void serverStopping(ServerStoppingEvent evt) {
WorldWorkerManager.clear();
}
@SubscribeEvent
public void registerPermissionNodes(PermissionGatherEvent.Nodes event) {
static void registerPermissionNodes(PermissionGatherEvent.Nodes event) {
event.addNodes(ForgeMod.USE_SELECTORS_PERMISSION);
}
}
@@ -5,7 +5,7 @@
package net.minecraftforge.common;
import net.minecraft.DetectedVersion;
import net.minecraft.SharedConstants;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.BiomeColors;
import net.minecraft.commands.synchronization.ArgumentTypeInfo;
@@ -61,12 +61,14 @@ import net.minecraftforge.common.world.ForgeBiomeModifiers.RemoveSpawnsBiomeModi
import net.minecraftforge.common.world.NoneBiomeModifier;
import net.minecraftforge.common.world.NoneStructureModifier;
import net.minecraftforge.common.world.StructureModifier;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.event.network.GatherLoginConfigurationTasksEvent;
import net.minecraftforge.event.server.ServerAboutToStartEvent;
import net.minecraftforge.eventbus.api.bus.BusGroup;
import net.minecraftforge.fluids.FluidType;
import net.minecraftforge.fluids.ForgeFlowingFluid;
import net.minecraftforge.fml.*;
import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.event.config.ModConfigEvent;
import net.minecraftforge.fml.event.lifecycle.*;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.*;
@@ -381,33 +383,37 @@ public class ForgeMod {
CrashReportCallables.registerCrashCallable("FML", ForgeVersion::getSpec);
CrashReportCallables.registerCrashCallable("Forge", ()->ForgeVersion.getGroup()+":"+ForgeVersion.getVersion());
final IEventBus modEventBus = context.getModEventBus();
BusGroup modBusGroup = context.getModBusGroup();
// Forge-provided datapack registries
modEventBus.addListener((DataPackRegistryEvent.NewRegistry event) -> {
DataPackRegistryEvent.NewRegistry.getBus(modBusGroup).addListener(event -> {
event.dataPackRegistry(ForgeRegistries.Keys.BIOME_MODIFIERS, BiomeModifier.DIRECT_CODEC);
event.dataPackRegistry(ForgeRegistries.Keys.STRUCTURE_MODIFIERS, StructureModifier.DIRECT_CODEC);
});
modEventBus.addListener(this::preInit);
modEventBus.addListener(this::gatherData);
modEventBus.addListener(this::registerFluids);
modEventBus.addListener(this::registerVanillaDisplayContexts);
modEventBus.addListener(this::onRegisterAttributes);
ForgeDeferredRegistriesSetup.setup(modEventBus);
FMLCommonSetupEvent.getBus(modBusGroup).addListener(ForgeMod::preInit);
GatherDataEvent.getBus(modBusGroup).addListener(ForgeMod::gatherData);
var registerEventBus = RegisterEvent.getBus(modBusGroup);
registerEventBus.addListener(ForgeMod::registerFluids);
registerEventBus.addListener(ForgeMod::registerVanillaDisplayContexts);
EntityAttributeModificationEvent.getBus(modBusGroup).addListener(ForgeMod::onRegisterAttributes);
ForgeDeferredRegistriesSetup.setup(modBusGroup);
for (var reg : registries)
reg.register(modEventBus);
reg.register(modBusGroup);
context.registerConfig(ModConfig.Type.CLIENT, ForgeConfig.clientSpec);
context.registerConfig(ModConfig.Type.SERVER, ForgeConfig.serverSpec);
context.registerConfig(ModConfig.Type.COMMON, ForgeConfig.commonSpec);
modEventBus.register(ForgeConfig.class);
if (ForgeConfig.LOGGER.isDebugEnabled()) {
ModConfigEvent.Loading.getBus(modBusGroup).addListener(ForgeConfig::onLoad);
ModConfigEvent.Reloading.getBus(modBusGroup).addListener(ForgeConfig::onFileChange);
}
// Forge does not display problems when the remote is not matching.
context.registerDisplayTest(IExtensionPoint.DisplayTest.IGNORE_ALL_VERSION);
StartupMessageManager.addModMessage("Forge version "+ForgeVersion.getVersion());
MinecraftForge.EVENT_BUS.addListener(VillagerTradingManager::loadTrades);
MinecraftForge.EVENT_BUS.register(MinecraftForge.INTERNAL_HANDLER);
MinecraftForge.EVENT_BUS.register(new ForgeNetworkConfigurationHandler());
ServerAboutToStartEvent.BUS.addListener(VillagerTradingManager::loadTrades);
ForgeInternalHandler.register();
GatherLoginConfigurationTasksEvent.BUS.addListener(ForgeNetworkConfigurationHandler::gatherInit);
ForgeRegistries.ITEMS.tags().addOptionalTagDefaults(Tags.Items.ENCHANTING_FUELS, Set.of(ForgeRegistries.ITEMS.getDelegateOrThrow(Items.LAPIS_LAZULI)));
@@ -416,21 +422,19 @@ public class ForgeMod {
addAlias(ForgeRegistries.ATTRIBUTES, ResourceLocation.fromNamespaceAndPath("forge", "attack_range"), ResourceLocation.fromNamespaceAndPath("forge", "entity_reach"));
}
public void preInit(FMLCommonSetupEvent evt) {
private static void preInit(FMLCommonSetupEvent evt) {
VersionChecker.startVersionCheck();
//VanillaPacketSplitter.register();
}
@SubscribeEvent
public void onRegisterAttributes(EntityAttributeModificationEvent event) {
private static void onRegisterAttributes(EntityAttributeModificationEvent event) {
for (var type : event.getTypes()) {
event.add(type, ForgeMod.SWIM_SPEED.getHolder().get());
event.add(type, ForgeMod.NAMETAG_DISTANCE.getHolder().get());
}
}
public void gatherData(GatherDataEvent event) {
private static void gatherData(GatherDataEvent event) {
DataGenerator gen = event.getGenerator();
PackOutput packOutput = gen.getPackOutput();
CompletableFuture<HolderLookup.Provider> lookupProvider = event.getLookupProvider();
@@ -439,13 +443,13 @@ public class ForgeMod {
gen.addProvider(true, new PackMetadataGenerator(packOutput)
.add(PackMetadataSection.TYPE, new PackMetadataSection(
Component.translatable("pack.forge.description"),
DetectedVersion.BUILT_IN.getPackVersion(PackType.SERVER_DATA),
SharedConstants.getCurrentVersion().packVersion(PackType.SERVER_DATA),
Optional.empty() //Arrays.stream(PackType.values()).collect(Collectors.toMap(Function.identity(), DetectedVersion.BUILT_IN::getPackVersion))
))
);
ForgeBlockTagsProvider blockTags = new ForgeBlockTagsProvider(packOutput, lookupProvider, existingFileHelper);
gen.addProvider(event.includeServer(), blockTags);
gen.addProvider(event.includeServer(), new ForgeItemTagsProvider(packOutput, lookupProvider, blockTags.contentsGetter(), existingFileHelper));
gen.addProvider(event.includeServer(), new ForgeItemTagsProvider(packOutput, lookupProvider, 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));
@@ -459,7 +463,7 @@ public class ForgeMod {
}
// done in an event instead of deferred to only enable if a mod requests it
public void registerFluids(RegisterEvent event) {
private static void registerFluids(RegisterEvent event) {
if (enableMilkFluid) {
// register milk fill, empty sounds (delegates to water fill, empty sounds)
event.register(ForgeRegistries.Keys.SOUND_EVENTS, helper -> {
@@ -503,7 +507,7 @@ public class ForgeMod {
}
}
public void registerVanillaDisplayContexts(RegisterEvent event) {
private static void registerVanillaDisplayContexts(RegisterEvent event) {
if (event.getRegistryKey().equals(ForgeRegistries.Keys.DISPLAY_CONTEXTS)) {
IForgeRegistryInternal<ItemDisplayContext> forgeRegistry = (IForgeRegistryInternal<ItemDisplayContext>) event.<ItemDisplayContext>getForgeRegistry();
if (forgeRegistry == null)
@@ -10,8 +10,6 @@ import net.minecraft.client.gui.screens.Screen;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.ClientCommandHandler;
import net.minecraftforge.client.ConfigScreenHandler;
import net.minecraftforge.eventbus.api.BusBuilder;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.config.IConfigSpec;
import net.minecraftforge.fml.config.ModConfig;
@@ -34,9 +32,8 @@ public class MinecraftForge {
* Events marked with {@link net.minecraftforge.fml.event.IModBusEvent}
* belong on the ModBus and not this bus
*/
public static final IEventBus EVENT_BUS = BusBuilder.builder().startShutdown().useModLauncher().build();
public static final EventBusMigrationHelper EVENT_BUS = EventBusMigrationHelper.INSTANCE;
static final ForgeInternalHandler INTERNAL_HANDLER = new ForgeInternalHandler();
private static final Logger LOGGER = LogManager.getLogger();
private static final Marker FORGE = MarkerManager.getMarker("FORGE");
@@ -28,7 +28,7 @@ public final class TagConventionMigrationHelper {
private static final ArrayList<TagKey<?>> FOUND_LEGACY_TAGS = new ArrayList<>();
static void init() {
MinecraftForge.EVENT_BUS.addListener(TagConventionMigrationHelper::onServerStarting);
ServerStartingEvent.BUS.addListener(TagConventionMigrationHelper::onServerStarting);
}
public static void onServerStarting(ServerStartingEvent event) {
@@ -46,7 +46,7 @@ public class VillagerTradingManager {
/** Posts the WandererTradesEvent. */
private static void postWandererEvent() {
var event = MinecraftForge.EVENT_BUS.fire(new WandererTradesEvent(WANDERER_TRADES));
var event = WandererTradesEvent.BUS.fire(new WandererTradesEvent(WANDERER_TRADES));
VillagerTrades.WANDERING_TRADER_TRADES.clear();
for (var pool : event.getPools())
VillagerTrades.WANDERING_TRADER_TRADES.add(Pair.of(pool.getEntries().toArray(ItemListing[]::new), pool.getRolls()));
@@ -65,7 +65,7 @@ public class VillagerTradingManager {
for (var entry : trades.int2ObjectEntrySet())
Arrays.stream(entry.getValue()).forEach(mutableTrades.get(entry.getIntKey())::add);
MinecraftForge.EVENT_BUS.post(new VillagerTradesEvent(mutableTrades, prof));
VillagerTradesEvent.BUS.post(new VillagerTradesEvent(mutableTrades, prof));
Int2ObjectMap<ItemListing[]> newTrades = new Int2ObjectOpenHashMap<>();
for (var entry : mutableTrades.int2ObjectEntrySet())
newTrades.put(entry.getIntKey(), entry.getValue().toArray(new ItemListing[0]));
@@ -11,8 +11,13 @@ import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.core.Direction;
import net.minecraft.core.HolderLookup;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.chunk.LevelChunk;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.event.AttachCapabilitiesEvent;
import net.minecraftforge.event.ForgeEventFactory;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -26,22 +31,100 @@ public abstract class CapabilityProvider<B extends ICapabilityProviderImpl<B>> i
@VisibleForTesting
static boolean SUPPORTS_LAZY_CAPABILITIES = true;
private final @NotNull Class<B> baseClass;
private @Nullable CapabilityDispatcher capabilities;
private boolean valid = true;
private boolean isLazy = false;
private final boolean isLazy;
private Supplier<ICapabilityProvider> lazyParentSupplier = null;
private CompoundTag lazyData = null;
private HolderLookup.Provider registryAccess = null;
private boolean initialized = false;
protected CapabilityProvider(Class<B> baseClass) {
this(baseClass, false);
public static class Entities extends CapabilityProvider<Entity> {
protected Entities() {
super(false);
}
protected Entities(boolean isLazy) {
super(isLazy);
}
@Override
protected AttachCapabilitiesEvent<Entity> fireAttachCapabilitiesEvent(Entity provider) {
return AttachCapabilitiesEvent.Entities.BUS.fire(new AttachCapabilitiesEvent.Entities(provider));
}
@Override
protected boolean shouldFireAttachCapabilitiesEvent() {
return AttachCapabilitiesEvent.Entities.BUS.hasListeners();
}
}
protected CapabilityProvider(final Class<B> baseClass, final boolean isLazy) {
this.baseClass = baseClass;
public static class BlockEntities extends CapabilityProvider<BlockEntity> {
protected BlockEntities() {
super(false);
}
protected BlockEntities(boolean isLazy) {
super(isLazy);
}
@Override
protected AttachCapabilitiesEvent<BlockEntity> fireAttachCapabilitiesEvent(BlockEntity provider) {
return AttachCapabilitiesEvent.BlockEntities.BUS.fire(new AttachCapabilitiesEvent.BlockEntities(provider));
}
@Override
protected boolean shouldFireAttachCapabilitiesEvent() {
return AttachCapabilitiesEvent.BlockEntities.BUS.hasListeners();
}
}
public static class ItemStacks extends CapabilityProvider<ItemStack> {
protected ItemStacks() {
super(false);
}
protected ItemStacks(boolean isLazy) {
super(isLazy);
}
@Override
protected AttachCapabilitiesEvent<ItemStack> fireAttachCapabilitiesEvent(ItemStack provider) {
return AttachCapabilitiesEvent.ItemStacks.BUS.fire(new AttachCapabilitiesEvent.ItemStacks(provider));
}
@Override
protected boolean shouldFireAttachCapabilitiesEvent() {
return AttachCapabilitiesEvent.ItemStacks.BUS.hasListeners();
}
}
public static class Levels extends CapabilityProvider<Level> {
protected Levels() {
super(false);
}
protected Levels(boolean isLazy) {
super(isLazy);
}
@Override
protected AttachCapabilitiesEvent<Level> fireAttachCapabilitiesEvent(Level provider) {
return AttachCapabilitiesEvent.Levels.BUS.fire(new AttachCapabilitiesEvent.Levels(provider));
}
@Override
protected boolean shouldFireAttachCapabilitiesEvent() {
return AttachCapabilitiesEvent.Levels.BUS.hasListeners();
}
}
protected CapabilityProvider() {
this.isLazy = false;
}
protected CapabilityProvider(boolean isLazy) {
this.isLazy = SUPPORTS_LAZY_CAPABILITIES && isLazy;
}
@@ -50,10 +133,20 @@ public abstract class CapabilityProvider<B extends ICapabilityProviderImpl<B>> i
}
protected final void gatherCapabilities(@Nullable ICapabilityProvider parent) {
if (!shouldFireAttachCapabilitiesEvent()) {
this.initialized = true;
return;
}
gatherCapabilities(() -> parent);
}
protected final void gatherCapabilities(@Nullable Supplier<ICapabilityProvider> parent) {
if (!shouldFireAttachCapabilitiesEvent()) {
this.initialized = true;
return;
}
if (isLazy && !initialized) {
lazyParentSupplier = parent == null ? () -> null : parent;
return;
@@ -62,8 +155,11 @@ public abstract class CapabilityProvider<B extends ICapabilityProviderImpl<B>> i
doGatherCapabilities(parent == null ? null : parent.get());
}
protected abstract AttachCapabilitiesEvent<?> fireAttachCapabilitiesEvent(B provider);
protected abstract boolean shouldFireAttachCapabilitiesEvent();
private void doGatherCapabilities(@Nullable ICapabilityProvider parent) {
this.capabilities = ForgeEventFactory.gatherCapabilities(baseClass, getProvider(), parent);
this.capabilities = ForgeEventFactory.gatherCapabilities(fireAttachCapabilitiesEvent(getProvider()), parent);
this.initialized = true;
}
@@ -144,16 +240,16 @@ public abstract class CapabilityProvider<B extends ICapabilityProviderImpl<B>> i
* Special implementation for cases which have a superclass and can't extend CapabilityProvider directly.
* See {@link LevelChunk}
*/
public static class AsField<B extends ICapabilityProviderImpl<B>> extends CapabilityProvider<B> {
public static abstract class AsField<B extends ICapabilityProviderImpl<B>> extends CapabilityProvider<B> {
private final B owner;
public AsField(Class<B> baseClass, B owner) {
super(baseClass);
public AsField(B owner) {
super();
this.owner = owner;
}
public AsField(Class<B> baseClass, B owner, boolean isLazy) {
super(baseClass, isLazy);
public AsField(B owner, boolean isLazy) {
super(isLazy);
this.owner = owner;
}
@@ -175,6 +271,26 @@ public abstract class CapabilityProvider<B extends ICapabilityProviderImpl<B>> i
B getProvider() {
return owner;
}
};
public static class LevelChunks extends AsField<LevelChunk> {
public LevelChunks(LevelChunk owner) {
super(owner);
}
public LevelChunks(LevelChunk owner, boolean isLazy) {
super(owner, isLazy);
}
@Override
protected AttachCapabilitiesEvent<LevelChunk> fireAttachCapabilitiesEvent(LevelChunk provider) {
return AttachCapabilitiesEvent.LevelChunks.BUS.fire(new AttachCapabilitiesEvent.LevelChunks(provider));
}
@Override
protected boolean shouldFireAttachCapabilitiesEvent() {
return AttachCapabilitiesEvent.LevelChunks.BUS.hasListeners();
}
}
}
}
@@ -10,8 +10,7 @@ import net.minecraftforge.common.util.LazyOptional;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public interface ICapabilityProvider
{
public interface ICapabilityProvider {
/**
* Retrieves the Optional handler for the capability requested on the specific side.
* The return value <strong>CAN</strong> be the same for multiple faces.
@@ -7,9 +7,10 @@ package net.minecraftforge.common.capabilities;
import java.util.Objects;
import net.minecraftforge.eventbus.api.bus.BusGroup;
import net.minecraftforge.eventbus.api.bus.EventBus;
import org.objectweb.asm.Type;
import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.fml.event.IModBusEvent;
/**
@@ -19,7 +20,11 @@ import net.minecraftforge.fml.event.IModBusEvent;
* @deprecated Use {@link AutoRegisterCapability} annotation on your class.
*/
@Deprecated(forRemoval = true, since = "1.21")
public final class RegisterCapabilitiesEvent extends Event implements IModBusEvent {
public final class RegisterCapabilitiesEvent implements IModBusEvent {
public static EventBus<RegisterCapabilitiesEvent> getBus(BusGroup modBusGroup) {
return IModBusEvent.getBus(modBusGroup, RegisterCapabilitiesEvent.class);
}
/**
* Registers a capability to be consumed by others.
* APIs who define the capability should call this.
@@ -32,4 +37,4 @@ public final class RegisterCapabilitiesEvent extends Event implements IModBusEve
Objects.requireNonNull(type, "Attempted to register a capability with invalid type");
CapabilityManager.get(Type.getInternalName(type), null, true);
}
}
}
@@ -13,11 +13,9 @@ import net.minecraft.data.tags.IntrinsicHolderTagsProvider;
import net.minecraft.world.level.block.Block;
import org.jetbrains.annotations.Nullable;
public abstract class BlockTagsProvider extends IntrinsicHolderTagsProvider<Block>
{
public abstract class BlockTagsProvider extends IntrinsicHolderTagsProvider<Block> {
@SuppressWarnings("deprecation")
public BlockTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, String modId, @Nullable ExistingFileHelper existingFileHelper)
{
public BlockTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, String modId, @Nullable ExistingFileHelper existingFileHelper) {
super(output, Registries.BLOCK, lookupProvider, block -> block.builtInRegistryHolder().key(), modId, existingFileHelper);
}
}
@@ -6,16 +6,15 @@
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> {
/** Use {@link net.minecraft.data.tags.EnchantmentTagsProvider Vanilla's EnchantmentTagsProvider} */
@Deprecated(forRemoval = true, since = "1.21.6")
public abstract class EnchantmentTagsProvider extends net.minecraft.data.tags.EnchantmentTagsProvider {
public EnchantmentTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, String modId, @Nullable ExistingFileHelper existingFileHelper) {
super(output, Registries.ENCHANTMENT, lookupProvider, modId, existingFileHelper);
super(output, lookupProvider, modId, existingFileHelper);
}
}
@@ -62,7 +62,7 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider {
.add(Biomes.BASALT_DELTAS)
.addOptionalTag(forgeTagKey("is_hot/nether"));
tag(IS_HOT_END); // forge:is_hot/end
tag(IS_HOT).addTag(IS_HOT_OVERWORLD).addTag(IS_HOT_NETHER).addOptionalTag(IS_HOT_END.location());
tag(IS_HOT).addTag(IS_HOT_OVERWORLD).addTag(IS_HOT_NETHER).addOptionalTag(IS_HOT_END);
tag(IS_COLD_OVERWORLD)
.add(Biomes.TAIGA)
@@ -94,7 +94,7 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider {
.add(Biomes.END_HIGHLANDS)
.add(Biomes.END_BARRENS)
.addOptionalTag(forgeTagKey("is_cold/end"));
tag(IS_COLD).addTag(IS_COLD_OVERWORLD).addOptionalTag(IS_COLD_NETHER.location()).addTag(IS_COLD_END);
tag(IS_COLD).addTag(IS_COLD_OVERWORLD).addOptionalTag(IS_COLD_NETHER).addTag(IS_COLD_END);
tag(IS_DEAD)
.addOptionalTag(forgeTagKey("is_dead"));
@@ -114,7 +114,7 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider {
//.addOptionalTag(forgeTagKey("is_sparse/overworld")); // can't because forge:is_sparse/overworld contains dripstone caves and eroded badlands, while c:is_sparse_vegetation/overworld does not
tag(IS_SPARSE_NETHER); // forge:is_sparse/nether
tag(IS_SPARSE_END); // forge:is_sparse/end
tag(IS_SPARSE_VEGETATION).addTag(IS_SPARSE_VEGETATION_OVERWORLD).addOptionalTag(IS_SPARSE_NETHER.location()).addOptionalTag(IS_SPARSE_END.location());
tag(IS_SPARSE_VEGETATION).addTag(IS_SPARSE_VEGETATION_OVERWORLD).addOptionalTag(IS_SPARSE_NETHER).addOptionalTag(IS_SPARSE_END);
tag(IS_DENSE_VEGETATION_OVERWORLD)
.add(Biomes.DARK_FOREST)
@@ -126,7 +126,7 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider {
.addOptionalTag(forgeTagKey("is_dense/overworld"));
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_DENSE_VEGETATION).addTag(IS_DENSE_VEGETATION_OVERWORLD).addOptionalTag(IS_DENSE_NETHER).addOptionalTag(IS_DENSE_END);
tag(IS_WET_OVERWORLD)
.add(Biomes.SWAMP)
@@ -140,7 +140,7 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider {
.addOptionalTag(forgeTagKey("is_wet/overworld"));
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_WET).addTag(IS_WET_OVERWORLD).addOptionalTag(IS_WET_NETHER).addOptionalTag(IS_WET_END);
tag(IS_DRY_OVERWORLD)
.add(Biomes.DESERT)
@@ -201,7 +201,14 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider {
tag(IS_SAVANNA).addTag(BiomeTags.IS_SAVANNA);
tag(IS_JUNGLE).addTag(BiomeTags.IS_JUNGLE);
tag(IS_SNOWY)
.add(Biomes.SNOWY_BEACH, Biomes.SNOWY_PLAINS, Biomes.ICE_SPIKES, Biomes.SNOWY_TAIGA, Biomes.GROVE, Biomes.SNOWY_SLOPES, Biomes.JAGGED_PEAKS, Biomes.FROZEN_PEAKS);
.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);
//.addOptionalTag(forgeTagKey("is_snowy")); // can't add forge:is_snowy because it contains frozen ocean and frozen river, while c:is_snowy does not
tag(IS_ICY).add(Biomes.ICE_SPIKES).add(Biomes.FROZEN_PEAKS);
tag(IS_SWAMP).add(Biomes.SWAMP).add(Biomes.MANGROVE_SWAMP);
@@ -288,11 +295,11 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider {
tag(Biomes.MANGROVE_SWAMP, forgeTagKey("is_wet/overworld"), forgeTagKey("is_hot/overworld"), forgeTagKey("is_swamp"));
tag(Biomes.DEEP_DARK, forgeTagKey("is_cave"), forgeTagKey("is_rare"), forgeTagKey("is_spooky"));
tag(forgeTagKey("is_hot")).addTag(forgeTagKey("is_hot/overworld")).addTag(forgeTagKey("is_hot/nether")).addOptionalTag(Tags.Biomes.IS_HOT_END.location());
tag(forgeTagKey("is_cold")).addTag(forgeTagKey("is_cold/overworld")).addOptionalTag(Tags.Biomes.IS_COLD_NETHER.location()).addTag(forgeTagKey("is_cold/end"));
tag(forgeTagKey("is_sparse")).addTag(forgeTagKey("is_sparse/overworld")).addOptionalTag(Tags.Biomes.IS_SPARSE_NETHER.location()).addOptionalTag(Tags.Biomes.IS_SPARSE_END.location());
tag(forgeTagKey("is_dense")).addTag(forgeTagKey("is_dense/overworld")).addOptionalTag(Tags.Biomes.IS_DENSE_NETHER.location()).addOptionalTag(Tags.Biomes.IS_DENSE_END.location());
tag(forgeTagKey("is_wet")).addTag(forgeTagKey("is_wet/overworld")).addOptionalTag(Tags.Biomes.IS_WET_NETHER.location()).addOptionalTag(Tags.Biomes.IS_WET_END.location());
tag(forgeTagKey("is_hot")).addTag(forgeTagKey("is_hot/overworld")).addTag(forgeTagKey("is_hot/nether")).addOptionalTag(Tags.Biomes.IS_HOT_END);
tag(forgeTagKey("is_cold")).addTag(forgeTagKey("is_cold/overworld")).addOptionalTag(Tags.Biomes.IS_COLD_NETHER).addTag(forgeTagKey("is_cold/end"));
tag(forgeTagKey("is_sparse")).addTag(forgeTagKey("is_sparse/overworld")).addOptionalTag(Tags.Biomes.IS_SPARSE_NETHER).addOptionalTag(Tags.Biomes.IS_SPARSE_END);
tag(forgeTagKey("is_dense")).addTag(forgeTagKey("is_dense/overworld")).addOptionalTag(Tags.Biomes.IS_DENSE_NETHER).addOptionalTag(Tags.Biomes.IS_DENSE_END);
tag(forgeTagKey("is_wet")).addTag(forgeTagKey("is_wet/overworld")).addOptionalTag(Tags.Biomes.IS_WET_NETHER).addOptionalTag(Tags.Biomes.IS_WET_END);
tag(forgeTagKey("is_dry")).addTag(forgeTagKey("is_dry/overworld")).addTag(forgeTagKey("is_dry/nether")).addTag(forgeTagKey("is_dry/end"));
tag(forgeTagKey("is_dead"));
@@ -308,14 +315,6 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider {
}
}
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);
}
private static TagKey<Biome> forgeTagKey(String path) {
return BiomeTags.create(ResourceLocation.fromNamespaceAndPath("forge", path));
}
@@ -324,4 +323,5 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider {
public String getName() {
return "Forge Biome Tags";
}
}
@@ -0,0 +1,842 @@
/*
* Copyright (c) Forge Development LLC and contributors
* SPDX-License-Identifier: LGPL-2.1-only
*/
package net.minecraftforge.common.data;
import java.util.Locale;
import java.util.function.Consumer;
import net.minecraft.data.tags.BlockItemTagsProvider;
import net.minecraft.data.tags.TagAppender;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ItemTags;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraftforge.common.Tags;
import net.minecraftforge.registries.ForgeRegistries;
public abstract class ForgeBlockItemTagsProvider extends BlockItemTagsProvider {
@Override
@SuppressWarnings({ "unchecked", "removal" })
protected void run() {
tag(Tags.Blocks.BARRELS, Tags.Items.BARRELS)
.addTag(Tags.Blocks.BARRELS_WOODEN)
.addOptionalTag(Legacy.Blocks.BARRELS);
tag(Tags.Blocks.BARRELS_WOODEN, Tags.Items.BARRELS_WOODEN, Legacy.Blocks.BARRELS_WOODEN, Legacy.Items.BARRELS_WOODEN)
.add(Blocks.BARREL)
.addOptionalTag(Legacy.Blocks.BARRELS_WOODEN);
tag(Tags.Blocks.BOOKSHELVES, Tags.Items.BOOKSHELVES, Legacy.Blocks.BOOKSHELVES, Legacy.Items.BOOKSHELVES)
.add(Blocks.BOOKSHELF)
.addOptionalTag(Legacy.Blocks.BOOKSHELVES);
tag(Tags.Blocks.BUDDING_BLOCKS, Tags.Items.BUDDING_BLOCKS)
.add(Blocks.BUDDING_AMETHYST);
tag(Tags.Blocks.BUDS, Tags.Items.BUDS)
.add(Blocks.SMALL_AMETHYST_BUD)
.add(Blocks.MEDIUM_AMETHYST_BUD)
.add(Blocks.LARGE_AMETHYST_BUD);
tag(Tags.Blocks.CHAINS, Tags.Items.CHAINS)
.add(Blocks.CHAIN);
tag(Tags.Blocks.CHESTS, Tags.Items.CHESTS)
.addTags(
Tags.Blocks.CHESTS_ENDER,
Tags.Blocks.CHESTS_TRAPPED,
Tags.Blocks.CHESTS_WOODEN
)
.addOptionalTag(Legacy.Blocks.CHESTS);
//copy(forgeBlockTagKey("chests/ender"), forgeItemTagKey("chests/ender"));
tag(Tags.Blocks.CHESTS_ENDER, Tags.Items.CHESTS_ENDER)
.add(Blocks.ENDER_CHEST); // forge:chests/ender
//copy(forgeBlockTagKey("chests/trapped"), forgeItemTagKey("chests/trapped")));
tag(Tags.Blocks.CHESTS_TRAPPED, Tags.Items.CHESTS_TRAPPED)
.add(Blocks.TRAPPED_CHEST); // forge:chests/trapped
tag(Tags.Blocks.CHESTS_WOODEN, Tags.Items.CHESTS_WOODEN, Legacy.Blocks.CHESTS_WOODEN, Legacy.Items.CHESTS_WOODEN)
.add(
Blocks.CHEST,
Blocks.TRAPPED_CHEST
)
.addOptionalTag(Legacy.Blocks.CHESTS_WOODEN);
tag(Tags.Blocks.CLUSTERS, Tags.Items.CLUSTERS)
.add(Blocks.AMETHYST_CLUSTER);
tag(Tags.Blocks.COBBLESTONES, Tags.Items.COBBLESTONES, Legacy.Blocks.COBBLESTONE, Legacy.Items.COBBLESTONE)
.addTags(
Tags.Blocks.COBBLESTONE_NORMAL,
Tags.Blocks.COBBLESTONE_INFESTED,
Tags.Blocks.COBBLESTONE_MOSSY,
Tags.Blocks.COBBLESTONE_DEEPSLATE
)
.addOptionalTag(Legacy.Blocks.COBBLESTONE);
//copy(forgeBlockTagKey("cobblestone/normal"), forgeItemTagKey("cobblestone/normal"));
tag(Tags.Blocks.COBBLESTONE_NORMAL, Tags.Items.COBBLESTONE_NORMAL)
.add(Blocks.COBBLESTONE); // forge:cobblestone/normal
//copy(forgeBlockTagKey("cobblestone/infested"), forgeItemTagKey("cobblestone/infested"));
tag(Tags.Blocks.COBBLESTONE_INFESTED, Tags.Items.COBBLESTONE_INFESTED)
.add(Blocks.INFESTED_COBBLESTONE); // forge:cobblestone/infested
//copy(forgeBlockTagKey("cobblestone/mossy"), forgeItemTagKey("cobblestone/mossy"));
tag(Tags.Blocks.COBBLESTONE_MOSSY, Tags.Items.COBBLESTONE_MOSSY)
.add(Blocks.MOSSY_COBBLESTONE); // forge:cobblestone/mossy
//copy(forgeBlockTagKey("cobblestone/deepslate"), forgeItemTagKey("cobblestone/deepslate"));
tag(Tags.Blocks.COBBLESTONE_DEEPSLATE, Tags.Items.COBBLESTONE_DEEPSLATE)
.add(Blocks.COBBLED_DEEPSLATE); // forge:cobblestone/deepslate
tag(Tags.Blocks.CONCRETES, Tags.Items.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
);
//copy(forgeBlockTagKey("end_stones"), forgeItemTagKey("end_stones"));
tag(Tags.Blocks.END_STONES, Tags.Items.END_STONES)
.add(Blocks.END_STONE); // forge:end_stones
//copy(forgeBlockTagKey("fence_gates"), forgeItemTagKey("fence_gates"));
tag(Tags.Blocks.FENCE_GATES, Tags.Items.FENCE_GATES)
.addTags(Tags.Blocks.FENCE_GATES_WOODEN); // forge:fence_gates
//copy(forgeBlockTagKey("fence_gates/wooden"), forgeItemTagKey("fence_gates/wooden"));
tag(Tags.Blocks.FENCE_GATES_WOODEN, Tags.Items.FENCE_GATES_WOODEN)
.add(
Blocks.OAK_FENCE_GATE,
Blocks.SPRUCE_FENCE_GATE,
Blocks.BIRCH_FENCE_GATE,
Blocks.JUNGLE_FENCE_GATE,
Blocks.ACACIA_FENCE_GATE,
Blocks.DARK_OAK_FENCE_GATE,
Blocks.CRIMSON_FENCE_GATE,
Blocks.WARPED_FENCE_GATE,
Blocks.MANGROVE_FENCE_GATE,
Blocks.BAMBOO_FENCE_GATE,
Blocks.CHERRY_FENCE_GATE
);
//copy(forgeBlockTagKey("fences"), forgeItemTagKey("fences"));
tag(Tags.Blocks.FENCES, Tags.Items.FENCES)
.addTags(
Tags.Blocks.FENCES_NETHER_BRICK,
Tags.Blocks.FENCES_WOODEN
); // forge:fences
//copy(forgeBlockTagKey("fences/nether_brick"), forgeItemTagKey("fences/nether_brick"));
tag(Tags.Blocks.FENCES_NETHER_BRICK, Tags.Items.FENCES_NETHER_BRICK)
.add(Blocks.NETHER_BRICK_FENCE); // forge:fences/nether_brick
//copy(forgeBlockTagKey("fences/wooden"), forgeItemTagKey("fences/wooden"));
tag(Tags.Blocks.FENCES_WOODEN, Tags.Items.FENCES_WOODEN)
.addTag(BlockTags.WOODEN_FENCES); // forge:fences/wooden
tag(Tags.Blocks.FLOWERS_SMALL, Tags.Items.FLOWERS_SMALL)
.add(
Blocks.DANDELION,
Blocks.POPPY,
Blocks.BLUE_ORCHID,
Blocks.ALLIUM,
Blocks.AZURE_BLUET,
Blocks.RED_TULIP,
Blocks.ORANGE_TULIP,
Blocks.WHITE_TULIP,
Blocks.PINK_TULIP,
Blocks.OXEYE_DAISY,
Blocks.CORNFLOWER,
Blocks.LILY_OF_THE_VALLEY,
Blocks.WITHER_ROSE,
Blocks.TORCHFLOWER,
Blocks.OPEN_EYEBLOSSOM,
Blocks.CLOSED_EYEBLOSSOM
)
.addOptionalTag(BlockTags.SMALL_FLOWERS);
tag(Tags.Blocks.FLOWERS_TALL, Tags.Items.FLOWERS_TALL)
.add(
Blocks.SUNFLOWER,
Blocks.LILAC,
Blocks.PEONY,
Blocks.ROSE_BUSH,
Blocks.PITCHER_PLANT
)
.addOptionalTag(tagKey("tall_flowers")); //This is old vanilla tag, should it be removed?
tag(Tags.Blocks.FLOWERS, Tags.Items.FLOWERS)
.add(
Blocks.FLOWERING_AZALEA_LEAVES,
Blocks.FLOWERING_AZALEA,
Blocks.MANGROVE_PROPAGULE,
Blocks.PINK_PETALS,
Blocks.CHORUS_FLOWER,
Blocks.SPORE_BLOSSOM
)
.addTags(
Tags.Blocks.FLOWERS_SMALL,
Tags.Blocks.FLOWERS_TALL
)
.addOptionalTag(BlockTags.FLOWERS);
tag(Tags.Blocks.GLASS_BLOCKS, Tags.Items.GLASS_BLOCKS)
.addTags(
Tags.Blocks.GLASS_BLOCKS_COLORLESS,
Tags.Blocks.GLASS_BLOCKS_CHEAP,
Tags.Blocks.GLASS_BLOCKS_TINTED
)
.addOptionalTag(Tags.Blocks.GLASS);
tag(Tags.Blocks.GLASS_BLOCKS_COLORLESS, Tags.Items.GLASS_BLOCKS_COLORLESS)
.add(Blocks.GLASS)
.addOptionalTag(Tags.Blocks.GLASS_COLORLESS);
tag(Tags.Blocks.GLASS_BLOCKS_TINTED, Tags.Items.GLASS_BLOCKS_TINTED)
.add(Blocks.TINTED_GLASS)
.addOptionalTag(Legacy.Blocks.GLASS_TINTED);
tag(Tags.Blocks.GLASS_BLOCKS_CHEAP, Tags.Items.GLASS_BLOCKS_CHEAP, Legacy.Blocks.GLASS_SILICA, Legacy.Items.GLASS_SILICA)
.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
)
.addOptionalTag(Legacy.Blocks.GLASS_SILICA);
tag(Tags.Blocks.GLASS_PANES, Tags.Items.GLASS_PANES)
.addTags(Tags.Blocks.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
)
.addOptionalTag(Legacy.Blocks.GLASS_PANES);
tag(Tags.Blocks.GLASS_PANES_COLORLESS, Tags.Items.GLASS_PANES_COLORLESS)
.add(Blocks.GLASS_PANE)
.addOptionalTag(forgeTagKey("glass_panes/colorless"));
tag(Tags.Blocks.GLAZED_TERRACOTTAS, Tags.Items.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
);
//copy(forgeBlockTagKey("gravel"), forgeItemTagKey("gravel"));
tag(Tags.Blocks.GRAVEL, Tags.Items.GRAVEL)
.add(Blocks.GRAVEL); // forge:gravel
//copy(forgeBlockTagKey("netherrack"), forgeItemTagKey("netherrack"));
tag(Tags.Blocks.NETHERRACK, Tags.Items.NETHERRACK)
.add(Blocks.NETHERRACK); // forge:netherrack
tag(Tags.Blocks.OBSIDIANS, Tags.Items.OBSIDIANS)
.addTags(
Tags.Blocks.OBSIDIANS_NORMAL,
Tags.Blocks.OBSIDIANS_CRYING
)
.addOptionalTag(Legacy.Blocks.OBSIDIAN);
tag(Tags.Blocks.OBSIDIANS_NORMAL, Tags.Items.OBSIDIANS_NORMAL)
.add(Blocks.OBSIDIAN);
tag(Tags.Blocks.OBSIDIANS_CRYING, Tags.Items.OBSIDIANS_CRYING)
.add(Blocks.CRYING_OBSIDIAN);
tag(Tags.Blocks.ORE_BEARING_GROUND_DEEPSLATE, Tags.Items.ORE_BEARING_GROUND_DEEPSLATE)
.add(Blocks.DEEPSLATE); // forge:ore_bearing_ground/deepslate
tag(Tags.Blocks.ORE_BEARING_GROUND_NETHERRACK, Tags.Items.ORE_BEARING_GROUND_NETHERRACK)
.add(Blocks.NETHERRACK); // forge:ore_bearing_ground/netherrack
tag(Tags.Blocks.ORE_BEARING_GROUND_STONE, Tags.Items.ORE_BEARING_GROUND_STONE)
.add(Blocks.STONE); // forge:ore_bearing_ground/stone
tag(Tags.Blocks.ORE_RATES_DENSE, Tags.Items.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(Tags.Blocks.ORE_RATES_SINGULAR, Tags.Items.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(Tags.Blocks.ORE_RATES_SPARSE, Tags.Items.ORE_RATES_SPARSE)
.add(Blocks.NETHER_GOLD_ORE);
tag(Tags.Blocks.ORES, Tags.Items.ORES)
.addTags(
Tags.Blocks.ORES_COAL,
Tags.Blocks.ORES_COPPER,
Tags.Blocks.ORES_DIAMOND,
Tags.Blocks.ORES_EMERALD,
Tags.Blocks.ORES_GOLD,
Tags.Blocks.ORES_IRON,
Tags.Blocks.ORES_LAPIS,
Tags.Blocks.ORES_NETHERITE_SCRAP,
Tags.Blocks.ORES_REDSTONE,
Tags.Blocks.ORES_QUARTZ
)
.addOptionalTag(Legacy.Blocks.ORES);
tag(Tags.Blocks.ORES_COAL, Tags.Items.ORES_COAL)
.addTag(BlockTags.COAL_ORES); // forge:ores/coal
tag(Tags.Blocks.ORES_COPPER, Tags.Items.ORES_COPPER)
.addTag(BlockTags.COPPER_ORES); // forge:ores/copper
tag(Tags.Blocks.ORES_DIAMOND, Tags.Items.ORES_DIAMOND)
.addTag(BlockTags.DIAMOND_ORES); // forge:ores/diamond
tag(Tags.Blocks.ORES_EMERALD, Tags.Items.ORES_EMERALD)
.addTag(BlockTags.EMERALD_ORES); // forge:ores/emerald
tag(Tags.Blocks.ORES_GOLD, Tags.Items.ORES_GOLD)
.addTag(BlockTags.GOLD_ORES); // forge:ores/gold
tag(Tags.Blocks.ORES_IRON, Tags.Items.ORES_IRON)
.addTag(BlockTags.IRON_ORES); // forge:ores/iron
tag(Tags.Blocks.ORES_LAPIS, Tags.Items.ORES_LAPIS)
.addTag(BlockTags.LAPIS_ORES); // forge:ores/lapis
tag(Tags.Blocks.ORES_QUARTZ, Tags.Items.ORES_QUARTZ, Legacy.Blocks.ORES_QUARTZ, Legacy.Items.QUARTZ_ORES)
.add(Blocks.NETHER_QUARTZ_ORE)
.addOptionalTag(Legacy.Blocks.ORES_QUARTZ);
tag(Tags.Blocks.ORES_REDSTONE, Tags.Items.ORES_REDSTONE)
.addTag(BlockTags.REDSTONE_ORES); // forge:ores/redstone
tag(Tags.Blocks.ORES_NETHERITE_SCRAP, Tags.Items.ORES_NETHERITE_SCRAP, Legacy.Blocks.ORES_NETHERITE_SCRAP, Legacy.Items.ORES_NEHTERITE_SCRAP)
.add(Blocks.ANCIENT_DEBRIS)
.addOptionalTag(Legacy.Blocks.ORES_NETHERITE_SCRAP);
tag(Tags.Blocks.ORES_IN_GROUND_DEEPSLATE, Tags.Items.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(Tags.Blocks.ORES_IN_GROUND_NETHERRACK, Tags.Items.ORES_IN_GROUND_NETHERRACK)
.add(
Blocks.NETHER_GOLD_ORE,
Blocks.NETHER_QUARTZ_ORE
);
tag(Tags.Blocks.ORES_IN_GROUND_STONE, Tags.Items.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(Tags.Blocks.PLAYER_WORKSTATIONS_CRAFTING_TABLES, Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES)
.add(Blocks.CRAFTING_TABLE);
tag(Tags.Blocks.PLAYER_WORKSTATIONS_FURNACES, Tags.Items.PLAYER_WORKSTATIONS_FURNACES)
.add(Blocks.FURNACE);
tag(Tags.Blocks.PUMPKINS, Tags.Items.PUMPKINS)
.addTags(
Tags.Blocks.PUMPKINS_NORMAL,
Tags.Blocks.PUMPKINS_CARVED,
Tags.Blocks.PUMPKINS_JACK_O_LANTERNS
);
tag(Tags.Blocks.PUMPKINS_NORMAL, Tags.Items.PUMPKINS_NORMAL)
.add(Blocks.PUMPKIN);
tag(Tags.Blocks.PUMPKINS_CARVED, Tags.Items.PUMPKINS_CARVED)
.add(Blocks.CARVED_PUMPKIN);
tag(Tags.Blocks.PUMPKINS_JACK_O_LANTERNS, Tags.Items.PUMPKINS_JACK_O_LANTERNS)
.add(Blocks.JACK_O_LANTERN);
tag(Tags.Blocks.ROPES, Tags.Items.ROPES);
tag(Tags.Blocks.SAND, Tags.Items.SAND) // forge:sand
.addTags(
Tags.Blocks.SAND_COLORLESS,
Tags.Blocks.SAND_RED
);
tag(Tags.Blocks.SAND_COLORLESS, Tags.Items.SAND_COLORLESS) // forge:sand/colorless
.add(Blocks.SAND);
tag(Tags.Blocks.SAND_RED, Tags.Items.SAND_RED) // forge:sand/red
.add(Blocks.RED_SAND);
tag(Tags.Blocks.SANDSTONE_BLOCKS, Tags.Items.SANDSTONE_BLOCKS)
.addTags(
Tags.Blocks.SANDSTONE_RED_BLOCKS,
Tags.Blocks.SANDSTONE_UNCOLORED_BLOCKS
)
.addOptionalTag(Legacy.Blocks.SANDSTONE);
tag(Tags.Blocks.SANDSTONE_SLABS, Tags.Items.SANDSTONE_SLABS)
.addTags(
Tags.Blocks.SANDSTONE_RED_SLABS,
Tags.Blocks.SANDSTONE_UNCOLORED_SLABS
);
tag(Tags.Blocks.SANDSTONE_STAIRS, Tags.Items.SANDSTONE_STAIRS)
.addTags(
Tags.Blocks.SANDSTONE_RED_STAIRS,
Tags.Blocks.SANDSTONE_UNCOLORED_STAIRS
);
tag(Tags.Blocks.SANDSTONE_RED_BLOCKS, Tags.Items.SANDSTONE_RED_BLOCKS)
.add(
Blocks.RED_SANDSTONE,
Blocks.CUT_RED_SANDSTONE,
Blocks.CHISELED_RED_SANDSTONE,
Blocks.SMOOTH_RED_SANDSTONE
);
tag(Tags.Blocks.SANDSTONE_RED_SLABS, Tags.Items.SANDSTONE_RED_SLABS)
.add(
Blocks.RED_SANDSTONE_SLAB,
Blocks.CUT_RED_SANDSTONE_SLAB,
Blocks.SMOOTH_RED_SANDSTONE_SLAB
);
tag(Tags.Blocks.SANDSTONE_RED_STAIRS, Tags.Items.SANDSTONE_RED_STAIRS)
.add(
Blocks.RED_SANDSTONE_STAIRS,
Blocks.SMOOTH_RED_SANDSTONE_STAIRS
);
tag(Tags.Blocks.SANDSTONE_UNCOLORED_BLOCKS, Tags.Items.SANDSTONE_UNCOLORED_BLOCKS)
.add(
Blocks.SANDSTONE,
Blocks.CUT_SANDSTONE,
Blocks.CHISELED_SANDSTONE,
Blocks.SMOOTH_SANDSTONE
);
tag(Tags.Blocks.SANDSTONE_UNCOLORED_SLABS, Tags.Items.SANDSTONE_UNCOLORED_SLABS)
.add(
Blocks.SANDSTONE_SLAB,
Blocks.CUT_SANDSTONE_SLAB,
Blocks.SMOOTH_SANDSTONE_SLAB
);
tag(Tags.Blocks.SANDSTONE_UNCOLORED_STAIRS, Tags.Items.SANDSTONE_UNCOLORED_STAIRS)
.add(
Blocks.SANDSTONE_STAIRS,
Blocks.SMOOTH_SANDSTONE_STAIRS
);
tag(Tags.Blocks.STONES, Tags.Items.STONES)
.add(
Blocks.ANDESITE,
Blocks.DIORITE,
Blocks.GRANITE,
Blocks.STONE,
Blocks.DEEPSLATE,
Blocks.TUFF
);
//.addOptionalTag(forgeTagKey("stone")); // can't add this because it would include infested/polished variants which aren't contained in Fabric's `c:stones`
tag(Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS)
.addTags(
Tags.Blocks.STORAGE_BLOCKS_BONE_MEAL,
Tags.Blocks.STORAGE_BLOCKS_COAL,
Tags.Blocks.STORAGE_BLOCKS_COPPER,
Tags.Blocks.STORAGE_BLOCKS_DIAMOND,
Tags.Blocks.STORAGE_BLOCKS_DRIED_KELP,
Tags.Blocks.STORAGE_BLOCKS_EMERALD,
Tags.Blocks.STORAGE_BLOCKS_GOLD,
Tags.Blocks.STORAGE_BLOCKS_IRON,
Tags.Blocks.STORAGE_BLOCKS_LAPIS,
Tags.Blocks.STORAGE_BLOCKS_NETHERITE,
Tags.Blocks.STORAGE_BLOCKS_RAW_COPPER,
Tags.Blocks.STORAGE_BLOCKS_RAW_GOLD,
Tags.Blocks.STORAGE_BLOCKS_RAW_IRON,
Tags.Blocks.STORAGE_BLOCKS_REDSTONE,
Tags.Blocks.STORAGE_BLOCKS_SLIME,
Tags.Blocks.STORAGE_BLOCKS_WHEAT
)
//.addOptionalTag(forgeTagKey("storage_blocks")); // can't add this because it would include contents from the non-common forge:storage_blocks/amethyst and forge:storage_blocks/quartz, which are not in the c namespace
.addOptionalTags(
Legacy.Blocks.STORAGE_BLOCKS_COAL,
Legacy.Blocks.STORAGE_BLOCKS_COPPER,
Legacy.Blocks.STORAGE_BLOCKS_DIAMOND,
Legacy.Blocks.STORAGE_BLOCKS_EMERALD,
Legacy.Blocks.STORAGE_BLOCKS_GOLD,
Legacy.Blocks.STORAGE_BLOCKS_IRON,
Legacy.Blocks.STORAGE_BLOCKS_LAPIS,
Legacy.Blocks.STORAGE_BLOCKS_NETHERITE,
Legacy.Blocks.STORAGE_BLOCKS_RAW_COPPER,
Legacy.Blocks.STORAGE_BLOCKS_RAW_GOLD,
Legacy.Blocks.STORAGE_BLOCKS_RAW_IRON,
Legacy.Blocks.STORAGE_BLOCKS_REDSTONE
);
tag(Tags.Blocks.STORAGE_BLOCKS_AMETHYST, Tags.Items.STORAGE_BLOCKS_AMETHYST)
.add(Blocks.AMETHYST_BLOCK);
tag(Tags.Blocks.STORAGE_BLOCKS_BONE_MEAL, Tags.Items.STORAGE_BLOCKS_BONE_MEAL)
.add(Blocks.BONE_BLOCK);
tag(Tags.Blocks.STORAGE_BLOCKS_COAL, Tags.Items.STORAGE_BLOCKS_COAL, Legacy.Blocks.STORAGE_BLOCKS_COAL, Legacy.Items.STORAGE_BLOCKS_COAL)
.add(Blocks.COAL_BLOCK)
.addOptionalTag(Legacy.Blocks.STORAGE_BLOCKS_COAL);
tag(Tags.Blocks.STORAGE_BLOCKS_COPPER, Tags.Items.STORAGE_BLOCKS_COPPER, Legacy.Blocks.STORAGE_BLOCKS_COPPER, Legacy.Items.STORAGE_BLOCKS_COPPER)
.add(Blocks.COPPER_BLOCK)
.addOptionalTag(Legacy.Blocks.STORAGE_BLOCKS_COPPER);
tag(Tags.Blocks.STORAGE_BLOCKS_DIAMOND, Tags.Items.STORAGE_BLOCKS_DIAMOND, Legacy.Blocks.STORAGE_BLOCKS_DIAMOND, Legacy.Items.STORAGE_BLOCKS_DIAMOND)
.add(Blocks.DIAMOND_BLOCK)
.addOptionalTag(Legacy.Blocks.STORAGE_BLOCKS_DIAMOND);
tag(Tags.Blocks.STORAGE_BLOCKS_DRIED_KELP, Tags.Items.STORAGE_BLOCKS_DRIED_KELP)
.add(Blocks.DRIED_KELP_BLOCK);
tag(Tags.Blocks.STORAGE_BLOCKS_EMERALD, Tags.Items.STORAGE_BLOCKS_EMERALD, Legacy.Blocks.STORAGE_BLOCKS_EMERALD, Legacy.Items.STORAGE_BLOCKS_EMERALD)
.add(Blocks.EMERALD_BLOCK)
.addOptionalTag(Legacy.Blocks.STORAGE_BLOCKS_EMERALD);
tag(Tags.Blocks.STORAGE_BLOCKS_GOLD, Tags.Items.STORAGE_BLOCKS_GOLD, Legacy.Blocks.STORAGE_BLOCKS_GOLD, Legacy.Items.STORAGE_BLOCKS_GOLD)
.add(Blocks.GOLD_BLOCK)
.addOptionalTag(Legacy.Blocks.STORAGE_BLOCKS_GOLD);
tag(Tags.Blocks.STORAGE_BLOCKS_IRON, Tags.Items.STORAGE_BLOCKS_IRON, Legacy.Blocks.STORAGE_BLOCKS_IRON, Legacy.Items.STORAGE_BLOCKS_IRON)
.add(Blocks.IRON_BLOCK)
.addOptionalTag(Legacy.Blocks.STORAGE_BLOCKS_IRON);
tag(Tags.Blocks.STORAGE_BLOCKS_LAPIS, Tags.Items.STORAGE_BLOCKS_LAPIS, Legacy.Blocks.STORAGE_BLOCKS_LAPIS, Legacy.Items.STORAGE_BLOCKS_LAPIS)
.add(Blocks.LAPIS_BLOCK)
.addOptionalTag(Legacy.Blocks.STORAGE_BLOCKS_LAPIS);
tag(Tags.Blocks.STORAGE_BLOCKS_NETHERITE, Tags.Items.STORAGE_BLOCKS_NETHERITE, Legacy.Blocks.STORAGE_BLOCKS_NETHERITE, Legacy.Items.STORAGE_BLOCKS_NETHERITE)
.add(Blocks.NETHERITE_BLOCK)
.addOptionalTag(Legacy.Blocks.STORAGE_BLOCKS_NETHERITE);
tag(Tags.Blocks.STORAGE_BLOCKS_QUARTZ, Tags.Items.STORAGE_BLOCKS_QUARTZ)
.add(Blocks.QUARTZ_BLOCK);
tag(Tags.Blocks.STORAGE_BLOCKS_RAW_COPPER, Tags.Items.STORAGE_BLOCKS_RAW_COPPER, Legacy.Blocks.STORAGE_BLOCKS_RAW_COPPER, Legacy.Items.STORAGE_BLOCKS_RAW_COPPER)
.add(Blocks.RAW_COPPER_BLOCK)
.addOptionalTag(Legacy.Blocks.STORAGE_BLOCKS_RAW_COPPER);
tag(Tags.Blocks.STORAGE_BLOCKS_RAW_GOLD, Tags.Items.STORAGE_BLOCKS_RAW_GOLD, Legacy.Blocks.STORAGE_BLOCKS_RAW_GOLD, Legacy.Items.STORAGE_BLOCKS_RAW_GOLD)
.add(Blocks.RAW_GOLD_BLOCK)
.addOptionalTag(Legacy.Blocks.STORAGE_BLOCKS_RAW_GOLD);
tag(Tags.Blocks.STORAGE_BLOCKS_RAW_IRON, Tags.Items.STORAGE_BLOCKS_RAW_IRON, Legacy.Blocks.STORAGE_BLOCKS_RAW_IRON, Legacy.Items.STORAGE_BLOCKS_RAW_IRON)
.add(Blocks.RAW_IRON_BLOCK)
.addOptionalTag(Legacy.Blocks.STORAGE_BLOCKS_RAW_IRON);
tag(Tags.Blocks.STORAGE_BLOCKS_REDSTONE, Tags.Items.STORAGE_BLOCKS_REDSTONE, Legacy.Blocks.STORAGE_BLOCKS_REDSTONE, Legacy.Items.STORAGE_BLOCKS_REDSTONE)
.add(Blocks.REDSTONE_BLOCK)
.addOptionalTag(Legacy.Blocks.STORAGE_BLOCKS_REDSTONE);
tag(Tags.Blocks.STORAGE_BLOCKS_SLIME, Tags.Items.STORAGE_BLOCKS_SLIME)
.add(Blocks.SLIME_BLOCK);
tag(Tags.Blocks.STORAGE_BLOCKS_WHEAT, Tags.Items.STORAGE_BLOCKS_WHEAT)
.add(Blocks.HAY_BLOCK);
tag(Tags.Blocks.STRIPPED_LOGS, Tags.Items.STRIPPED_LOGS)
.add(
Blocks.STRIPPED_ACACIA_LOG,
Blocks.STRIPPED_BAMBOO_BLOCK,
Blocks.STRIPPED_BIRCH_LOG,
Blocks.STRIPPED_CHERRY_LOG,
Blocks.STRIPPED_DARK_OAK_LOG,
Blocks.STRIPPED_JUNGLE_LOG,
Blocks.STRIPPED_MANGROVE_LOG,
Blocks.STRIPPED_OAK_LOG,
Blocks.STRIPPED_SPRUCE_LOG
);
tag(Tags.Blocks.STRIPPED_WOODS, Tags.Items.STRIPPED_WOODS)
.add(
Blocks.STRIPPED_ACACIA_WOOD,
Blocks.STRIPPED_BIRCH_WOOD,
Blocks.STRIPPED_CHERRY_WOOD,
Blocks.STRIPPED_DARK_OAK_WOOD,
Blocks.STRIPPED_JUNGLE_WOOD,
Blocks.STRIPPED_MANGROVE_WOOD,
Blocks.STRIPPED_OAK_WOOD,
Blocks.STRIPPED_SPRUCE_WOOD
);
// Backwards compat definitions for pre-1.21 legacy `forge:` tags.
// TODO: [Forge][Tags][Old] Remove backwards compat tag entries in 1.22
tag(Legacy.Blocks.BARRELS, Legacy.Items.BARRELS)
.addTag(Legacy.Blocks.BARRELS_WOODEN);
tag(Legacy.Blocks.CHESTS, Legacy.Items.CHESTS)
.addTags(
Tags.Blocks.CHESTS_ENDER,
Tags.Blocks.CHESTS_TRAPPED,
Legacy.Blocks.CHESTS_WOODEN
);
//copy(forgeBlockTagKey("glass/tinted"), forgeItemTagKey("glass/tinted"));
addColored(tag(Tags.Blocks.STAINED_GLASS, Tags.Items.STAINED_GLASS)::add, Tags.Blocks.GLASS, "{color}_stained_glass");
addColored(tag(Tags.Blocks.STAINED_GLASS_PANES, Tags.Items.STAINED_GLASS_PANES)::add, Tags.Blocks.GLASS_PANES, "{color}_stained_glass_pane");
// tag(Tags.Blocks.GLASS, Tags.Items.GLASS, forgeBlockTagKey("glass"), forgeItemTagKey("glass")) // these are the same thing
tag(Tags.Blocks.GLASS, Tags.Items.GLASS)
.addTags(
Tags.Blocks.GLASS_COLORLESS,
Tags.Blocks.STAINED_GLASS,
Legacy.Blocks.GLASS_TINTED
);
tag(Tags.Blocks.GLASS_COLORLESS, Tags.Items.GLASS_COLORLESS)
.add(Blocks.GLASS);
tag(Legacy.Blocks.GLASS_PANES, Legacy.Items.GLASS_PANES)
.addTags(
Legacy.Blocks.GLASS_PANES_COLORLESS,
Tags.Blocks.STAINED_GLASS_PANES
);
tag(Legacy.Blocks.GLASS_PANES_COLORLESS, Legacy.Items.GLASS_PANES_COLORLESS)
.add(Blocks.GLASS_PANE);
tag(Legacy.Blocks.GLASS_TINTED, Legacy.Items.GLASS_TINTED)
.add(Blocks.TINTED_GLASS);
tag(Legacy.Blocks.OBSIDIAN, Legacy.Items.OBSIDIAN)
.add(Blocks.OBSIDIAN);
tag(Legacy.Blocks.ORES, Legacy.Items.ORES)
.addTags(
Tags.Blocks.ORES_COAL,
Tags.Blocks.ORES_COPPER,
Tags.Blocks.ORES_DIAMOND,
Tags.Blocks.ORES_EMERALD,
Tags.Blocks.ORES_GOLD,
Tags.Blocks.ORES_IRON,
Tags.Blocks.ORES_LAPIS,
Tags.Blocks.ORES_REDSTONE,
Legacy.Blocks.ORES_QUARTZ,
Legacy.Blocks.ORES_NETHERITE_SCRAP
);
tag(Legacy.Blocks.SANDSTONE, Legacy.Items.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(Legacy.Blocks.STONE, Legacy.Items.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(Legacy.Blocks.STORAGE_BLOCKS, Legacy.Items.STORAGE_BLOCKS)
.addTags(
Tags.Blocks.STORAGE_BLOCKS_AMETHYST,
Legacy.Blocks.STORAGE_BLOCKS_COAL,
Legacy.Blocks.STORAGE_BLOCKS_COPPER,
Legacy.Blocks.STORAGE_BLOCKS_DIAMOND,
Legacy.Blocks.STORAGE_BLOCKS_EMERALD,
Legacy.Blocks.STORAGE_BLOCKS_GOLD,
Legacy.Blocks.STORAGE_BLOCKS_IRON,
Legacy.Blocks.STORAGE_BLOCKS_LAPIS,
Tags.Blocks.STORAGE_BLOCKS_QUARTZ,
Legacy.Blocks.STORAGE_BLOCKS_RAW_COPPER,
Legacy.Blocks.STORAGE_BLOCKS_RAW_GOLD,
Legacy.Blocks.STORAGE_BLOCKS_RAW_IRON,
Legacy.Blocks.STORAGE_BLOCKS_REDSTONE,
Legacy.Blocks.STORAGE_BLOCKS_NETHERITE
);
}
private static TagKey<Block> forgeTagKey(String path) {
return BlockTags.create(ResourceLocation.fromNamespaceAndPath("forge", path));
}
private static TagKey<Block> tagKey(String name) {
return BlockTags.create(ResourceLocation.withDefaultNamespace(name));
}
private void addColored(Consumer<Block> consumer, 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()));
TagKey<Block> blockTag = getForgeTag(Tags.Blocks.class, prefix + color.getName());
TagKey<Item> itemTag = getForgeTag(Tags.Items.class, prefix + color.getName());
Block block = ForgeRegistries.BLOCKS.getValue(key);
if (block == null || block == Blocks.AIR)
throw new IllegalStateException("Unknown vanilla block: " + key.toString());
tag(blockTag, itemTag).add(block);
consumer.accept(block);
}
}
@SuppressWarnings("unchecked")
private static <T> TagKey<T> getForgeTag(Class<?> cls, String name) {
try {
name = name.toUpperCase(Locale.ENGLISH);
return (TagKey<T>)cls.getDeclaredField(name).get(null);
} catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) {
throw new IllegalStateException(cls.getName() + " is missing tag name: " + name);
}
}
private static ResourceLocation forgeRl(String path) {
return ResourceLocation.fromNamespaceAndPath("forge", path);
}
private TagAppender<Block, Block> tag(TagKey<Block> block, TagKey<Item> item, TagKey<Block> oldBlock, TagKey<Item> oldItem) {
var tag = tag(block, item);
var old = tag(oldBlock, oldItem);
return wrap(tag, old, oldBlock);
}
private static TagAppender<Block, Block> wrap(TagAppender<Block, Block> tag, TagAppender<Block, Block> old, TagKey<Block> oldBlock) {
return new TagAppender<Block, Block>() {
@Override
public TagAppender<Block, Block> add(Block value) {
tag.add(value);
old.add(value);
return this;
}
@Override
public TagAppender<Block, Block> addOptional(Block value) {
tag.addOptional(value);
old.addOptional(value);
return this;
}
@Override
public TagAppender<Block, Block> addTag(TagKey<Block> value) {
tag.addTag(value);
old.addTag(value);
return this;
}
@Override
public TagAppender<Block, Block> addOptionalTag(TagKey<Block> value) {
tag.addOptionalTag(value);
if (value != oldBlock)
old.addOptionalTag(value);
return this;
}
@Override
public TagAppender<Block, Block> replace(boolean value) {
tag.replace(value);
old.replace(value);
return this;
}
@Override
public TagAppender<Block, Block> remove(ResourceLocation value) {
tag.remove(value);
old.remove(value);
return this;
}
@Override
public TagAppender<Block, Block> remove(TagKey<Block> value) {
tag.remove(value);
old.remove(value);
return this;
}
@Override
public TagAppender<Block, Block> remove(Block value) {
tag.remove(value);
old.remove(value);
return this;
}
@Override
public String getSourceName() {
return tag.getSourceName();
}
};
}
private static class Legacy {
@Deprecated
private static class Blocks {
private static TagKey<Block> tag(String path) {
return BlockTags.create(forgeRl(path));
}
public static final TagKey<Block> BARRELS = tag("barrels");
public static final TagKey<Block> BARRELS_WOODEN = tag("barrels/wooden");
public static final TagKey<Block> BOOKSHELVES = tag("bookshelves");
public static final TagKey<Block> CHESTS = tag("chests");
public static final TagKey<Block> CHESTS_WOODEN = tag("chests/wooden");
public static final TagKey<Block> COBBLESTONE = tag("cobblestone");
public static final TagKey<Block> GLASS_PANES = tag("glass_panes");
public static final TagKey<Block> GLASS_PANES_COLORLESS = tag("glass_panes/colorless");
public static final TagKey<Block> GLASS_SILICA = tag("glass/silica");
public static final TagKey<Block> GLASS_TINTED = tag("glass/tinted");
public static final TagKey<Block> OBSIDIAN = tag("obsidian");
public static final TagKey<Block> ORES = tag("ores");
public static final TagKey<Block> ORES_QUARTZ = tag("ores/quartz");
public static final TagKey<Block> ORES_NETHERITE_SCRAP = tag("ores/netherite_scrap");
public static final TagKey<Block> SANDSTONE = tag("sandstone");
public static final TagKey<Block> STONE = tag("stone");
public static final TagKey<Block> STORAGE_BLOCKS = tag("storage_blocks");
public static final TagKey<Block> STORAGE_BLOCKS_COAL = tag("storage_blocks/coal");
public static final TagKey<Block> STORAGE_BLOCKS_COPPER = tag("storage_blocks/copper");
public static final TagKey<Block> STORAGE_BLOCKS_DIAMOND = tag("storage_blocks/diamond");
public static final TagKey<Block> STORAGE_BLOCKS_EMERALD = tag("storage_blocks/emerald");
public static final TagKey<Block> STORAGE_BLOCKS_GOLD = tag("storage_blocks/gold");
public static final TagKey<Block> STORAGE_BLOCKS_IRON = tag("storage_blocks/iron");
public static final TagKey<Block> STORAGE_BLOCKS_LAPIS = tag("storage_blocks/lapis");
public static final TagKey<Block> STORAGE_BLOCKS_NETHERITE = tag("storage_blocks/netherite");
public static final TagKey<Block> STORAGE_BLOCKS_RAW_COPPER = tag("storage_blocks/raw_copper");
public static final TagKey<Block> STORAGE_BLOCKS_RAW_GOLD = tag("storage_blocks/raw_gold");
public static final TagKey<Block> STORAGE_BLOCKS_RAW_IRON = tag("storage_blocks/raw_iron");
public static final TagKey<Block> STORAGE_BLOCKS_REDSTONE = tag("storage_blocks/redstone");
}
@Deprecated
private static class Items {
private static TagKey<Item> tag(String path) {
return ItemTags.create(forgeRl(path));
}
public static final TagKey<Item> BARRELS = tag("barrels");
public static final TagKey<Item> BARRELS_WOODEN = tag("barrels/wooden");
public static final TagKey<Item> BOOKSHELVES = tag("bookshelves");
public static final TagKey<Item> CHESTS = tag("chests");
public static final TagKey<Item> CHESTS_WOODEN = tag("chests/wooden");
public static final TagKey<Item> COBBLESTONE = tag("cobblestone");
public static final TagKey<Item> GLASS_PANES = tag("glass_panes");
public static final TagKey<Item> GLASS_PANES_COLORLESS = tag("glass_panes/colorless");
public static final TagKey<Item> GLASS_SILICA = tag("glass/silica");
public static final TagKey<Item> GLASS_TINTED = tag("glass/tinted");
public static final TagKey<Item> OBSIDIAN = tag("obsidian");
public static final TagKey<Item> ORES = tag("ores");
public static final TagKey<Item> QUARTZ_ORES = tag("ores/quartz");
public static final TagKey<Item> ORES_NEHTERITE_SCRAP = tag("ores/netherite_scrap");
public static final TagKey<Item> SANDSTONE = tag("sandstone");
public static final TagKey<Item> STONE = tag("stone");
public static final TagKey<Item> STORAGE_BLOCKS = tag("storage_blocks");
public static final TagKey<Item> STORAGE_BLOCKS_COAL = tag("storage_blocks/coal");
public static final TagKey<Item> STORAGE_BLOCKS_COPPER = tag("storage_blocks/copper");
public static final TagKey<Item> STORAGE_BLOCKS_DIAMOND = tag("storage_blocks/diamond");
public static final TagKey<Item> STORAGE_BLOCKS_EMERALD = tag("storage_blocks/emerald");
public static final TagKey<Item> STORAGE_BLOCKS_GOLD = tag("storage_blocks/gold");
public static final TagKey<Item> STORAGE_BLOCKS_IRON = tag("storage_blocks/iron");
public static final TagKey<Item> STORAGE_BLOCKS_LAPIS = tag("storage_blocks/lapis");
public static final TagKey<Item> STORAGE_BLOCKS_NETHERITE = tag("storage_blocks/netherite");
public static final TagKey<Item> STORAGE_BLOCKS_RAW_COPPER = tag("storage_blocks/raw_copper");
public static final TagKey<Item> STORAGE_BLOCKS_RAW_GOLD = tag("storage_blocks/raw_gold");
public static final TagKey<Item> STORAGE_BLOCKS_RAW_IRON = tag("storage_blocks/raw_iron");
public static final TagKey<Item> STORAGE_BLOCKS_REDSTONE = tag("storage_blocks/redstone");
}
}
}
@@ -7,11 +7,13 @@ package net.minecraftforge.common.data;
import net.minecraft.core.HolderLookup;
import net.minecraft.data.PackOutput;
import net.minecraft.data.tags.IntrinsicHolderTagsProvider;
import net.minecraft.data.tags.TagAppender;
import net.minecraft.data.tags.VanillaBlockTagsProvider;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraftforge.common.Tags;
@@ -27,45 +29,21 @@ import java.util.function.Consumer;
import static net.minecraftforge.common.Tags.Blocks.*;
@ApiStatus.Internal
public final class ForgeBlockTagsProvider extends BlockTagsProvider {
public final class ForgeBlockTagsProvider extends VanillaBlockTagsProvider {
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_) {
tag(BARRELS)
.addTag(BARRELS_WOODEN)
.addOptionalTag(forgeTagKey("barrels"));
tag(BARRELS_WOODEN)
.add(Blocks.BARREL)
.addOptionalTag(forgeTagKey("barrels/wooden"));
tag(BOOKSHELVES)
.add(Blocks.BOOKSHELF)
.addOptionalTag(forgeTagKey("bookshelves"));
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)
.addOptionalTag(forgeTagKey("chests"));
tag(CHESTS_ENDER).add(Blocks.ENDER_CHEST); // forge:chests/ender
tag(CHESTS_TRAPPED).add(Blocks.TRAPPED_CHEST); // forge:chests/trapped
tag(CHESTS_WOODEN)
.add(Blocks.CHEST, Blocks.TRAPPED_CHEST)
.addOptionalTag(forgeTagKey("chests/wooden"));
(new ForgeBlockItemTagsProvider() {
@Override
protected TagAppender<Block, Block> tag(TagKey<Block> p_406922_, TagKey<Item> p_408417_) {
return ForgeBlockTagsProvider.this.tag(p_406922_);
}
}).run();
tag(CHORUS_ADDITIONALLY_GROWS_ON)
.addTag(END_STONES);
tag(CLUSTERS).add(Blocks.AMETHYST_CLUSTER);
tag(COBBLESTONES)
.addTags(COBBLESTONE_NORMAL, COBBLESTONE_INFESTED, COBBLESTONE_MOSSY, COBBLESTONE_DEEPSLATE)
.addOptionalTag(forgeTagKey("cobblestone"));
tag(COBBLESTONE_NORMAL).add(Blocks.COBBLESTONE); // forge:cobblestone/normal
tag(COBBLESTONE_INFESTED).add(Blocks.INFESTED_COBBLESTONE); // forge:cobblestone/infested
tag(COBBLESTONE_MOSSY).add(Blocks.MOSSY_COBBLESTONE); // forge:cobblestone/mossy
tag(COBBLESTONE_DEEPSLATE).add(Blocks.COBBLED_DEEPSLATE); // forge:cobblestone/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);
.addTag(END_STONES);
addColored(DYED, "{color}_banner");
addColored(DYED, "{color}_bed");
addColored(DYED, "{color}_candle");
@@ -80,210 +58,15 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider {
addColored(DYED, "{color}_wall_banner");
addColored(DYED, "{color}_wool");
addColoredTags(tag(DYED)::addTag, DYED);
tag(END_STONES).add(Blocks.END_STONE); // forge:end_stones
tag(ENDERMAN_PLACE_ON_BLACKLIST); // forge:enderman_place_on_blacklist
tag(FENCE_GATES).addTags(FENCE_GATES_WOODEN); // forge:fence_gates
tag(FENCE_GATES_WOODEN).add(Blocks.OAK_FENCE_GATE, Blocks.SPRUCE_FENCE_GATE, Blocks.BIRCH_FENCE_GATE, Blocks.JUNGLE_FENCE_GATE, Blocks.ACACIA_FENCE_GATE, Blocks.DARK_OAK_FENCE_GATE, Blocks.CRIMSON_FENCE_GATE, Blocks.WARPED_FENCE_GATE, Blocks.MANGROVE_FENCE_GATE, Blocks.BAMBOO_FENCE_GATE, Blocks.CHERRY_FENCE_GATE);
tag(FENCES).addTags(FENCES_NETHER_BRICK, FENCES_WOODEN); // forge:fences
tag(FENCES_NETHER_BRICK).add(Blocks.NETHER_BRICK_FENCE); // forge:fences/nether_brick
tag(FENCES_WOODEN).addTag(BlockTags.WOODEN_FENCES); // forge:fences/wooden
tag(Tags.Blocks.FLOWERS_SMALL)
.add(Blocks.DANDELION, Blocks.POPPY, Blocks.BLUE_ORCHID, Blocks.ALLIUM, Blocks.AZURE_BLUET, Blocks.RED_TULIP, Blocks.ORANGE_TULIP, Blocks.WHITE_TULIP, Blocks.PINK_TULIP, Blocks.OXEYE_DAISY, Blocks.CORNFLOWER, Blocks.LILY_OF_THE_VALLEY, Blocks.WITHER_ROSE, Blocks.TORCHFLOWER, Blocks.OPEN_EYEBLOSSOM, Blocks.CLOSED_EYEBLOSSOM)
.addOptionalTag(BlockTags.SMALL_FLOWERS);
tag(Tags.Blocks.FLOWERS_TALL)
.add(Blocks.SUNFLOWER, Blocks.LILAC, Blocks.PEONY, Blocks.ROSE_BUSH, Blocks.PITCHER_PLANT)
.addOptional(ResourceLocation.withDefaultNamespace("tall_flowers"));
tag(Tags.Blocks.FLOWERS)
.add(Blocks.FLOWERING_AZALEA_LEAVES, Blocks.FLOWERING_AZALEA, Blocks.MANGROVE_PROPAGULE, Blocks.PINK_PETALS, Blocks.CHORUS_FLOWER, Blocks.SPORE_BLOSSOM)
.addTags(Tags.Blocks.FLOWERS_SMALL, Tags.Blocks.FLOWERS_TALL)
.addOptionalTag(BlockTags.FLOWERS);
tag(GLASS_BLOCKS)
.addTags(GLASS_BLOCKS_COLORLESS, GLASS_BLOCKS_CHEAP, GLASS_BLOCKS_TINTED)
.addOptionalTag(forgeTagKey("glass"));
tag(GLASS_BLOCKS_COLORLESS)
.add(Blocks.GLASS)
.addOptionalTag(forgeTagKey("glass/colorless"));
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)
.addOptionalTag(forgeTagKey("glass/silica"));
tag(GLASS_BLOCKS_TINTED)
.add(Blocks.TINTED_GLASS)
.addOptionalTag(forgeTagKey("glass/tinted"));
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)
.addOptionalTag(forgeTagKey("glass_panes"));
tag(GLASS_PANES_COLORLESS)
.add(Blocks.GLASS_PANE)
.addOptionalTag(forgeTagKey("glass_panes/colorless"));
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); // forge: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); // forge:netherrack
tag(OBSIDIANS_NORMAL).add(Blocks.OBSIDIAN);
tag(OBSIDIANS_CRYING).add(Blocks.CRYING_OBSIDIAN);
tag(OBSIDIANS)
.addTags(OBSIDIANS_NORMAL, OBSIDIANS_CRYING)
.addOptionalTag(forgeTagKey("obsidian"));
tag(ORE_BEARING_GROUND_DEEPSLATE).add(Blocks.DEEPSLATE); // forge:ore_bearing_ground/deepslate
tag(ORE_BEARING_GROUND_NETHERRACK).add(Blocks.NETHERRACK); // forge:ore_bearing_ground/netherrack
tag(ORE_BEARING_GROUND_STONE).add(Blocks.STONE); // forge:ore_bearing_ground/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_NETHERITE_SCRAP, ORES_REDSTONE, ORES_QUARTZ)
.addOptionalTag(forgeTagKey("ores"));
tag(ORES_COAL).addTag(BlockTags.COAL_ORES); // forge:ores/coal
tag(ORES_COPPER).addTag(BlockTags.COPPER_ORES); // forge:ores/copper
tag(ORES_DIAMOND).addTag(BlockTags.DIAMOND_ORES); // forge:ores/diamond
tag(ORES_EMERALD).addTag(BlockTags.EMERALD_ORES); // forge:ores/emerald
tag(ORES_GOLD).addTag(BlockTags.GOLD_ORES); // forge:ores/gold
tag(ORES_IRON).addTag(BlockTags.IRON_ORES); // forge:ores/iron
tag(ORES_LAPIS).addTag(BlockTags.LAPIS_ORES); // forge:ores/lapis
tag(ORES_QUARTZ)
.add(Blocks.NETHER_QUARTZ_ORE)
.addOptionalTag(forgeTagKey("ores/quartz"));
tag(ORES_REDSTONE).addTag(BlockTags.REDSTONE_ORES); // forge:ores/redstone
tag(ORES_NETHERITE_SCRAP)
.add(Blocks.ANCIENT_DEBRIS)
.addOptionalTag(forgeTagKey("ores/netherite_scrap"));
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(PUMPKINS).addTags(PUMPKINS_NORMAL, PUMPKINS_CARVED, PUMPKINS_JACK_O_LANTERNS);
tag(PUMPKINS_NORMAL).add(Blocks.PUMPKIN);
tag(PUMPKINS_CARVED).add(Blocks.CARVED_PUMPKIN);
tag(PUMPKINS_JACK_O_LANTERNS).add(Blocks.JACK_O_LANTERN);
tag(SAND).addTags(SAND_COLORLESS, SAND_RED); // forge:sand
tag(RELOCATION_NOT_SUPPORTED);
tag(ROPES);
tag(SAND_COLORLESS).add(Blocks.SAND); // forge:sand/colorless
tag(SAND_RED).add(Blocks.RED_SAND); // forge:sand/red
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)
.addOptionalTag(forgeTagKey("sandstone"));
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);
//.addOptionalTag(forgeTagKey("stone")); // can't add this because it would include infested/polished variants which aren't contained in Fabric's `c:stones`
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)
//.addOptionalTag(forgeTagKey("storage_blocks")); // can't add this because it would include contents from the non-common forge:storage_blocks/amethyst and forge:storage_blocks/quartz, which are not in the c namespace
.addOptionalTags(forgeTagKey("storage_blocks/coal"), forgeTagKey("storage_blocks/copper"),
forgeTagKey("storage_blocks/diamond"), forgeTagKey("storage_blocks/emerald"),
forgeTagKey("storage_blocks/gold"), forgeTagKey("storage_blocks/iron"),
forgeTagKey("storage_blocks/lapis"), forgeTagKey("storage_blocks/netherite"),
forgeTagKey("storage_blocks/raw_copper"), forgeTagKey("storage_blocks/raw_gold"),
forgeTagKey("storage_blocks/raw_iron"), forgeTagKey("storage_blocks/redstone"));
tag(STORAGE_BLOCKS_BONE_MEAL).add(Blocks.BONE_BLOCK);
tag(STORAGE_BLOCKS_COAL)
.add(Blocks.COAL_BLOCK)
.addOptionalTag(forgeTagKey("storage_blocks/coal"));
tag(STORAGE_BLOCKS_COPPER)
.add(Blocks.COPPER_BLOCK)
.addOptionalTag(forgeTagKey("storage_blocks/copper"));
tag(STORAGE_BLOCKS_DIAMOND)
.add(Blocks.DIAMOND_BLOCK)
.addOptionalTag(forgeTagKey("storage_blocks/diamond"));
tag(STORAGE_BLOCKS_DRIED_KELP).add(Blocks.DRIED_KELP_BLOCK);
tag(STORAGE_BLOCKS_EMERALD)
.add(Blocks.EMERALD_BLOCK)
.addOptionalTag(forgeTagKey("storage_blocks/emerald"));
tag(STORAGE_BLOCKS_GOLD)
.add(Blocks.GOLD_BLOCK)
.addOptionalTag(forgeTagKey("storage_blocks/gold"));
tag(STORAGE_BLOCKS_IRON)
.add(Blocks.IRON_BLOCK)
.addOptionalTag(forgeTagKey("storage_blocks/iron"));
tag(STORAGE_BLOCKS_LAPIS)
.add(Blocks.LAPIS_BLOCK)
.addOptionalTag(forgeTagKey("storage_blocks/lapis"));
tag(STORAGE_BLOCKS_NETHERITE)
.add(Blocks.NETHERITE_BLOCK)
.addOptionalTag(forgeTagKey("storage_blocks/netherite"));
tag(STORAGE_BLOCKS_RAW_COPPER)
.add(Blocks.RAW_COPPER_BLOCK)
.addOptionalTag(forgeTagKey("storage_blocks/raw_copper"));
tag(STORAGE_BLOCKS_RAW_GOLD)
.add(Blocks.RAW_GOLD_BLOCK)
.addOptionalTag(forgeTagKey("storage_blocks/raw_gold"));
tag(STORAGE_BLOCKS_RAW_IRON)
.add(Blocks.RAW_IRON_BLOCK)
.addOptionalTag(forgeTagKey("storage_blocks/raw_iron"));
tag(STORAGE_BLOCKS_REDSTONE)
.add(Blocks.REDSTONE_BLOCK)
.addOptionalTag(forgeTagKey("storage_blocks/redstone"));
tag(STORAGE_BLOCKS_SLIME).add(Blocks.SLIME_BLOCK);
tag(STORAGE_BLOCKS_WHEAT).add(Blocks.HAY_BLOCK);
tag(Tags.Blocks.STRIPPED_LOGS).add(
Blocks.STRIPPED_ACACIA_LOG, Blocks.STRIPPED_BAMBOO_BLOCK, Blocks.STRIPPED_BIRCH_LOG,
Blocks.STRIPPED_CHERRY_LOG, Blocks.STRIPPED_DARK_OAK_LOG, Blocks.STRIPPED_JUNGLE_LOG,
Blocks.STRIPPED_MANGROVE_LOG, Blocks.STRIPPED_OAK_LOG, Blocks.STRIPPED_SPRUCE_LOG);
tag(Tags.Blocks.STRIPPED_WOODS).add(
Blocks.STRIPPED_ACACIA_WOOD, Blocks.STRIPPED_BIRCH_WOOD, Blocks.STRIPPED_CHERRY_WOOD,
Blocks.STRIPPED_DARK_OAK_WOOD, Blocks.STRIPPED_JUNGLE_WOOD, Blocks.STRIPPED_MANGROVE_WOOD,
Blocks.STRIPPED_OAK_WOOD, Blocks.STRIPPED_SPRUCE_WOOD);
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 definitions for pre-1.21 legacy `forge:` tags.
// TODO: Remove backwards compat tag entries in 1.22
tag(forgeTagKey("barrels")).addTag(forgeTagKey("barrels/wooden"));
tag(forgeTagKey("barrels/wooden")).add(Blocks.BARREL);
tag(forgeTagKey("bookshelves")).add(Blocks.BOOKSHELF);
tag(forgeTagKey("chests")).addTags(forgeTagKey("chests/ender"), forgeTagKey("chests/trapped"), forgeTagKey("chests/wooden"));
tag(forgeTagKey("chests/wooden")).add(Blocks.CHEST, Blocks.TRAPPED_CHEST);
tag(forgeTagKey("cobblestone")).addTags(forgeTagKey("cobblestone/normal"), forgeTagKey("cobblestone/infested"), forgeTagKey("cobblestone/mossy"), forgeTagKey("cobblestone/deepslate"));
tag(forgeTagKey("glass")).addTags(forgeTagKey("glass/colorless"), forgeTagKey("stained_glass"), forgeTagKey("glass/tinted"));
tag(forgeTagKey("glass/colorless")).add(Blocks.GLASS);
tag(forgeTagKey("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(forgeTagKey("glass/tinted")).add(Blocks.TINTED_GLASS);
addColored(tag(forgeTagKey("stained_glass"))::add, forgeTagKey("glass"), "{color}_stained_glass");
tag(forgeTagKey("glass_panes")).addTags(forgeTagKey("glass_panes/colorless"), forgeTagKey("stained_glass_panes"));
tag(forgeTagKey("glass_panes/colorless")).add(Blocks.GLASS_PANE);
addColored(tag(forgeTagKey("stained_glass_panes"))::add, forgeTagKey("glass_panes"), "{color}_stained_glass_pane");
tag(forgeTagKey("obsidian")).add(Blocks.OBSIDIAN);
tag(forgeTagKey("ores")).addTags(forgeTagKey("ores/coal"), forgeTagKey("ores/copper"), forgeTagKey("ores/diamond"), forgeTagKey("ores/emerald"), forgeTagKey("ores/gold"), forgeTagKey("ores/iron"), forgeTagKey("ores/lapis"), forgeTagKey("ores/redstone"), forgeTagKey("ores/quartz"), forgeTagKey("ores/netherite_scrap"));
tag(forgeTagKey("ores/quartz")).add(Blocks.NETHER_QUARTZ_ORE);
tag(forgeTagKey("ores/netherite_scrap")).add(Blocks.ANCIENT_DEBRIS);
tag(forgeTagKey("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(forgeTagKey("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(forgeTagKey("storage_blocks"))
.addTags(forgeTagKey("storage_blocks/amethyst"), forgeTagKey("storage_blocks/coal"), forgeTagKey("storage_blocks/copper"), forgeTagKey("storage_blocks/diamond"), forgeTagKey("storage_blocks/emerald"), forgeTagKey("storage_blocks/gold"), forgeTagKey("storage_blocks/iron"), forgeTagKey("storage_blocks/lapis"), forgeTagKey("storage_blocks/quartz"), forgeTagKey("storage_blocks/raw_copper"), forgeTagKey("storage_blocks/raw_gold"), forgeTagKey("storage_blocks/raw_iron"), forgeTagKey("storage_blocks/redstone"), forgeTagKey("storage_blocks/netherite"));
tag(forgeTagKey("storage_blocks/amethyst")).add(Blocks.AMETHYST_BLOCK);
tag(forgeTagKey("storage_blocks/coal")).add(Blocks.COAL_BLOCK);
tag(forgeTagKey("storage_blocks/copper")).add(Blocks.COPPER_BLOCK);
tag(forgeTagKey("storage_blocks/diamond")).add(Blocks.DIAMOND_BLOCK);
tag(forgeTagKey("storage_blocks/emerald")).add(Blocks.EMERALD_BLOCK);
tag(forgeTagKey("storage_blocks/gold")).add(Blocks.GOLD_BLOCK);
tag(forgeTagKey("storage_blocks/iron")).add(Blocks.IRON_BLOCK);
tag(forgeTagKey("storage_blocks/lapis")).add(Blocks.LAPIS_BLOCK);
tag(forgeTagKey("storage_blocks/quartz")).add(Blocks.QUARTZ_BLOCK);
tag(forgeTagKey("storage_blocks/raw_copper")).add(Blocks.RAW_COPPER_BLOCK);
tag(forgeTagKey("storage_blocks/raw_gold")).add(Blocks.RAW_GOLD_BLOCK);
tag(forgeTagKey("storage_blocks/raw_iron")).add(Blocks.RAW_IRON_BLOCK);
tag(forgeTagKey("storage_blocks/redstone")).add(Blocks.REDSTONE_BLOCK);
tag(forgeTagKey("storage_blocks/netherite")).add(Blocks.NETHERITE_BLOCK);
}
private void addColored(TagKey<Block> group, String pattern) {
@@ -298,19 +81,6 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider {
}
}
private void addColored(Consumer<Block> consumer, 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()));
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());
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()) {
@@ -15,7 +15,7 @@ import java.util.concurrent.CompletableFuture;
import static net.minecraftforge.common.Tags.Enchantments.*;
@ApiStatus.Internal
public final class ForgeEnchantmentTagsProvider extends EnchantmentTagsProvider {
public final class ForgeEnchantmentTagsProvider extends net.minecraft.data.tags.EnchantmentTagsProvider {
public ForgeEnchantmentTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, ExistingFileHelper existingFileHelper) {
super(output, lookupProvider, "forge", existingFileHelper);
}
@@ -28,7 +28,9 @@ public final class ForgeFluidTagsProvider extends FluidTagsProvider {
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(MILK)
.addOptional(ForgeMod.MILK.getKey().location())
.addOptional(ForgeMod.FLOWING_MILK.getKey().location());
tag(GASEOUS);
tag(HONEY);
tag(POTION);
@@ -41,8 +43,8 @@ public final class ForgeFluidTagsProvider extends FluidTagsProvider {
// Backwards compat definitions for pre-1.21 legacy `forge:` tags.
// TODO: Remove backwards compat tag entries in 1.22
tag(forgeTagKey("milk"))
.addOptional(ForgeMod.MILK.getId())
.addOptional(ForgeMod.FLOWING_MILK.getId());
.addOptional(ForgeMod.MILK.getKey().location())
.addOptional(ForgeMod.FLOWING_MILK.getKey().location());
}
private static TagKey<Fluid> forgeTagKey(String path) {
@@ -8,9 +8,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.ItemTagsProvider;
import net.minecraft.data.tags.TagAppender;
import net.minecraft.data.tags.VanillaItemTagsProvider;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ItemTags;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.DyeColor;
@@ -26,18 +26,21 @@ import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
@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);
public final class ForgeItemTagsProvider extends VanillaItemTagsProvider {
public ForgeItemTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, ExistingFileHelper existingFileHelper) {
super(output, lookupProvider, "forge", existingFileHelper);
}
@SuppressWarnings({ "unchecked", "removal" })
@Override
public void addTags(HolderLookup.Provider lookupProvider) {
copy(Tags.Blocks.BARRELS, Tags.Items.BARRELS);
copy(Tags.Blocks.BARRELS_WOODEN, Tags.Items.BARRELS_WOODEN);
(new ForgeBlockItemTagsProvider() {
@Override
protected TagAppender<Block, Block> tag(TagKey<Block> p_409856_, TagKey<Item> p_406371_) {
return new VanillaItemTagsProvider.BlockToItemConverter(ForgeItemTagsProvider.this.tag(p_406371_));
}
}).run();
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);
@@ -48,20 +51,6 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider {
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.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);
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,
@@ -119,22 +108,13 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider {
addColoredTags(tag(Tags.Items.DYES)::addTags, Tags.Items.DYES);
tag(Tags.Items.EGGS).add(Items.EGG); // forge:eggs
tag(Tags.Items.ENCHANTING_FUELS).addTag(Tags.Items.GEMS_LAPIS); // forge:enchanting_fuels
copy(Tags.Blocks.END_STONES, Tags.Items.END_STONES);
tag(Tags.Items.ENDER_PEARLS)
.add(Items.ENDER_PEARL)
.addOptionalTag(forgeItemTagKey("ender_pearls"));
tag(Tags.Items.FEATHERS)
.add(Items.FEATHER)
.addOptionalTag(forgeItemTagKey("feathers"));
copy(Tags.Blocks.FENCE_GATES, Tags.Items.FENCE_GATES);
copy(Tags.Blocks.FENCE_GATES_WOODEN, Tags.Items.FENCE_GATES_WOODEN);
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);
copy(Tags.Blocks.FLOWERS_SMALL, Tags.Items.FLOWERS_SMALL);
copy(Tags.Blocks.FLOWERS_TALL, Tags.Items.FLOWERS_TALL);
copy(Tags.Blocks.FLOWERS, Tags.Items.FLOWERS);
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);
@@ -183,14 +163,6 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider {
tag(Tags.Items.GEMS_QUARTZ)
.add(Items.QUARTZ)
.addOptionalTag(forgeItemTagKey("gems/quartz"));
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);
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); // forge:gunpowder
tag(Tags.Items.HIDDEN_FROM_RECIPE_VIEWERS);
tag(Tags.Items.INGOTS)
@@ -222,7 +194,6 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider {
tag(Tags.Items.NETHER_STARS)
.add(Items.NETHER_STAR)
.addOptionalTag(forgeItemTagKey("nether_stars"));
copy(Tags.Blocks.NETHERRACK, Tags.Items.NETHERRACK);
tag(Tags.Items.NUGGETS)
.addTags(Tags.Items.NUGGETS_GOLD, Tags.Items.NUGGETS_IRON)
.addOptionalTag(forgeItemTagKey("nuggets"));
@@ -232,35 +203,6 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider {
tag(Tags.Items.NUGGETS_GOLD)
.add(Items.GOLD_NUGGET)
.addOptionalTag(forgeItemTagKey("nuggets/gold"));
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);
copy(Tags.Blocks.ORE_RATES_DENSE, Tags.Items.ORE_RATES_DENSE);
copy(Tags.Blocks.ORE_RATES_SINGULAR, Tags.Items.ORE_RATES_SINGULAR);
copy(Tags.Blocks.ORE_RATES_SPARSE, Tags.Items.ORE_RATES_SPARSE);
copy(Tags.Blocks.ORES, Tags.Items.ORES);
copy(Tags.Blocks.ORES_COAL, Tags.Items.ORES_COAL);
copy(Tags.Blocks.ORES_COPPER, Tags.Items.ORES_COPPER);
copy(Tags.Blocks.ORES_DIAMOND, Tags.Items.ORES_DIAMOND);
copy(Tags.Blocks.ORES_EMERALD, Tags.Items.ORES_EMERALD);
copy(Tags.Blocks.ORES_GOLD, Tags.Items.ORES_GOLD);
copy(Tags.Blocks.ORES_IRON, Tags.Items.ORES_IRON);
copy(Tags.Blocks.ORES_LAPIS, Tags.Items.ORES_LAPIS);
copy(Tags.Blocks.ORES_QUARTZ, Tags.Items.ORES_QUARTZ);
copy(Tags.Blocks.ORES_REDSTONE, Tags.Items.ORES_REDSTONE);
copy(Tags.Blocks.ORES_NETHERITE_SCRAP, Tags.Items.ORES_NETHERITE_SCRAP);
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);
copy(Tags.Blocks.PUMPKINS, Tags.Items.PUMPKINS);
copy(Tags.Blocks.PUMPKINS_NORMAL, Tags.Items.PUMPKINS_NORMAL);
copy(Tags.Blocks.PUMPKINS_CARVED, Tags.Items.PUMPKINS_CARVED);
copy(Tags.Blocks.PUMPKINS_JACK_O_LANTERNS, Tags.Items.PUMPKINS_JACK_O_LANTERNS);
tag(Tags.Items.RAW_MATERIALS)
.addTags(Tags.Items.RAW_MATERIALS_COPPER, Tags.Items.RAW_MATERIALS_GOLD, Tags.Items.RAW_MATERIALS_IRON)
.addOptionalTag(forgeItemTagKey("raw_materials"));
@@ -283,19 +225,6 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider {
tag(Tags.Items.RODS_WOODEN)
.add(Items.STICK)
.addOptionalTag(forgeItemTagKey("rods/wooden"));
copy(Tags.Blocks.ROPES, Tags.Items.ROPES);
copy(Tags.Blocks.SAND, Tags.Items.SAND); // forge:sand
copy(Tags.Blocks.SAND_COLORLESS, Tags.Items.SAND_COLORLESS); // forge:sand/colorless
copy(Tags.Blocks.SAND_RED, Tags.Items.SAND_RED); // forge:sand/red
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);
@@ -311,29 +240,9 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider {
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_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_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_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)
.addOptionalTag(forgeItemTagKey("strings"));
copy(Tags.Blocks.STRIPPED_LOGS, Tags.Items.STRIPPED_LOGS);
copy(Tags.Blocks.STRIPPED_WOODS, Tags.Items.STRIPPED_WOODS);
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,
@@ -374,21 +283,9 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider {
.addOptionalTag(forgeItemTagKey("armors"));
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);
tag(forgeItemTagKey("bones")).add(Items.BONE);
// Backwards compat definitions for pre-1.21 legacy `forge:` tags.
// TODO: Remove backwards compat tag entries in 1.22
copy(forgeBlockTagKey("barrels"), forgeItemTagKey("barrels"));
copy(forgeBlockTagKey("barrels/wooden"), forgeItemTagKey("barrels/wooden"));
tag(forgeItemTagKey("bones")).add(Items.BONE);
copy(forgeBlockTagKey("bookshelves"), forgeItemTagKey("bookshelves"));
copy(forgeBlockTagKey("chests"), forgeItemTagKey("chests"));
copy(forgeBlockTagKey("chests/ender"), forgeItemTagKey("chests/ender"));
copy(forgeBlockTagKey("chests/trapped"), forgeItemTagKey("chests/trapped"));
copy(forgeBlockTagKey("chests/wooden"), forgeItemTagKey("chests/wooden"));
copy(forgeBlockTagKey("cobblestone"), forgeItemTagKey("cobblestone"));
copy(forgeBlockTagKey("cobblestone/normal"), forgeItemTagKey("cobblestone/normal"));
copy(forgeBlockTagKey("cobblestone/infested"), forgeItemTagKey("cobblestone/infested"));
copy(forgeBlockTagKey("cobblestone/mossy"), forgeItemTagKey("cobblestone/mossy"));
copy(forgeBlockTagKey("cobblestone/deepslate"), forgeItemTagKey("cobblestone/deepslate"));
tag(forgeItemTagKey("crops"))
.addTags(forgeItemTagKey("crops/beetroot"), forgeItemTagKey("crops/carrot"), forgeItemTagKey("crops/nether_wart"),
forgeItemTagKey("crops/potato"), forgeItemTagKey("crops/wheat"));
@@ -405,14 +302,8 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider {
addColored(tag(forgeItemTagKey("dyes"))::addTags, forgeItemTagKey("dyes"), "{color}_dye");
tag(forgeItemTagKey("eggs")).add(Items.EGG);
tag(forgeItemTagKey("enchanting_fuels")).addTag(forgeItemTagKey("gems/lapis"));
copy(forgeBlockTagKey("end_stones"), forgeItemTagKey("end_stones"));
tag(forgeItemTagKey("ender_pearls")).add(Items.ENDER_PEARL);
tag(forgeItemTagKey("feathers")).add(Items.FEATHER);
copy(forgeBlockTagKey("fence_gates"), forgeItemTagKey("fence_gates"));
copy(forgeBlockTagKey("fence_gates/wooden"), forgeItemTagKey("fence_gates/wooden"));
copy(forgeBlockTagKey("fences"), forgeItemTagKey("fences"));
copy(forgeBlockTagKey("fences/nether_brick"), forgeItemTagKey("fences/nether_brick"));
copy(forgeBlockTagKey("fences/wooden"), forgeItemTagKey("fences/wooden"));
tag(forgeItemTagKey("gems"))
.addTags(forgeItemTagKey("gems/amethyst"), forgeItemTagKey("gems/diamond"), forgeItemTagKey("gems/emerald"),
forgeItemTagKey("gems/lapis"), forgeItemTagKey("gems/prismarine"), forgeItemTagKey("gems/quartz"));
@@ -422,14 +313,6 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider {
tag(forgeItemTagKey("gems/lapis")).add(Items.LAPIS_LAZULI);
tag(forgeItemTagKey("gems/prismarine")).add(Items.PRISMARINE_CRYSTALS);
tag(forgeItemTagKey("gems/quartz")).add(Items.QUARTZ);
copy(forgeBlockTagKey("glass"), forgeItemTagKey("glass"));
copy(forgeBlockTagKey("glass/tinted"), forgeItemTagKey("glass/tinted"));
copy(forgeBlockTagKey("glass/silica"), forgeItemTagKey("glass/silica"));
copyColored(forgeBlockTagKey("glass"), forgeItemTagKey("glass"));
copy(forgeBlockTagKey("glass_panes"), forgeItemTagKey("glass_panes"));
copyColored(forgeBlockTagKey("glass_panes"), forgeItemTagKey("glass_panes"));
copy(forgeBlockTagKey("glass_panes/colorless"), forgeItemTagKey("glass_panes/colorless"));
copy(forgeBlockTagKey("gravel"), forgeItemTagKey("gravel"));
tag(forgeItemTagKey("gunpowder")).add(Items.GUNPOWDER);
tag(forgeItemTagKey("heads")).add(Items.CREEPER_HEAD, Items.DRAGON_HEAD, Items.PLAYER_HEAD, Items.SKELETON_SKULL, Items.WITHER_SKELETON_SKULL, Items.ZOMBIE_HEAD);
tag(forgeItemTagKey("ingots"))
@@ -444,31 +327,9 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider {
tag(forgeItemTagKey("leather")).add(Items.LEATHER);
tag(forgeItemTagKey("mushrooms")).add(Items.BROWN_MUSHROOM, Items.RED_MUSHROOM);
tag(forgeItemTagKey("nether_stars")).add(Items.NETHER_STAR);
copy(forgeBlockTagKey("netherrack"), forgeItemTagKey("netherrack"));
tag(forgeItemTagKey("nuggets")).addTags(forgeItemTagKey("nuggets/iron"), forgeItemTagKey("nuggets/gold"));
tag(forgeItemTagKey("nuggets/iron")).add(Items.IRON_NUGGET);
tag(forgeItemTagKey("nuggets/gold")).add(Items.GOLD_NUGGET);
copy(forgeBlockTagKey("obsidian"), forgeItemTagKey("obsidian"));
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);
copy(Tags.Blocks.ORE_RATES_DENSE, Tags.Items.ORE_RATES_DENSE);
copy(Tags.Blocks.ORE_RATES_SINGULAR, Tags.Items.ORE_RATES_SINGULAR);
copy(Tags.Blocks.ORE_RATES_SPARSE, Tags.Items.ORE_RATES_SPARSE);
copy(forgeBlockTagKey("ores"), forgeItemTagKey("ores"));
copy(Tags.Blocks.ORES_COAL, Tags.Items.ORES_COAL);
copy(Tags.Blocks.ORES_COPPER, Tags.Items.ORES_COPPER);
copy(Tags.Blocks.ORES_DIAMOND, Tags.Items.ORES_DIAMOND);
copy(Tags.Blocks.ORES_EMERALD, Tags.Items.ORES_EMERALD);
copy(Tags.Blocks.ORES_GOLD, Tags.Items.ORES_GOLD);
copy(Tags.Blocks.ORES_IRON, Tags.Items.ORES_IRON);
copy(Tags.Blocks.ORES_LAPIS, Tags.Items.ORES_LAPIS);
copy(forgeBlockTagKey("ores/quartz"), forgeItemTagKey("ores/quartz"));
copy(Tags.Blocks.ORES_REDSTONE, Tags.Items.ORES_REDSTONE);
copy(forgeBlockTagKey("ores/netherite_scrap"), forgeItemTagKey("ores/netherite_scrap"));
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);
tag(forgeItemTagKey("raw_materials")).addTags(forgeItemTagKey("raw_materials/copper"), forgeItemTagKey("raw_materials/gold"), forgeItemTagKey("raw_materials/iron"));
tag(forgeItemTagKey("raw_materials/copper")).add(Items.RAW_COPPER);
tag(forgeItemTagKey("raw_materials/gold")).add(Items.RAW_GOLD);
@@ -476,10 +337,6 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider {
tag(forgeItemTagKey("rods")).addTags(forgeItemTagKey("rods/blaze"), forgeItemTagKey("rods/wooden"));
tag(forgeItemTagKey("rods/blaze")).add(Items.BLAZE_ROD);
tag(forgeItemTagKey("rods/wooden")).add(Items.STICK);
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(forgeBlockTagKey("sandstone"), forgeItemTagKey("sandstone"));
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);
@@ -487,24 +344,6 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider {
tag(Tags.Items.SEEDS_WHEAT).add(Items.WHEAT_SEEDS);
tag(forgeItemTagKey("shears")).add(Items.SHEARS); // yes, it's forge:shears not forge:tools/shears
tag(forgeItemTagKey("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(forgeBlockTagKey("stone"), forgeItemTagKey("stone"));
copy(forgeBlockTagKey("storage_blocks"), forgeItemTagKey("storage_blocks"));
copy(Tags.Blocks.STORAGE_BLOCKS_AMETHYST, Tags.Items.STORAGE_BLOCKS_AMETHYST);
copy(forgeBlockTagKey("storage_blocks/coal"), forgeItemTagKey("storage_blocks/coal"));
copy(forgeBlockTagKey("storage_blocks/copper"), forgeItemTagKey("storage_blocks/copper"));
copy(forgeBlockTagKey("storage_blocks/diamond"), forgeItemTagKey("storage_blocks/diamond"));
copy(forgeBlockTagKey("storage_blocks/emerald"), forgeItemTagKey("storage_blocks/emerald"));
copy(forgeBlockTagKey("storage_blocks/gold"), forgeItemTagKey("storage_blocks/gold"));
copy(forgeBlockTagKey("storage_blocks/iron"), forgeItemTagKey("storage_blocks/iron"));
copy(forgeBlockTagKey("storage_blocks/lapis"), forgeItemTagKey("storage_blocks/lapis"));
copy(Tags.Blocks.STORAGE_BLOCKS_QUARTZ, Tags.Items.STORAGE_BLOCKS_QUARTZ);
copy(forgeBlockTagKey("storage_blocks/redstone"), forgeItemTagKey("storage_blocks/redstone"));
copy(forgeBlockTagKey("storage_blocks/raw_copper"), forgeItemTagKey("storage_blocks/raw_copper"));
copy(forgeBlockTagKey("storage_blocks/raw_gold"), forgeItemTagKey("storage_blocks/raw_gold"));
copy(forgeBlockTagKey("storage_blocks/raw_iron"), forgeItemTagKey("storage_blocks/raw_iron"));
copy(forgeBlockTagKey("storage_blocks/netherite"), forgeItemTagKey("storage_blocks/netherite"));
tag(forgeItemTagKey("string")).add(Items.STRING);
tag(forgeItemTagKey("tools/shields")).add(Items.SHIELD);
tag(forgeItemTagKey("tools/bows")).add(Items.BOW);
@@ -546,17 +385,6 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider {
}
}
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"));
}
private static void addColoredTags(Consumer<TagKey<Item>> consumer, TagKey<Item> group) {
String prefix = group.location().getPath().toUpperCase(Locale.ENGLISH) + '_';
for (DyeColor color : DyeColor.values()) {
@@ -565,16 +393,6 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider {
}
}
@SuppressWarnings("unchecked")
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) {
throw new IllegalStateException(Tags.Blocks.class.getName() + " is missing tag name: " + name);
}
}
@SuppressWarnings("unchecked")
private static TagKey<Item> getForgeItemTag(String name) {
try {
@@ -589,10 +407,6 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider {
return ResourceLocation.fromNamespaceAndPath("forge", path);
}
private static TagKey<Block> forgeBlockTagKey(String path) {
return BlockTags.create(forgeRl(path));
}
private static TagKey<Item> forgeItemTagKey(String path) {
return ItemTags.create(forgeRl(path));
}
@@ -6,7 +6,6 @@
package net.minecraftforge.common.extensions;
import net.minecraft.network.Connection;
import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.Block;
@@ -15,6 +14,7 @@ import net.minecraft.world.level.block.Blocks;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.chunk.LevelChunk;
import net.minecraft.world.level.storage.ValueInput;
import net.minecraft.world.phys.AABB;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
@@ -31,15 +31,15 @@ public interface IForgeBlockEntity extends ICapabilityProvider {
/**
* Called when you receive a TileEntityData packet for the location this TileEntity is currently in. On the client,
* the NetworkManager will always be the remote server. On the server, it will be whomever is responsible for
* the Connection will always be the remote server. On the server, it will be whomever is responsible for
* sending the packet.
*
* @param connection The Connection the packet originated from
* @param pkt The data packet
* @param data The data from the packet, with registry access context
* @param lookup The holder lookup provider
*/
default void onDataPacket(Connection connection, ClientboundBlockEntityDataPacket pkt, HolderLookup.Provider lookup) {
this.self().loadWithComponents(pkt.getTag(), lookup);
default void onDataPacket(Connection connection, ValueInput data, HolderLookup.Provider lookup) {
this.self().loadWithComponents(data);
}
/**
@@ -49,8 +49,8 @@ public interface IForgeBlockEntity extends ICapabilityProvider {
*
* @param tag The {@link CompoundTag} sent from {@link BlockEntity#getUpdateTag()}
*/
default void handleUpdateTag(CompoundTag tag, HolderLookup.Provider holders) {
self().loadWithComponents(tag, holders);
default void handleUpdateTag(ValueInput tag, HolderLookup.Provider holders) {
self().loadWithComponents(tag);
}
default void onChunkUnloaded(){}
@@ -9,6 +9,7 @@ import java.util.Collection;
import java.util.function.BiPredicate;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.util.ProblemReporter;
import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.vehicle.AbstractBoat;
@@ -22,6 +23,8 @@ import net.minecraft.server.level.ServerLevel;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.world.level.material.FluidState;
import net.minecraft.world.level.storage.TagValueInput;
import net.minecraft.world.level.storage.TagValueOutput;
import net.minecraftforge.common.SoundAction;
import net.minecraftforge.common.capabilities.ICapabilitySerializable;
import net.minecraftforge.entity.PartEntity;
@@ -35,16 +38,21 @@ public interface IForgeEntity extends ICapabilitySerializable<CompoundTag> {
@Override
default void deserializeNBT(HolderLookup.Provider registryAccess, CompoundTag nbt) {
self().load(nbt);
try (var problems = new ProblemReporter.ScopedCollector(self().problemPath(), Entity.LOGGER)) {
self().load(TagValueInput.create(problems, registryAccess, nbt));
}
}
@Override
default CompoundTag serializeNBT(HolderLookup.Provider registryAccess) {
var ret = new CompoundTag();
var id = self().getEncodeId();
if (id != null)
ret.putString("id", self().getEncodeId());
return self().saveWithoutId(ret);
try (var problems = new ProblemReporter.ScopedCollector(self().problemPath(), Entity.LOGGER)) {
var output = TagValueOutput.createWithContext(problems, registryAccess);
var id = self().getEncodeId();
if (id != null)
output.putString("id", id);
self().saveWithoutId(output);
return output.buildResult();
}
}
boolean canUpdate();
@@ -43,7 +43,8 @@ import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraftforge.common.ForgeI18n;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.eventbus.api.bus.EventBus;
import net.minecraftforge.eventbus.api.event.InheritableEvent;
public interface IForgeGameTestHelper {
private GameTestHelper self() {
@@ -168,17 +169,17 @@ public interface IForgeGameTestHelper {
/**
* Registers an event listener that will be unregistered when the test is finished running.
*/
default <E extends Event> void addEventListener(Consumer<E> consumer) {
MinecraftForge.EVENT_BUS.addListener(consumer);
self().addCleanup(success -> MinecraftForge.EVENT_BUS.unregister(consumer));
default <E extends InheritableEvent> void addEventListener(EventBus<E> bus, Consumer<E> consumer) {
var key = bus.addListener(consumer);
self().addCleanup(success -> bus.removeListener(key));
}
/**
* Registers an event listener that will be unregistered when the test is finished running.
*/
default void registerEventListener(Object handler) {
MinecraftForge.EVENT_BUS.register(handler);
self().addCleanup(success -> MinecraftForge.EVENT_BUS.unregister(handler));
var keys = MinecraftForge.EVENT_BUS.register(handler);
self().addCleanup(success -> MinecraftForge.EVENT_BUS.unregister(keys));
}
/**
@@ -1,100 +0,0 @@
/*
* Copyright (c) Forge Development LLC and contributors
* SPDX-License-Identifier: LGPL-2.1-only
*/
package net.minecraftforge.common.extensions;
import net.minecraft.data.tags.IntrinsicHolderTagsProvider;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
public interface IForgeIntrinsicHolderTagAppender<T> extends IForgeTagAppender<T> {
private IntrinsicHolderTagsProvider.IntrinsicTagAppender<T> self() {
return (IntrinsicHolderTagsProvider.IntrinsicTagAppender<T>) this;
}
ResourceKey<T> getKey(T value);
/**
* Adds a registry entry to the tag json's remove list. Callable during datageneration.
*
* @param entry The entry to remove
* @return The builder for chaining
*/
default IntrinsicHolderTagsProvider.IntrinsicTagAppender<T> remove(final T entry) {
return remove(this.getKey(entry));
}
/**
* Adds multiple registry entries to the tag json's remove list. Callable during datageneration.
*
* @param entries The entries to remove
* @return The builder for chaining
*/
@SuppressWarnings("unchecked")
default IntrinsicHolderTagsProvider.IntrinsicTagAppender<T> remove(final T first, final T...entries) {
this.remove(first);
for (T entry : entries)
this.remove(entry);
return self();
}
@Override
@SuppressWarnings("unchecked")
default IntrinsicHolderTagsProvider.IntrinsicTagAppender<T> addTags(TagKey<T>... values) {
IForgeTagAppender.super.addTags(values);
return self();
}
@Override
default IntrinsicHolderTagsProvider.IntrinsicTagAppender<T> replace() {
IForgeTagAppender.super.replace();
return self();
}
@Override
default IntrinsicHolderTagsProvider.IntrinsicTagAppender<T> replace(boolean value) {
IForgeTagAppender.super.replace(value);
return self();
}
@Override
default IntrinsicHolderTagsProvider.IntrinsicTagAppender<T> remove(final ResourceLocation location) {
IForgeTagAppender.super.remove(location);
return self();
}
@Override
default IntrinsicHolderTagsProvider.IntrinsicTagAppender<T> remove(final ResourceLocation first, final ResourceLocation... locations) {
IForgeTagAppender.super.remove(first, locations);
return self();
}
@Override
default IntrinsicHolderTagsProvider.IntrinsicTagAppender<T> remove(final ResourceKey<T> resourceKey) {
IForgeTagAppender.super.remove(resourceKey);
return self();
}
@Override
@SuppressWarnings("unchecked")
default IntrinsicHolderTagsProvider.IntrinsicTagAppender<T> remove(final ResourceKey<T> firstResourceKey, final ResourceKey<T>... resourceKeys) {
IForgeTagAppender.super.remove(firstResourceKey, resourceKeys);
return self();
}
@Override
default IntrinsicHolderTagsProvider.IntrinsicTagAppender<T> remove(TagKey<T> tag) {
IForgeTagAppender.super.remove(tag);
return self();
}
@Override
@SuppressWarnings("unchecked")
default IntrinsicHolderTagsProvider.IntrinsicTagAppender<T> remove(TagKey<T> first, TagKey<T>...tags) {
IForgeTagAppender.super.remove(first, tags);
return self();
}
}
@@ -5,129 +5,140 @@
package net.minecraftforge.common.extensions;
import net.minecraft.data.tags.TagsProvider;
import net.minecraft.data.tags.TagAppender;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagBuilder;
import net.minecraft.tags.TagKey;
public interface IForgeTagAppender<T>
{
private TagsProvider.TagAppender<T> self() {
return (TagsProvider.TagAppender<T>) this;
public interface IForgeTagAppender<E, T> {
private TagAppender<E, T> self() {
return (TagAppender<E, T>)this;
}
/**
* Gets the backing TagBuilder, will throw an exception if its not set.
* This is only available during data generation, and if they use TagAppender.forBuilder
*/
default TagBuilder getInternalBuilder() {
throw new IllegalStateException("Could not determine internal tag builder");
}
default String getSourceName() {
return "unknown";
}
/**
* Adds a registry entry to the tag json's remove list. Callable during datageneration.
*
* @param entry The entry to remove
* @return The builder for chaining
*/
default TagAppender<E, T> remove(final E entry) {
throw new UnsupportedOperationException("TagAppender.remove is not implemented in class: " + this.getClass());
}
/**
* Adds multiple registry entries to the tag json's remove list. Callable during datageneration.
*
* @param entries The entries to remove
* @return The builder for chaining
*/
@SuppressWarnings("unchecked")
default TagsProvider.TagAppender<T> addTags(TagKey<T>... values) {
TagsProvider.TagAppender<T> builder = self();
default TagAppender<E, T> remove(final E first, final E...entries) {
this.remove(first);
for (E entry : entries)
this.remove(entry);
return self();
}
@SuppressWarnings("unchecked")
default TagAppender<E, T> addTags(TagKey<T>... values) {
var builder = self();
for (TagKey<T> value : values) {
builder.addTag(value);
}
return builder;
}
default TagsProvider.TagAppender<T> addOptionalTag(TagKey<T> value) {
return self().addOptionalTag(value.location());
default TagAppender<E, T> addOptional(ResourceLocation location) {
self().getInternalBuilder().addOptionalElement(location);
return self();
}
@SuppressWarnings("unchecked")
default TagsProvider.TagAppender<T> addOptionalTags(TagKey<T>... values) {
TagsProvider.TagAppender<T> builder = self();
for (TagKey<T> value : values) {
builder.addOptionalTag(value.location());
}
default TagAppender<E, T>addOptionalTags(TagKey<T>... values) {
var builder = self();
for (var value : values)
builder.addOptionalTag(value);
return builder;
}
default TagsProvider.TagAppender<T> replace() {
default TagAppender<E, T> replace() {
return replace(true);
}
default TagsProvider.TagAppender<T> replace(boolean value) {
default TagAppender<E, T> replace(boolean value) {
self().getInternalBuilder().replace(value);
return self();
}
/**
* Adds a single element's ID to the tag json's remove list. Callable during datageneration.
* Adds a single element's ID to the tag json's remove list. Only available during data generation.
* @param location The ID of the element to remove
* @return The builder for chaining
*/
default TagsProvider.TagAppender<T> remove(final ResourceLocation location)
{
TagsProvider.TagAppender<T> builder = self();
builder.getInternalBuilder().removeElement(location, builder.getModID());
default TagAppender<E, T> remove(final ResourceLocation location) {
var builder = self();
builder.getInternalBuilder().removeElement(location, builder.getSourceName());
return builder;
}
/**
* Adds multiple elements' IDs to the tag json's remove list. Callable during datageneration.
* Adds multiple elements' IDs to the tag json's remove list. Only available during data generation.
* @param locations The IDs of the elements to remove
* @return The builder for chaining
*/
default TagsProvider.TagAppender<T> remove(final ResourceLocation first, final ResourceLocation... locations)
{
default TagAppender<E, T> remove(final ResourceLocation first, final ResourceLocation... locations) {
this.remove(first);
for (ResourceLocation location : locations)
{
for (var location : locations)
this.remove(location);
}
return self();
}
/**
* Adds a resource key to the tag json's remove list. Callable during datageneration.
* Adds a resource key to the tag json's remove list. Only available during data generation.
*
* @param resourceKey The resource key of the element to remove
* @return The appender for chaining
*/
default TagsProvider.TagAppender<T> remove(final ResourceKey<T> resourceKey)
{
default TagAppender<E, T> remove(final ResourceKey<T> resourceKey) {
this.remove(resourceKey.location());
return self();
}
/**
* Adds multiple resource keys to the tag json's remove list. Callable during datageneration.
*
* @param resourceKeys The resource keys of the elements to remove
* @return The appender for chaining
*/
@SuppressWarnings("unchecked")
default TagsProvider.TagAppender<T> remove(final ResourceKey<T> firstResourceKey, final ResourceKey<T>... resourceKeys)
{
this.remove(firstResourceKey.location());
for (ResourceKey<T> resourceKey : resourceKeys)
{
this.remove(resourceKey.location());
}
return self();
}
/**
* Adds a tag to the tag json's remove list. Callable during datageneration.
* Adds a tag to the tag json's remove list. Only available during data generation.
* @param tag The ID of the tag to remove
* @return The builder for chaining
*/
default TagsProvider.TagAppender<T> remove(TagKey<T> tag)
{
TagsProvider.TagAppender<T> builder = self();
builder.getInternalBuilder().removeTag(tag.location(), builder.getModID());
default TagAppender<E, T> remove(TagKey<T> tag) {
var builder = self();
builder.getInternalBuilder().removeTag(tag.location(), builder.getSourceName());
return builder;
}
/**
* Adds multiple tags to the tag json's remove list. Callable during datageneration.
* Adds multiple tags to the tag json's remove list. Only available during data generation.
* @param tags The IDs of the tags to remove
* @return The builder for chaining
*/
@SuppressWarnings("unchecked")
default TagsProvider.TagAppender<T> remove(TagKey<T> first, TagKey<T>...tags)
{
default TagAppender<E, T> remove(TagKey<T> first, TagKey<T>...tags) {
this.remove(first);
for (TagKey<T> tag : tags)
{
for (var tag : tags)
this.remove(tag);
}
return self();
}
}
@@ -10,16 +10,21 @@ import java.util.Objects;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.storage.TagValueInput;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.resources.ResourceKey;
import net.minecraft.util.ProblemReporter;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.Level;
import net.minecraftforge.server.ServerLifecycleHooks;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import com.mojang.logging.LogUtils;
/**
* Represents a captured snapshot of a block which will not change
@@ -29,6 +34,7 @@ import org.jetbrains.annotations.Nullable;
* can exist multiple times for any given Block.
*/
public class BlockSnapshot {
private static final Logger LOGGER = LogUtils.getLogger();
private static final boolean DEBUG = Boolean.parseBoolean(System.getProperty("forge.debugBlockSnapshot", "false"));
private final ResourceKey<Level> dim;
@@ -65,7 +71,7 @@ public class BlockSnapshot {
@Nullable
private static CompoundTag getBlockEntityTag(@Nullable BlockEntity te, HolderLookup.Provider lookup) {
return te == null ? null : te.saveCustomAndMetadata(lookup);
return te == null ? null : te.saveWithFullMetadata(lookup);
}
public BlockState getCurrentBlock() {
@@ -127,7 +133,10 @@ public class BlockSnapshot {
if (getTag() != null) {
te = world.getBlockEntity(pos);
if (te != null) {
te.loadWithComponents(nbt, world.registryAccess());
try (var problems = new ProblemReporter.ScopedCollector(te.problemPath(), LOGGER)) {
te.loadWithComponents(TagValueInput.create(problems, world.registryAccess(), getTag()));
}
te.setChanged();
}
}
@@ -0,0 +1,31 @@
/*
* Copyright (c) Forge Development LLC and contributors
* SPDX-License-Identifier: LGPL-2.1-only
*/
package net.minecraftforge.common.util;
import net.minecraftforge.eventbus.api.event.RecordEvent;
import org.jspecify.annotations.NullMarked;
@NullMarked
public interface HasResult {
Result getResult();
void setResult(Result result);
/**
* A version of {@link HasResult} tailored for {@link RecordEvent}s.
*/
@NullMarked
interface Record extends HasResult {
Result.Holder resultHolder();
default Result getResult() {
return resultHolder().get();
}
default void setResult(Result result) {
resultHolder().set(result);
}
}
}
@@ -0,0 +1,70 @@
/*
* Copyright (c) Forge Development LLC and contributors
* SPDX-License-Identifier: LGPL-2.1-only
*/
package net.minecraftforge.common.util;
import net.minecraftforge.eventbus.api.event.RecordEvent;
import org.jspecify.annotations.NullMarked;
import java.util.Objects;
@NullMarked
public enum Result {
ALLOW,
DEFAULT,
DENY;
public boolean isAllowed() {
return this == ALLOW;
}
public boolean isDefault() {
return this == DEFAULT;
}
public boolean isDenied() {
return this == DENY;
}
/**
* A mutable holder for a Result, useful for {@link RecordEvent}s combined with {@link HasResult.Record}
*/
@NullMarked
public static final class Holder {
private Result value;
public Holder() {
set(DEFAULT);
}
public Holder(Result value) {
set(value);
}
public Result get() {
return value;
}
public void set(Result value) {
Objects.requireNonNull(value);
this.value = value;
}
@Override
public String toString() {
return "Result.Holder{value=" + value + "\"}";
}
@Override
public boolean equals(Object that) {
return this == that || (that instanceof Holder thatHolder && this.value == thatHolder.value);
}
@Override
public int hashCode() {
return value.hashCode();
}
}
}