add some events

Brokkonaut · Sep 28, 2022 · 0220a81 · 0220a81
1 parent fe13390
commit 0220a81
Show file tree

Hide file tree

Showing 12 changed files with 159 additions and 8 deletions.
diff --git a/src/main/java/de/cubeside/globalserver/ClientConnection.java b/src/main/java/de/cubeside/globalserver/ClientConnection.java
@@ -205,16 +205,17 @@ void setClient(ClientConfig client) {
         this.client = client;
     }
 
-    public boolean addPlayer(UUID uuid, String name, long joinTime) {
+    public OnlinePlayer addPlayer(UUID uuid, String name, long joinTime) {
         if (playersOnline.containsKey(uuid)) {
-            return false;
+            return null;
         }
-        playersOnline.put(uuid, new OnlinePlayer(uuid, name, joinTime));
-        return true;
+        OnlinePlayer joined = new OnlinePlayer(uuid, name, joinTime);
+        playersOnline.put(uuid, joined);
+        return joined;
     }
 
-    public boolean removePlayer(UUID uuid) {
-        return playersOnline.remove(uuid) != null;
+    public OnlinePlayer removePlayer(UUID uuid) {
+        return playersOnline.remove(uuid);
     }
 
     public boolean hasPlayer(UUID uuid) {
@@ -384,4 +385,8 @@ public void sendData(String server, String channel, UUID targetUuid, String targ
             }
         }
     }
+
+    public OnlinePlayer getPlayer(UUID uuid) {
+        return playersOnline.get(uuid);
+    }
 }
diff --git a/src/main/java/de/cubeside/globalserver/GlobalServer.java b/src/main/java/de/cubeside/globalserver/GlobalServer.java
@@ -12,6 +12,13 @@
 import de.cubeside.globalserver.command.ServersCommand;
 import de.cubeside.globalserver.command.StopCommand;
 import de.cubeside.globalserver.event.EventBus;
+import de.cubeside.globalserver.event.clientconnection.ClientConnectionDissolveEvent;
+import de.cubeside.globalserver.event.clientconnection.ClientConnectionEstablishedEvent;
+import de.cubeside.globalserver.event.globalserver.GlobalServerStartedEvent;
+import de.cubeside.globalserver.event.globalserver.GlobalServerStoppedEvent;
+import de.cubeside.globalserver.event.globalserver.GlobalServerStoppingEvent;
+import de.cubeside.globalserver.event.player.PlayerJoinedEvent;
+import de.cubeside.globalserver.event.player.PlayerQuitEvent;
 import de.cubeside.globalserver.plugin.Plugin;
 import de.cubeside.globalserver.plugin.PluginLoadException;
 import de.cubeside.globalserver.plugin.PluginManager;
@@ -222,6 +229,12 @@ void run() {
             LOGGER.error("Could not bind to " + port + ": " + e.getMessage());
             return;
         }
