Make player join and leave messages more gramatically correct

Author: LMBishop

common/src/main/java/com/cssbham/cssminecraft/common/handler/AbstractPlayerJoinLeaveEventHandler.java

@@ -0,0 +1,16 @@
+package com.cssbham.cssminecraft.common.handler;
+
+import com.cssbham.cssminecraft.common.event.Event;
+import com.cssbham.cssminecraft.common.event.EventHandler;
+
+public abstract class AbstractPlayerJoinLeaveEventHandler<E extends Event> extends EventHandler<E> {
+
+    protected String getPlayerCountMessage(int count) {
+        return switch (count) {
+            case 0 -> "there are now no players online";
+            case 1 -> "there is now 1 player online";
+            default -> "there are now " + count + " players online";
+        };
+    }
+
+}

common/src/main/java/com/cssbham/cssminecraft/common/handler/PlayerJoinEventHandler.java

@@ -5,7 +5,7 @@
 import com.cssbham.cssminecraft.common.event.events.PlayerJoinEvent;
 import com.cssbham.cssminecraft.common.event.events.ServerMessageEvent;
 
-public class PlayerJoinEventHandler extends EventHandler<PlayerJoinEvent> {
+public class PlayerJoinEventHandler extends AbstractPlayerJoinLeaveEventHandler<PlayerJoinEvent> {
 
     private final DiscordClientService discordClientService;
 
@@ -15,8 +15,7 @@ public PlayerJoinEventHandler(DiscordClientService discordClientService) {
 
     @Override
     public void handle(PlayerJoinEvent event) {
-        String joinMessage = String.format("__*has joined the server, there are now %d players online*__",
-                event.newPlayerCount());
+        String joinMessage = String.format("__*has joined the server, %s*__", getPlayerCountMessage(event.newPlayerCount()));
         this.discordClientService.getWebHookClient().sendMessageAsMinecraftUser(event.username(), event.displayName(), joinMessage);
     }
 

common/src/main/java/com/cssbham/cssminecraft/common/handler/PlayerQuitEventHandler.java

@@ -5,7 +5,7 @@
 import com.cssbham.cssminecraft.common.event.events.PlayerJoinEvent;
 import com.cssbham.cssminecraft.common.event.events.PlayerQuitEvent;
 
-public class PlayerQuitEventHandler extends EventHandler<PlayerQuitEvent> {
+public class PlayerQuitEventHandler extends AbstractPlayerJoinLeaveEventHandler<PlayerQuitEvent> {
 
     private final DiscordClientService discordClientService;
 
@@ -15,8 +15,7 @@ public PlayerQuitEventHandler(DiscordClientService discordClientService) {
 
     @Override
     public void handle(PlayerQuitEvent event) {
-        String joinMessage = String.format("__*has left the server, there are now %d players online*__",
-                event.newPlayerCount());
+        String joinMessage = String.format("__*has left the server, %s*__", getPlayerCountMessage(event.newPlayerCount()));
         this.discordClientService.getWebHookClient().sendMessageAsMinecraftUser(event.username(), event.displayName(), joinMessage);
     }