Announce joins and quits in chat

emortalmc · Dec 23, 2023 · 0ce3d02 · 0ce3d02
1 parent 7a6b980
commit 0ce3d02
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 4 deletions.
diff --git a/src/main/java/dev/emortal/velocity/adapter/AdapterContext.java b/src/main/java/dev/emortal/velocity/adapter/AdapterContext.java
@@ -6,9 +6,11 @@
 import dev.emortal.velocity.adapter.resourcepack.ResourcePackProvider;
 import dev.emortal.velocity.adapter.scheduler.EmortalScheduler;
 import dev.emortal.velocity.adapter.server.ServerProvider;
+import net.kyori.adventure.audience.Audience;
 import org.jetbrains.annotations.NotNull;
 
 public record AdapterContext(@NotNull EmortalCommandManager commandManager, @NotNull EmortalEventManager eventManager,
-                             @NotNull PlayerProvider playerProvider, @NotNull EmortalScheduler scheduler, @NotNull ServerProvider serverProvider,
-                             @NotNull ResourcePackProvider resourcePackProvider) {
+                             @NotNull PlayerProvider playerProvider, @NotNull EmortalScheduler scheduler,
+                             @NotNull ServerProvider serverProvider, @NotNull ResourcePackProvider resourcePackProvider,
+                             @NotNull Audience audience) {
 }
diff --git a/src/main/java/dev/emortal/velocity/lang/ChatMessages.java b/src/main/java/dev/emortal/velocity/lang/ChatMessages.java
@@ -457,6 +457,17 @@ public interface ChatMessages {
 
     Args0 DISCORD_COMMAND = () -> MiniMessage.miniMessage().deserialize("<click:open_url:'https://discord.com/invite/TZyuMSha96'><gradient:#7289da:#51629c:#51629c>Click to join our</gradient> <#7289da><bold>Discord</bold><#51629c>!</click>");
 
+    Args1<String> JOIN = username -> Component.text()
+            .append(Component.text("JOIN", NamedTextColor.GREEN, TextDecoration.BOLD))
+            .append(Component.text(" | ", NamedTextColor.DARK_GRAY))
+            .append(Component.text(username, NamedTextColor.WHITE))
+            .build();
+    Args1<String> QUIT = username -> Component.text()
+            .append(Component.text("QUIT", NamedTextColor.RED, TextDecoration.BOLD))
+            .append(Component.text(" | ", NamedTextColor.DARK_GRAY))
+            .append(Component.text(username, NamedTextColor.WHITE))
+            .build();
+
     @FunctionalInterface
     interface Args0 {
 

diff --git a/src/main/java/dev/emortal/velocity/module/VelocityModuleEnvironmentProvider.java b/src/main/java/dev/emortal/velocity/module/VelocityModuleEnvironmentProvider.java
@@ -39,7 +39,8 @@ public VelocityModuleEnvironmentProvider(@NotNull ProxyServer proxy, @NotNull Co
                 new VelocityPlayerProvider(proxy),
                 new VelocityEmortalScheduler(proxy.getScheduler(), plugin),
                 new VelocityServerProvider(proxy),
-                new VelocityResourcePackProvider(proxy)
+                new VelocityResourcePackProvider(proxy),
+                proxy
         );
     }
 

diff --git a/src/main/java/dev/emortal/velocity/player/PlayerModule.java b/src/main/java/dev/emortal/velocity/player/PlayerModule.java
@@ -7,6 +7,7 @@
 import dev.emortal.velocity.module.VelocityModuleEnvironment;
 import dev.emortal.velocity.player.commands.PlaytimeCommand;
 import dev.emortal.velocity.player.listener.McPlayerListener;
+import dev.emortal.velocity.player.listener.PlayerJoinQuitListener;
 import org.jetbrains.annotations.NotNull;
 
 @ModuleData(name = "player")
@@ -25,6 +26,7 @@ public boolean onLoad() {
 
         if (service != null) {
             super.registerCommand(new PlaytimeCommand(service, sessionCache, super.adapters().commandManager().usernameSuggesters()));
+            super.registerEventListener(new PlayerJoinQuitListener(super.adapters().audience()));
             super.registerEventListener(new McPlayerListener(service, sessionCache));
         }
 

diff --git a/src/main/java/dev/emortal/velocity/player/listener/PlayerJoinQuitListener.java b/src/main/java/dev/emortal/velocity/player/listener/PlayerJoinQuitListener.java
@@ -0,0 +1,32 @@
+package dev.emortal.velocity.player.listener;
+
+import com.velocitypowered.api.event.Subscribe;
+import com.velocitypowered.api.event.connection.DisconnectEvent;
+import com.velocitypowered.api.event.connection.LoginEvent;
+import dev.emortal.velocity.lang.ChatMessages;
+import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.key.Key;
+import net.kyori.adventure.sound.Sound;
+import org.jetbrains.annotations.NotNull;
+
+public final class PlayerJoinQuitListener {
+    private static final Key JOIN_QUIT_SOUND = Key.key(Key.MINECRAFT_NAMESPACE, "entity.item.pickup");
+
+    private final Audience audience;
+
+    public PlayerJoinQuitListener(@NotNull Audience audience) {
+        this.audience = audience;
+    }
+
+    @Subscribe
+    public void onJoin(@NotNull LoginEvent event) {
+        ChatMessages.JOIN.send(this.audience, event.getPlayer().getUsername());
+        this.audience.playSound(Sound.sound(JOIN_QUIT_SOUND, Sound.Source.MASTER, 1F, 1.2F));
+    }
+
+    @Subscribe
+    public void onQuit(@NotNull DisconnectEvent event) {
+        ChatMessages.QUIT.send(this.audience, event.getPlayer().getUsername());
+        this.audience.playSound(Sound.sound(JOIN_QUIT_SOUND, Sound.Source.MASTER, 1F, 0.5F));
+    }
+}
diff --git a/src/test/java/dev/emortal/testing/DummyPlayer.java b/src/test/java/dev/emortal/testing/DummyPlayer.java
@@ -95,7 +95,7 @@ public GameProfile getGameProfile() {
     }
 
     @Override
-    public void clearHeaderAndFooter() {
+    public void clearPlayerListHeaderAndFooter() {
     }
 
     @Override