move event methods to BaseHolder

HSGamer · Mar 15, 2024 · 2782bfd · 2782bfd
1 parent 102879e
commit 2782bfd
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 53 deletions.
diff --git a/ui/src/main/java/me/hsgamer/hscore/ui/BaseHolder.java b/ui/src/main/java/me/hsgamer/hscore/ui/BaseHolder.java
@@ -72,34 +72,66 @@ public void update() {
   }
 
   @Override
+  public void stop() {
+    clearAllEventConsumer();
+    removeAllDisplay();
+  }
+
+  /**
+   * Add an event consumer
+   *
+   * @param eventClass    the class of the event
+   * @param eventConsumer the consumer
+   * @param <T>           the type of the event
+   */
   public <T> void addEventConsumer(@NotNull Class<T> eventClass, @NotNull Consumer<T> eventConsumer) {
     classListMap
       .computeIfAbsent(eventClass, clazz -> new ArrayList<>())
       .add(o -> eventConsumer.accept(eventClass.cast(o)));
   }
 
-  @Override
-  public void stop() {
-    clearAllEventConsumer();
-    removeAllDisplay();
-  }
-
-  @Override
+  /**
+   * Clear the event consumer
+   *
+   * @param eventClass the class of the event
+   */
   public void clearEventConsumer(@NotNull Class<?> eventClass) {
     classListMap.remove(eventClass);
   }
 
-  @Override
+  /**
+   * Clear all event consumers
+   */
   public void clearAllEventConsumer() {
     classListMap.clear();
   }
 
-  @Override
+  /**
+   * Handle the event
+   *
+   * @param eventClass the class of the event
+   * @param event      the event
+   */
   public void handleEvent(@NotNull Class<?> eventClass, @NotNull Object event) {
     if (!classListMap.containsKey(eventClass)) return;
     if (!eventClass.isInstance(event)) {
       throw new IllegalArgumentException("The event is not an instance of " + eventClass.getName());
     }
     classListMap.get(eventClass).forEach(consumer -> consumer.accept(event));
   }
+
+  @Override
+  public <E> void handleEvent(@NotNull E event) {
+    Set<Class<?>> eventClassSet = new HashSet<>();
+    Queue<Class<?>> eventClassQueue = new LinkedList<>();
+    eventClassQueue.add(event.getClass());
+    while (true) {
+      Class<?> currentClass = eventClassQueue.poll();
+      if (currentClass == null) break;
+      if (!eventClassSet.add(currentClass)) continue;
+      handleEvent(currentClass, event);
+      Optional.ofNullable(currentClass.getSuperclass()).ifPresent(eventClassQueue::add);
+      eventClassQueue.addAll(Arrays.asList(currentClass.getInterfaces()));
+    }
+  }
 }
diff --git a/ui/src/main/java/me/hsgamer/hscore/ui/Holder.java b/ui/src/main/java/me/hsgamer/hscore/ui/Holder.java
@@ -4,8 +4,8 @@
 import me.hsgamer.hscore.ui.property.Updatable;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
-import java.util.function.Consumer;
+import java.util.Optional;
+import java.util.UUID;
 
 /**
  * The holder for all displays
@@ -39,58 +39,17 @@ public interface Holder<D extends Display> extends Initializable, Updatable {
    */
   Optional<@NotNull D> getDisplay(@NotNull UUID uuid);
 
-  /**
-   * Add an event consumer
-   *
-   * @param eventClass    the event class
-   * @param eventConsumer the event consumer
-   * @param <T>           the type of the event
-   */
-  <T> void addEventConsumer(@NotNull Class<T> eventClass, @NotNull Consumer<T> eventConsumer);
-
-  /**
-   * Clear all event consumers
-   *
-   * @param eventClass the event class
-   */
-  void clearEventConsumer(@NotNull Class<?> eventClass);
-
-  /**
-   * Clear all event consumers of all events
-   */
-  void clearAllEventConsumer();
-
   /**
    * Remove all displays
    */
   void removeAllDisplay();
 
-  /**
-   * Handle the event
-   *
-   * @param eventClass the event class
-   * @param event      the event
-   */
-  void handleEvent(@NotNull Class<?> eventClass, @NotNull Object event);
-
   /**
    * Handle the event
    *
    * @param event the event
    */
-  default <E> void handleEvent(@NotNull E event) {
-    Set<Class<?>> eventClassSet = new HashSet<>();
-    Queue<Class<?>> eventClassQueue = new LinkedList<>();
-    eventClassQueue.add(event.getClass());
-    while (true) {
-      Class<?> currentClass = eventClassQueue.poll();
-      if (currentClass == null) break;
-      if (!eventClassSet.add(currentClass)) continue;
-      handleEvent(currentClass, event);
-      Optional.ofNullable(currentClass.getSuperclass()).ifPresent(eventClassQueue::add);
-      eventClassQueue.addAll(Arrays.asList(currentClass.getInterfaces()));
-    }
-  }
+  <E> void handleEvent(@NotNull E event);
 
   /**
    * Update the display for the unique id