From 9b7eb9c8295f93c315d6ea4f9f9f46ff9336e53a Mon Sep 17 00:00:00 2001 From: Jonathing Date: Thu, 24 Apr 2025 12:15:19 -0400 Subject: [PATCH] Move EventCharacteristic to the internal package --- .../api/event/characteristic/Cancellable.java | 1 + .../event/characteristic/EventCharacteristic.java | 13 ------------- .../api/event/characteristic/MonitorAware.java | 1 + .../api/event/characteristic/SelfDestructing.java | 1 + .../api/event/characteristic/SelfPosting.java | 1 + .../eventbus/internal/EventCharacteristic.java | 12 ++++++++++++ 6 files changed, 16 insertions(+), 13 deletions(-) delete mode 100644 src/main/java/net/minecraftforge/eventbus/api/event/characteristic/EventCharacteristic.java create mode 100644 src/main/java/net/minecraftforge/eventbus/internal/EventCharacteristic.java diff --git a/src/main/java/net/minecraftforge/eventbus/api/event/characteristic/Cancellable.java b/src/main/java/net/minecraftforge/eventbus/api/event/characteristic/Cancellable.java index 4c97feba..a01cebd2 100644 --- a/src/main/java/net/minecraftforge/eventbus/api/event/characteristic/Cancellable.java +++ b/src/main/java/net/minecraftforge/eventbus/api/event/characteristic/Cancellable.java @@ -6,6 +6,7 @@ import net.minecraftforge.eventbus.api.bus.CancellableEventBus; import net.minecraftforge.eventbus.internal.Event; +import net.minecraftforge.eventbus.internal.EventCharacteristic; /** * A cancellable event returns {@code true} from {@link CancellableEventBus#post(Event)} if it was cancelled. diff --git a/src/main/java/net/minecraftforge/eventbus/api/event/characteristic/EventCharacteristic.java b/src/main/java/net/minecraftforge/eventbus/api/event/characteristic/EventCharacteristic.java deleted file mode 100644 index acfd8c73..00000000 --- a/src/main/java/net/minecraftforge/eventbus/api/event/characteristic/EventCharacteristic.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) Forge Development LLC - * SPDX-License-Identifier: LGPL-2.1-only - */ -package net.minecraftforge.eventbus.api.event.characteristic; - -import net.minecraftforge.eventbus.internal.Event; - -/** - * There are a number of optional characteristics that an {@link Event} can have which may influence their behaviour - * and the optimisation strategies that can be applied to them. - */ -sealed interface EventCharacteristic permits Cancellable, MonitorAware, SelfDestructing, SelfPosting {} diff --git a/src/main/java/net/minecraftforge/eventbus/api/event/characteristic/MonitorAware.java b/src/main/java/net/minecraftforge/eventbus/api/event/characteristic/MonitorAware.java index 4364ab28..266d5059 100644 --- a/src/main/java/net/minecraftforge/eventbus/api/event/characteristic/MonitorAware.java +++ b/src/main/java/net/minecraftforge/eventbus/api/event/characteristic/MonitorAware.java @@ -5,6 +5,7 @@ package net.minecraftforge.eventbus.api.event.characteristic; import net.minecraftforge.eventbus.api.event.MutableEvent; +import net.minecraftforge.eventbus.internal.EventCharacteristic; import net.minecraftforge.eventbus.internal.MutableEventInternals; /** diff --git a/src/main/java/net/minecraftforge/eventbus/api/event/characteristic/SelfDestructing.java b/src/main/java/net/minecraftforge/eventbus/api/event/characteristic/SelfDestructing.java index cfc141c2..04fc80d5 100644 --- a/src/main/java/net/minecraftforge/eventbus/api/event/characteristic/SelfDestructing.java +++ b/src/main/java/net/minecraftforge/eventbus/api/event/characteristic/SelfDestructing.java @@ -6,6 +6,7 @@ import net.minecraftforge.eventbus.api.bus.EventBus; import net.minecraftforge.eventbus.internal.AbstractEventBusImpl; +import net.minecraftforge.eventbus.internal.EventCharacteristic; /** * A self-destructing event will {@link AbstractEventBusImpl#dispose() dispose} of its associated {@link EventBus} diff --git a/src/main/java/net/minecraftforge/eventbus/api/event/characteristic/SelfPosting.java b/src/main/java/net/minecraftforge/eventbus/api/event/characteristic/SelfPosting.java index 8774fed5..fdf21f1d 100644 --- a/src/main/java/net/minecraftforge/eventbus/api/event/characteristic/SelfPosting.java +++ b/src/main/java/net/minecraftforge/eventbus/api/event/characteristic/SelfPosting.java @@ -6,6 +6,7 @@ import net.minecraftforge.eventbus.api.bus.EventBus; import net.minecraftforge.eventbus.internal.Event; +import net.minecraftforge.eventbus.internal.EventCharacteristic; /** * Experimental feature - may be removed, renamed or otherwise changed without notice. diff --git a/src/main/java/net/minecraftforge/eventbus/internal/EventCharacteristic.java b/src/main/java/net/minecraftforge/eventbus/internal/EventCharacteristic.java new file mode 100644 index 00000000..a3101148 --- /dev/null +++ b/src/main/java/net/minecraftforge/eventbus/internal/EventCharacteristic.java @@ -0,0 +1,12 @@ +/* + * Copyright (c) Forge Development LLC + * SPDX-License-Identifier: LGPL-2.1-only + */ +package net.minecraftforge.eventbus.internal; + +import net.minecraftforge.eventbus.api.event.characteristic.Cancellable; +import net.minecraftforge.eventbus.api.event.characteristic.MonitorAware; +import net.minecraftforge.eventbus.api.event.characteristic.SelfDestructing; +import net.minecraftforge.eventbus.api.event.characteristic.SelfPosting; + +public sealed interface EventCharacteristic permits Cancellable, MonitorAware, SelfDestructing, SelfPosting {}