+        readLock.lock();
+        try {
+            getEventBus().dispatchEvent(new GlobalServerStartedEvent(this));
+        } finally {
+            readLock.unlock();
+        }
         while (true) {
             readLock.lock();
             try {
@@ -251,6 +264,8 @@ void run() {
         try {
             listener.shutdown();
 
+            getEventBus().dispatchEvent(new GlobalServerStoppingEvent(this));
+
             for (ClientConnection cc : new ArrayList<>(pendingConnections)) {
                 cc.closeConnection();
             }
@@ -260,6 +275,8 @@ void run() {
             }
             connections.clear();
 
+            getEventBus().dispatchEvent(new GlobalServerStoppedEvent(this));
+
             for (Plugin plugin : pluginManager.getPlugins()) {
                 LOGGER.info("Unloading plugin " + plugin.getDescription().getName() + " " + plugin.getDescription().getVersion());
                 plugin.onUnload();
@@ -339,6 +356,10 @@ void removeConnection(ClientConnection connection) {
                         cc.sendServerOffline(connection.getAccount());
                     }
                 }
+                for (OnlinePlayer player : connection.getPlayers()) {
+                    getEventBus().dispatchEvent(new PlayerQuitEvent(connection, player));
+                }
+                getEventBus().dispatchEvent(new ClientConnectionDissolveEvent(connection));
             }
         } finally {
             writeLock.unlock();
@@ -381,6 +402,7 @@ ClientConfig processLogin(ClientConnection connection, String account, byte[] pa
                     }
                 }
             }
+            getEventBus().dispatchEvent(new ClientConnectionEstablishedEvent(connection));
             return config;
         } finally {
             writeLock.unlock();
@@ -390,12 +412,14 @@ ClientConfig processLogin(ClientConnection connection, String account, byte[] pa
     void processPlayerOnline(ClientConnection connection, UUID uuid, String name, long joinTime) {
         writeLock.lock();
         try {
-            if (connection.addPlayer(uuid, name, joinTime)) {
+            OnlinePlayer joined = connection.addPlayer(uuid, name, joinTime);
+            if (joined != null) {
                 for (ClientConnection cc : connections) {
                     if (cc != connection) {
                         cc.sendPlayerOnline(connection.getAccount(), uuid, name, joinTime);
                     }
                 }
+                getEventBus().dispatchEvent(new PlayerJoinedEvent(connection, joined));
             }
         } finally {
             writeLock.unlock();
@@ -405,12 +429,14 @@ void processPlayerOnline(ClientConnection connection, UUID uuid, String name, lo
     void processPlayerOffline(ClientConnection connection, UUID uuid) {
         writeLock.lock();
         try {
-            if (connection.removePlayer(uuid)) {
+            OnlinePlayer player = connection.removePlayer(uuid);
+            if (player != null) {
                 for (ClientConnection cc : connections) {
                     if (cc != connection) {
                         cc.sendPlayerOffline(connection.getAccount(), uuid);
                     }
                 }
+                getEventBus().dispatchEvent(new PlayerQuitEvent(connection, player));
             }
         } finally {
             writeLock.unlock();

diff --git a/...n/java/de/cubeside/globalserver/event/clientconnection/ClientConnectionDissolveEvent.java b/...n/java/de/cubeside/globalserver/event/clientconnection/ClientConnectionDissolveEvent.java
@@ -0,0 +1,9 @@
+package de.cubeside.globalserver.event.clientconnection;
+
+import de.cubeside.globalserver.ClientConnection;
+
+public class ClientConnectionDissolveEvent extends ClientConnectionEvent {
+    public ClientConnectionDissolveEvent(ClientConnection clientConnection) {
+        super(clientConnection);
+    }
+}
diff --git a/...ava/de/cubeside/globalserver/event/clientconnection/ClientConnectionEstablishedEvent.java b/...ava/de/cubeside/globalserver/event/clientconnection/ClientConnectionEstablishedEvent.java
@@ -0,0 +1,9 @@
+package de.cubeside.globalserver.event.clientconnection;
+
+import de.cubeside.globalserver.ClientConnection;
+
+public class ClientConnectionEstablishedEvent extends ClientConnectionEvent {
+    public ClientConnectionEstablishedEvent(ClientConnection clientConnection) {
+        super(clientConnection);
+    }
+}
diff --git a/src/main/java/de/cubeside/globalserver/event/clientconnection/ClientConnectionEvent.java b/src/main/java/de/cubeside/globalserver/event/clientconnection/ClientConnectionEvent.java
@@ -0,0 +1,16 @@
+package de.cubeside.globalserver.event.clientconnection;
+
+import de.cubeside.globalserver.ClientConnection;
+import de.cubeside.globalserver.event.Event;
+
+public class ClientConnectionEvent extends Event {
+    private final ClientConnection clientConnection;
+
+    public ClientConnectionEvent(ClientConnection clientConnection) {
+        this.clientConnection = clientConnection;
+    }
+
+    public ClientConnection getClientConnection() {
+        return clientConnection;
+    }
+}
diff --git a/src/main/java/de/cubeside/globalserver/event/globalserver/GlobalServerEvent.java b/src/main/java/de/cubeside/globalserver/event/globalserver/GlobalServerEvent.java
@@ -0,0 +1,16 @@
+package de.cubeside.globalserver.event.globalserver;
+
+import de.cubeside.globalserver.GlobalServer;
+import de.cubeside.globalserver.event.Event;
+
+public class GlobalServerEvent extends Event {
+    private final GlobalServer globalServer;
+
+    public GlobalServerEvent(GlobalServer globalServer) {
+        this.globalServer = globalServer;
+    }
+
+    public GlobalServer getGlobalServer() {
+        return globalServer;
+    }
+}
diff --git a/src/main/java/de/cubeside/globalserver/event/globalserver/GlobalServerStartedEvent.java b/src/main/java/de/cubeside/globalserver/event/globalserver/GlobalServerStartedEvent.java
@@ -0,0 +1,9 @@
+package de.cubeside.globalserver.event.globalserver;
+
+import de.cubeside.globalserver.GlobalServer;
+
+public class GlobalServerStartedEvent extends GlobalServerEvent {
+    public GlobalServerStartedEvent(GlobalServer globalServer) {
+        super(globalServer);
+    }
+}
diff --git a/src/main/java/de/cubeside/globalserver/event/globalserver/GlobalServerStoppedEvent.java b/src/main/java/de/cubeside/globalserver/event/globalserver/GlobalServerStoppedEvent.java
@@ -0,0 +1,9 @@
+package de.cubeside.globalserver.event.globalserver;
+
+import de.cubeside.globalserver.GlobalServer;
+
+public class GlobalServerStoppedEvent extends GlobalServerEvent {
+    public GlobalServerStoppedEvent(GlobalServer globalServer) {
+        super(globalServer);
+    }
+}
diff --git a/src/main/java/de/cubeside/globalserver/event/globalserver/GlobalServerStoppingEvent.java b/src/main/java/de/cubeside/globalserver/event/globalserver/GlobalServerStoppingEvent.java
@@ -0,0 +1,9 @@
+package de.cubeside.globalserver.event.globalserver;
+
+import de.cubeside.globalserver.GlobalServer;
+
+public class GlobalServerStoppingEvent extends GlobalServerEvent {
+    public GlobalServerStoppingEvent(GlobalServer globalServer) {
+        super(globalServer);
+    }
+}
diff --git a/src/main/java/de/cubeside/globalserver/event/player/PlayerEvent.java b/src/main/java/de/cubeside/globalserver/event/player/PlayerEvent.java
@@ -0,0 +1,23 @@
+package de.cubeside.globalserver.event.player;
+
+import de.cubeside.globalserver.ClientConnection;
+import de.cubeside.globalserver.OnlinePlayer;
+import de.cubeside.globalserver.event.Event;
+
+public class PlayerEvent extends Event {
+    private final OnlinePlayer onlinePlayer;
+    private final ClientConnection clientConnection;
+
+    public PlayerEvent(ClientConnection clientConnection, OnlinePlayer onlinePlayer) {
+        this.clientConnection = clientConnection;
+        this.onlinePlayer = onlinePlayer;
+    }
+
+    public OnlinePlayer getOnlinePlayer() {
+        return onlinePlayer;
+    }
+
+    public ClientConnection getClientConnection() {
+        return clientConnection;
+    }
+}
diff --git a/src/main/java/de/cubeside/globalserver/event/player/PlayerJoinedEvent.java b/src/main/java/de/cubeside/globalserver/event/player/PlayerJoinedEvent.java
@@ -0,0 +1,10 @@
+package de.cubeside.globalserver.event.player;
+
+import de.cubeside.globalserver.ClientConnection;
+import de.cubeside.globalserver.OnlinePlayer;
+
+public class PlayerJoinedEvent extends PlayerEvent {
+    public PlayerJoinedEvent(ClientConnection clientConnection, OnlinePlayer onlinePlayer) {
+        super(clientConnection, onlinePlayer);
+    }
+}
diff --git a/src/main/java/de/cubeside/globalserver/event/player/PlayerQuitEvent.java b/src/main/java/de/cubeside/globalserver/event/player/PlayerQuitEvent.java
@@ -0,0 +1,10 @@
+package de.cubeside.globalserver.event.player;
+
+import de.cubeside.globalserver.ClientConnection;
+import de.cubeside.globalserver.OnlinePlayer;
+
+public class PlayerQuitEvent extends PlayerEvent {
+    public PlayerQuitEvent(ClientConnection clientConnection, OnlinePlayer onlinePlayer) {
+        super(clientConnection, onlinePlayer);
+    }
+}