From 4376cd6b8518c735e9b242abf13c948c7d66f9b2 Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 27 Oct 2025 10:45:43 -0700 Subject: [PATCH] Remove generic from AttachCapabilitiesEvent to help prevent modders from having unchecked casts. Closes #10707 --- .../capabilities/CapabilityProvider.java | 12 +++--- .../event/AttachCapabilitiesEvent.java | 43 +++++++++++++++---- .../event/ForgeEventFactory.java | 2 +- .../gameplay/item/ItemCapabilityTest.java | 2 +- 4 files changed, 42 insertions(+), 17 deletions(-) diff --git a/src/main/java/net/minecraftforge/common/capabilities/CapabilityProvider.java b/src/main/java/net/minecraftforge/common/capabilities/CapabilityProvider.java index cb64b06578..40c248e483 100644 --- a/src/main/java/net/minecraftforge/common/capabilities/CapabilityProvider.java +++ b/src/main/java/net/minecraftforge/common/capabilities/CapabilityProvider.java @@ -50,7 +50,7 @@ public abstract class CapabilityProvider> i } @Override - protected AttachCapabilitiesEvent fireAttachCapabilitiesEvent(Entity provider) { + protected AttachCapabilitiesEvent.Entities fireAttachCapabilitiesEvent(Entity provider) { return AttachCapabilitiesEvent.Entities.BUS.fire(new AttachCapabilitiesEvent.Entities(provider)); } @@ -70,7 +70,7 @@ public abstract class CapabilityProvider> i } @Override - protected AttachCapabilitiesEvent fireAttachCapabilitiesEvent(BlockEntity provider) { + protected AttachCapabilitiesEvent.BlockEntities fireAttachCapabilitiesEvent(BlockEntity provider) { return AttachCapabilitiesEvent.BlockEntities.BUS.fire(new AttachCapabilitiesEvent.BlockEntities(provider)); } @@ -90,7 +90,7 @@ public abstract class CapabilityProvider> i } @Override - protected AttachCapabilitiesEvent fireAttachCapabilitiesEvent(ItemStack provider) { + protected AttachCapabilitiesEvent.ItemStacks fireAttachCapabilitiesEvent(ItemStack provider) { return AttachCapabilitiesEvent.ItemStacks.BUS.fire(new AttachCapabilitiesEvent.ItemStacks(provider)); } @@ -110,7 +110,7 @@ public abstract class CapabilityProvider> i } @Override - protected AttachCapabilitiesEvent fireAttachCapabilitiesEvent(Level provider) { + protected AttachCapabilitiesEvent.Levels fireAttachCapabilitiesEvent(Level provider) { return AttachCapabilitiesEvent.Levels.BUS.fire(new AttachCapabilitiesEvent.Levels(provider)); } @@ -155,7 +155,7 @@ public abstract class CapabilityProvider> i doGatherCapabilities(parent == null ? null : parent.get()); } - protected abstract AttachCapabilitiesEvent fireAttachCapabilitiesEvent(B provider); + protected abstract AttachCapabilitiesEvent fireAttachCapabilitiesEvent(B provider); protected abstract boolean shouldFireAttachCapabilitiesEvent(); private void doGatherCapabilities(@Nullable ICapabilityProvider parent) { @@ -282,7 +282,7 @@ public abstract class CapabilityProvider> i } @Override - protected AttachCapabilitiesEvent fireAttachCapabilitiesEvent(LevelChunk provider) { + protected AttachCapabilitiesEvent.LevelChunks fireAttachCapabilitiesEvent(LevelChunk provider) { return AttachCapabilitiesEvent.LevelChunks.BUS.fire(new AttachCapabilitiesEvent.LevelChunks(provider)); } diff --git a/src/main/java/net/minecraftforge/event/AttachCapabilitiesEvent.java b/src/main/java/net/minecraftforge/event/AttachCapabilitiesEvent.java index 6f8fbba836..fa560f4c43 100644 --- a/src/main/java/net/minecraftforge/event/AttachCapabilitiesEvent.java +++ b/src/main/java/net/minecraftforge/event/AttachCapabilitiesEvent.java @@ -37,61 +37,86 @@ import org.jspecify.annotations.NullMarked; * @see LevelChunks */ @NullMarked -public abstract class AttachCapabilitiesEvent extends MutableEvent implements InheritableEvent { - private final T obj; +public abstract class AttachCapabilitiesEvent extends MutableEvent implements InheritableEvent { + private final Object obj; private final Map caps = new LinkedHashMap<>(); private final Map view = Collections.unmodifiableMap(caps); private final List listeners = new ArrayList<>(); private final List listenersView = Collections.unmodifiableList(listeners); - public static class Entities extends AttachCapabilitiesEvent { + public static class Entities extends AttachCapabilitiesEvent { public static final EventBus BUS = EventBus.create(Entities.class); public Entities(Entity obj) { super(obj); } + + @Override + public Entity getObject() { + return (Entity)super.getObject(); + } } - public static class BlockEntities extends AttachCapabilitiesEvent { + public static class BlockEntities extends AttachCapabilitiesEvent { public static final EventBus BUS = EventBus.create(BlockEntities.class); public BlockEntities(BlockEntity obj) { super(obj); } + + @Override + public BlockEntity getObject() { + return (BlockEntity)super.getObject(); + } } - public static class ItemStacks extends AttachCapabilitiesEvent { + public static class ItemStacks extends AttachCapabilitiesEvent { public static final EventBus BUS = EventBus.create(ItemStacks.class); public ItemStacks(ItemStack obj) { super(obj); } + + @Override + public ItemStack getObject() { + return (ItemStack)super.getObject(); + } } - public static class Levels extends AttachCapabilitiesEvent { + public static class Levels extends AttachCapabilitiesEvent { public static final EventBus BUS = EventBus.create(Levels.class); public Levels(Level obj) { super(obj); } + + @Override + public Level getObject() { + return (Level)super.getObject(); + } } - public static class LevelChunks extends AttachCapabilitiesEvent { + public static class LevelChunks extends AttachCapabilitiesEvent { public static final EventBus BUS = EventBus.create(LevelChunks.class); public LevelChunks(LevelChunk obj) { super(obj); } + + @Override + public LevelChunk getObject() { + return (LevelChunk)super.getObject(); + } } - protected AttachCapabilitiesEvent(T obj) { + protected AttachCapabilitiesEvent(Object obj) { this.obj = obj; } /** * Retrieves the object that is being created, Not much state is set. */ - public T getObject() { + public Object getObject() { return this.obj; } diff --git a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java index ac44c0d05e..5650e1f9ad 100644 --- a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java +++ b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java @@ -571,7 +571,7 @@ public final class ForgeEventFactory { // } @Nullable - public static CapabilityDispatcher gatherCapabilities(AttachCapabilitiesEvent event, @Nullable ICapabilityProvider parent) { + public static CapabilityDispatcher gatherCapabilities(AttachCapabilitiesEvent event, @Nullable ICapabilityProvider parent) { return !event.getCapabilities().isEmpty() || parent != null ? new CapabilityDispatcher(event.getCapabilities(), event.getListeners(), parent) : null; } diff --git a/src/test/java/net/minecraftforge/debug/gameplay/item/ItemCapabilityTest.java b/src/test/java/net/minecraftforge/debug/gameplay/item/ItemCapabilityTest.java index 6fc6c28112..8caa48cee0 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/item/ItemCapabilityTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/item/ItemCapabilityTest.java @@ -54,7 +54,7 @@ public class ItemCapabilityTest extends BaseTestMod { super(context, false, true); } - private static void onEvent(AttachCapabilitiesEvent event) { + private static void onEvent(AttachCapabilitiesEvent.ItemStacks event) { if (event.getObject().getItem() == Items.COPPER_INGOT) { event.addCapability( ResourceLocation.fromNamespaceAndPath("forge", "test"),