Added generic type to IEventBus for future, so we can seperate events based on which bus they fire on.

Author: RealMangorage

src/main/java/org/mangorage/eventbus/EventBus.java

@@ -23,23 +23,19 @@
 package org.mangorage.eventbus;
 
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
-import org.mangorage.eventbus.annotations.SubscribeEvent;
-import org.mangorage.eventbus.event.Event;
-import org.mangorage.eventbus.event.GenericEvent;
+import org.mangorage.eventbus.event.core.Event;
 import org.mangorage.eventbus.interfaces.IEventBus;
+import org.mangorage.eventbus.interfaces.IEventType;
 import org.mangorage.eventbus.interfaces.IGenericEvent;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.util.Map;
 import java.util.concurrent.Semaphore;
 import java.util.function.Consumer;
 
-public final class EventBus implements IEventBus {
+public final class EventBus<F extends IEventType<F>> implements IEventBus<F> {
 
-    public static IEventBus create() {
-        return new EventBus();
+    public static <F extends IEventType<F>> IEventBus<F> create() {
+        return new EventBus<>();
     }
 
 
@@ -50,13 +46,13 @@ private EventBus() {
     }
 
     @Override
-    public <E extends Event> void addListener(int priority, Class<E> eventClass, Consumer<E> consumer) {
+    public <E extends Event & IEventType<F>> void addListener(int priority, Class<E> eventClass, Consumer<E> consumer) {
         var list = getListenerList(eventClass, null);
         if (list != null) list.register(priority, consumer);
     }
 
     @Override
-    public <E extends Event & IGenericEvent<G>, G> void addGenericListener(int priority, Class<G> baseFilterClass, Class<E> eventClass, Consumer<E> consumer) {
+    public <E extends Event & IGenericEvent<G> & IEventType<F>, G> void addGenericListener(int priority, Class<G> baseFilterClass, Class<E> eventClass, Consumer<E> consumer) {
         var list = getListenerList(eventClass, baseFilterClass);
         if (list != null) list.register(priority, consumer);
     }
@@ -73,6 +69,8 @@ public void registerObject(Object object) {
 
     @SuppressWarnings("unchecked")
     private void register(Class<?> clazz, Object instance) {
+        // TODO: FIX LATER
+        /**
         for (Method method : clazz.getDeclaredMethods()) {
             var subscribeEvent = method.getDeclaredAnnotation(SubscribeEvent.class);
 
@@ -124,6 +122,7 @@ private void register(Class<?> clazz, Object instance) {
                 addListener(subscribeEvent.priority(), eventClass, consumer);
             }
         }
+         **/
     }
 
     @SuppressWarnings("unchecked")
@@ -144,7 +143,7 @@ private <E extends Event> ListenerList<E> getListenerList(Class<E> eventClass, C
 
     @Override
     @SuppressWarnings("unchecked")
-    public <E extends Event> void post(E event) {
+    public <E extends Event & IEventType<F>> void post(E event) {
         Class<?> genericType = null;
         if (event instanceof IGenericEvent<?> genericEvent)
             genericType = genericEvent.getGenericType();

src/main/java/org/mangorage/eventbus/EventKey.java

@@ -22,7 +22,7 @@
 
 package org.mangorage.eventbus;
 
-import org.mangorage.eventbus.event.Event;
+import org.mangorage.eventbus.event.core.Event;
 
 public record EventKey<E extends Event, G>(Class<E> eventClass, Class<G> genericClass) {
 }

src/main/java/org/mangorage/eventbus/EventListener.java

@@ -23,7 +23,7 @@
 package org.mangorage.eventbus;
 
 import org.jetbrains.annotations.NotNull;
-import org.mangorage.eventbus.event.Event;
+import org.mangorage.eventbus.event.core.Event;
 
 import java.util.function.Consumer;
 

src/main/java/org/mangorage/eventbus/ListenerList.java

@@ -22,7 +22,7 @@
 
 package org.mangorage.eventbus;
 
-import org.mangorage.eventbus.event.Event;
+import org.mangorage.eventbus.event.core.Event;
 
 import java.util.ArrayList;
 import java.util.Collections;

src/main/java/org/mangorage/eventbus/event/NormalEvent.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2024. MangoRage
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+ * OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package org.mangorage.eventbus.event;
+
+import org.mangorage.eventbus.event.core.Event;
+import org.mangorage.eventbus.interfaces.IEventType;
+
+public abstract class NormalEvent extends Event implements IEventType.INormalBusEvent {
+}

src/main/java/org/mangorage/eventbus/event/NormalGenericEvent.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2024. MangoRage
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+ * OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package org.mangorage.eventbus.event;
+
+import org.mangorage.eventbus.event.core.GenericEvent;
+import org.mangorage.eventbus.interfaces.IEventType;
+import org.mangorage.eventbus.interfaces.IGenericEvent;
+
+public abstract class NormalGenericEvent<G> extends GenericEvent<G> implements IGenericEvent<G>, IEventType.INormalBusEvent {
+    public NormalGenericEvent(Class<G> tClass) {
+        super(tClass);
+    }
+}

…/org/mangorage/eventbus/event/Event.java …mangorage/eventbus/event/core/Event.javasrc/main/java/org/mangorage/eventbus/event/Event.java renamed to src/main/java/org/mangorage/eventbus/event/core/Event.java src/main/java/org/mangorage/eventbus/event/Event.java renamed to src/main/java/org/mangorage/eventbus/event/core/Event.java

@@ -20,7 +20,7 @@
  * OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.mangorage.eventbus.event;
+package org.mangorage.eventbus.event.core;
 
-public class Event {
+public abstract class Event {
 }

…ngorage/eventbus/event/GenericEvent.java …ge/eventbus/event/core/GenericEvent.javasrc/main/java/org/mangorage/eventbus/event/GenericEvent.java renamed to src/main/java/org/mangorage/eventbus/event/core/GenericEvent.java src/main/java/org/mangorage/eventbus/event/GenericEvent.java renamed to src/main/java/org/mangorage/eventbus/event/core/GenericEvent.java

@@ -20,7 +20,7 @@
  * OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.mangorage.eventbus.event;
+package org.mangorage.eventbus.event.core;
 
 import org.mangorage.eventbus.interfaces.IGenericEvent;
 

src/main/java/org/mangorage/eventbus/interfaces/IEventBus.java

@@ -22,20 +22,21 @@
 
 package org.mangorage.eventbus.interfaces;
 
-import org.mangorage.eventbus.event.Event;
+import org.mangorage.eventbus.event.core.Event;
 
 import java.util.function.Consumer;
 
-public interface IEventBus {
-    <E extends Event> void addListener(int priority, Class<E> eventClass, Consumer<E> consumer);
-    <E extends Event & IGenericEvent<G>, G> void addGenericListener(int priority, Class<G> baseFilterClass, Class<E> eventClass, Consumer<E> consumer);
+public interface IEventBus<F extends IEventType<F>> {
+    <E extends Event & IEventType<F>> void addListener(int priority, Class<E> eventClass, Consumer<E> consumer);
+
+    <E extends Event & IGenericEvent<G> & IEventType<F>, G> void addGenericListener(int priority, Class<G> baseFilterClass, Class<E> eventClass, Consumer<E> consumer);
 
     void registerClass(Class<?> clazz);
 
     void registerObject(Object object);
 
 
-    <E extends Event> void post(E event);
+    <E extends Event & IEventType<F>> void post(E event);
 
     void startup();
     void shutdown();

src/main/java/org/mangorage/eventbus/interfaces/IEventType.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2024. MangoRage
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+ * OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package org.mangorage.eventbus.interfaces;
+
+public interface IEventType<T> {
+    interface INormalBusEvent extends IEventType<INormalBusEvent> {
+    }
+}