Dispatch events asynchronously

Author: LMBishop

bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/BukkitCSSMinecraftPlugin.java

@@ -7,7 +7,6 @@
 import com.cssbham.cssminecraft.bukkit.logger.BukkitLogger;
 import com.cssbham.cssminecraft.common.AbstractCSSMinecraftPlugin;
 import com.cssbham.cssminecraft.common.adapter.ServerChatAdapter;
-import com.cssbham.cssminecraft.common.command.CommandSender;
 import com.cssbham.cssminecraft.common.command.CommandService;
 import com.cssbham.cssminecraft.common.executor.ServerExecutor;
 import com.cssbham.cssminecraft.common.logger.Logger;
@@ -39,7 +38,7 @@ public BukkitCSSMinecraftPlugin(JavaPlugin plugin) {
     public void enable() {
         super.enable();
 
-        BukkitEventListener eventListener = new BukkitEventListener(plugin);
+        BukkitEventListener eventListener = new BukkitEventListener(plugin, executor);
         eventListener.bindPlatformToEventBus(super.getEventBus());
 
         plugin.getCommand("makegreen").setExecutor(commandService);

bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/listener/BukkitEventListener.java

@@ -4,6 +4,7 @@
 import com.cssbham.cssminecraft.common.event.EventBus;
 import com.cssbham.cssminecraft.common.event.PlatformEventAdapter;
 import com.cssbham.cssminecraft.common.event.events.ServerMessageEvent;
+import com.cssbham.cssminecraft.common.executor.ServerExecutor;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import org.bukkit.entity.Player;
@@ -19,10 +20,12 @@
 public class BukkitEventListener implements Listener, PlatformEventAdapter {
 
     private final JavaPlugin plugin;
+    private final ServerExecutor executor;
     private EventBus eventBus;
 
-    public BukkitEventListener(JavaPlugin plugin) {
+    public BukkitEventListener(JavaPlugin plugin, ServerExecutor executor) {
         this.plugin = plugin;
+        this.executor = executor;
     }
 
     @Override
@@ -35,9 +38,7 @@ public void bindPlatformToEventBus(EventBus eventBus) {
     private void dispatchEvent(Event event) {
         Objects.requireNonNull(event, "event bus not bound");
 
-        plugin.getServer().getScheduler().runTaskAsynchronously(plugin, () -> {
-            eventBus.dispatch(event);
-        });
+        executor.doAsync(() -> eventBus.dispatch(event));
     }
 
     @EventHandler

fabric/src/main/java/com/cssbham/cssminecraft/fabric/FabricCSSMinecraftPlugin.java

@@ -40,7 +40,7 @@ public void enable() {
 
         super.enable();
 
-        FabricEventAdapter eventAdapter = new FabricEventAdapter();
+        FabricEventAdapter eventAdapter = new FabricEventAdapter(executor);
         eventAdapter.bindPlatformToEventBus(super.getEventBus());
     }
 

fabric/src/main/java/com/cssbham/cssminecraft/fabric/listener/FabricEventAdapter.java

@@ -1,21 +1,30 @@
 package com.cssbham.cssminecraft.fabric.listener;
 
+import com.cssbham.cssminecraft.common.event.Event;
 import com.cssbham.cssminecraft.common.event.EventBus;
 import com.cssbham.cssminecraft.common.event.PlatformEventAdapter;
 import com.cssbham.cssminecraft.common.event.events.PlayerJoinEvent;
+import com.cssbham.cssminecraft.common.event.events.PlayerQuitEvent;
 import com.cssbham.cssminecraft.common.event.events.ServerMessageEvent;
+import com.cssbham.cssminecraft.common.executor.ServerExecutor;
 import net.fabricmc.fabric.api.message.v1.ServerMessageEvents;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
 import net.minecraft.server.network.ServerPlayerEntity;
 
 public class FabricEventAdapter implements PlatformEventAdapter {
+
+    private final ServerExecutor executor;
+
+    public FabricEventAdapter(ServerExecutor executor) {
+        this.executor = executor;
+    }
+
     @Override
     public void bindPlatformToEventBus(EventBus eventBus) {
-        //TODO dispatch from thread
         ServerMessageEvents.CHAT_MESSAGE.register((message, player, parameters) -> {
             String name = player.getName().getString();
 
-            eventBus.dispatch(new ServerMessageEvent(
+            dispatchEvent(eventBus, new ServerMessageEvent(
                     player.getUuid(),
                     player.getName().getString(),
                     (null == player.getDisplayName()) ? name : player.getDisplayName().getString(),
@@ -27,7 +36,7 @@ public void bindPlatformToEventBus(EventBus eventBus) {
             ServerPlayerEntity player = handler.getPlayer();
             String name = player.getName().getString();
 
-            eventBus.dispatch(new PlayerJoinEvent(
+            dispatchEvent(eventBus, new PlayerJoinEvent(
                     player.getUuid(),
                     player.getName().getString(),
                     (null == player.getDisplayName()) ? name : player.getDisplayName().getString(),
@@ -39,12 +48,16 @@ public void bindPlatformToEventBus(EventBus eventBus) {
             ServerPlayerEntity player = handler.getPlayer();
             String name = player.getName().getString();
 
-            eventBus.dispatch(new PlayerJoinEvent(
+            dispatchEvent(eventBus, new PlayerQuitEvent(
                     player.getUuid(),
                     player.getName().getString(),
                     (null == player.getDisplayName()) ? name : player.getDisplayName().getString(),
                     server.getCurrentPlayerCount() - 1
             ));
         });
     }
+
+    private void dispatchEvent(EventBus eventBus, Event event) {
+        executor.doAsync(() -> eventBus.dispatch(event));
+    }
 }

forge/src/main/java/com/cssbham/cssminecraft/forge/ForgeCSSMinecraftPlugin.java

@@ -40,7 +40,7 @@ public void enable() {
 
         super.enable();
 
-        ForgeEventAdapter eventAdapter = new ForgeEventAdapter();
+        ForgeEventAdapter eventAdapter = new ForgeEventAdapter(server, executor);
         eventAdapter.bindPlatformToEventBus(super.getEventBus());
     }
 

forge/src/main/java/com/cssbham/cssminecraft/forge/listener/ForgeEventAdapter.java

@@ -3,16 +3,30 @@
 import com.cssbham.cssminecraft.common.event.Event;
 import com.cssbham.cssminecraft.common.event.EventBus;
 import com.cssbham.cssminecraft.common.event.PlatformEventAdapter;
+import com.cssbham.cssminecraft.common.event.events.PlayerJoinEvent;
+import com.cssbham.cssminecraft.common.event.events.PlayerQuitEvent;
 import com.cssbham.cssminecraft.common.event.events.ServerMessageEvent;
+import com.cssbham.cssminecraft.common.executor.ServerExecutor;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.player.Player;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.ServerChatEvent;
+import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 import java.util.Objects;
 
 public class ForgeEventAdapter implements PlatformEventAdapter {
 
+    private final MinecraftServer server;
+    private final ServerExecutor executor;
+
+    public ForgeEventAdapter(MinecraftServer server, ServerExecutor executor) {
+        this.server = server;
+        this.executor = executor;
+    }
+
     private EventBus eventBus;
 
     @Override
@@ -25,7 +39,7 @@ public void bindPlatformToEventBus(EventBus eventBus) {
     private void dispatchEvent(Event event) {
         Objects.requireNonNull(event, "event bus not bound");
 
-        eventBus.dispatch(event);
+        executor.doAsync(() -> eventBus.dispatch(event));
     }
 
     @SubscribeEvent
@@ -40,4 +54,30 @@ public void onChat(ServerChatEvent event) {
                 event.getRawText()
         ));
     }
+
+    @SubscribeEvent
+    public void onLogin(PlayerEvent.PlayerLoggedInEvent event) {
+        Player player = event.getEntity();
+        String name = player.getName().getString();
+
+        dispatchEvent(new PlayerJoinEvent(
+                player.getUUID(),
+                name,
+                (null == player.getDisplayName()) ? name : player.getDisplayName().getString(),
+                server.getPlayerCount() + 1
+        ));
+    }
+
+    @SubscribeEvent
+    public void onLogout(PlayerEvent.PlayerLoggedOutEvent event) {
+        Player player = event.getEntity();
+        String name = player.getName().getString();
+
+        dispatchEvent(new PlayerQuitEvent(
+                player.getUUID(),
+                name,
+                (null == player.getDisplayName()) ? name : player.getDisplayName().getString(),
+                server.getPlayerCount() - 1
+        ));
+    }
 }