Add subscriber annotation

5 files changed, 39 insertions, 20 deletions

diff --git a/src/main/java/moe/nea/ultranotifier/mixin/ChatHudMessageAdded.java b/src/main/java/moe/nea/ultranotifier/mixin/ChatHudMessageAdded.java
index a9323d7..b6c013f 100644
--- a/src/main/java/moe/nea/ultranotifier/mixin/ChatHudMessageAdded.java
+++ b/src/main/java/moe/nea/ultranotifier/mixin/ChatHudMessageAdded.java
@@ -1,7 +1,7 @@
 package moe.nea.ultranotifier.mixin;
 
-import moe.nea.ultranotifier.ChatLineAddedEvent;
-import moe.nea.ultranotifier.UltraNotifierEvents;
+import moe.nea.ultranotifier.event.ChatLineAddedEvent;
+import moe.nea.ultranotifier.event.UltraNotifierEvents;
 import net.minecraft.client.gui.hud.ChatHud;
 //#if MC > 11404
 import net.minecraft.client.gui.hud.MessageIndicator;
@@ -37,7 +37,7 @@ public class ChatHudMessageAdded {
 //#endif
 			CallbackInfo ci
 	) {
-		if (UltraNotifierEvents.post(new ChatLineAddedEvent()).isCancelled()) {
+		if (UltraNotifierEvents.post(new ChatLineAddedEvent(message)).isCancelled()) {
 			ci.cancel();
 		}
 	}
diff --git a/src/main/kotlin/event/ChatLineAddedEvent.kt b/src/main/kotlin/event/ChatLineAddedEvent.kt
new file mode 100644
index 0000000..0460f83
--- /dev/null
+++ b/src/main/kotlin/event/ChatLineAddedEvent.kt
@@ -0,0 +1,7 @@
+package moe.nea.ultranotifier.event
+
+import net.minecraft.text.Text
+
+class ChatLineAddedEvent(val component: Text) : UltraEvent() {
+	val string = component.string
+}
diff --git a/src/main/kotlin/UltraNotifierEvents.kt b/src/main/kotlin/event/UltraEvent.kt
index d47a0be..42fa4f2 100644
--- a/src/main/kotlin/UltraNotifierEvents.kt
+++ b/src/main/kotlin/event/UltraEvent.kt
@@ -1,19 +1,4 @@
-package moe.nea.ultranotifier
-
-object UltraNotifierEvents {
-	val eventBus =
-//#if FORGE
-//$$		net.minecraftforge.common.MinecraftForge.EVENT_BUS
-//#else
-		me.bush.eventbus.bus.EventBus { UltraNotifier.logger.warn("EventBus: $it") }
-//#endif
-	@JvmStatic
-	fun <T : UltraEvent> post(event: T): T {
-		UltraNotifier.logger.info("Posting $event")
-		eventBus.post(event)
-		return event
-	}
-}
+package moe.nea.ultranotifier.event
 
 abstract class UltraEvent :
 //#if FORGE
@@ -50,4 +35,3 @@ abstract class UltraEvent :
 }
 
 
-class ChatLineAddedEvent() : UltraEvent()
diff --git a/src/main/kotlin/event/UltraNotifierEvents.kt b/src/main/kotlin/event/UltraNotifierEvents.kt
new file mode 100644
index 0000000..8c8fb13
--- /dev/null
+++ b/src/main/kotlin/event/UltraNotifierEvents.kt
@@ -0,0 +1,20 @@
+package moe.nea.ultranotifier.event
+
+import moe.nea.ultranotifier.UltraNotifier
+
+object UltraNotifierEvents {
+	val eventBus =
+//#if FORGE
+//$$		net.minecraftforge.common.MinecraftForge.EVENT_BUS
+//#else
+		me.bush.eventbus.bus.EventBus { UltraNotifier.logger.warn("EventBus: $it") }
+//#endif
+	@JvmStatic
+	fun <T : UltraEvent> post(event: T): T {
+		UltraNotifier.logger.info("Posting $event")
+		eventBus.post(event)
+		return event
+	}
+}
+
+
diff --git a/src/main/kotlin/event/UltraSubscribe.kt b/src/main/kotlin/event/UltraSubscribe.kt
new file mode 100644
index 0000000..d0b37ef
--- /dev/null
+++ b/src/main/kotlin/event/UltraSubscribe.kt
@@ -0,0 +1,8 @@
+package moe.nea.ultranotifier.event
+
+typealias UltraSubscribe =
+//#if FORGE
+//$$	net.minecraftforge.eventbus.api.SubscribeEvent
+//#else
+	me.bush.eventbus.annotation.EventListener
+//#endif