feat: no more edging + fix resource pack loading

Author: emortaldev

src/main/java/dev/emortal/velocity/lang/ChatMessages.java

@@ -463,10 +463,7 @@ public interface ChatMessages {
     Args0 ERROR_NO_OUTGOING_FRIEND_REQUESTS = () -> lightPurple("You have no outgoing friend requests");
 
     Args0 RESOURCE_PACK_DOWNLOAD = () -> Component.text("We love you");
-    Args0 RESOURCE_PACK_DECLINED = () -> Component.text().color(NamedTextColor.GRAY)
-            .append(Component.text("Using the resource pack is heavily recommended. It isn't big and only has to be downloaded once.")).appendNewline()
-            .append(Component.text("If the dialog is annoying, you can enable 'Server Resource Packs' when adding the server and the prompt will disappear."))
-            .build();
+    Args0 RESOURCE_PACK_DECLINED = () -> Component.text("Using the resource pack is required.", NamedTextColor.RED);
     Args0 RESOURCE_PACK_FAILED = () -> Component.text().color(NamedTextColor.RED)
             .append(Component.text("The resource pack download failed.")).appendNewline()
             .append(Component.text("If the issue persists, contact a staff member"))

src/main/java/dev/emortal/velocity/misc/listener/CoreListenersModule.java

@@ -22,7 +22,10 @@ public boolean onLoad() {
         EmortalScheduler scheduler = super.adapters().scheduler();
 
         // transfer cookie verification
-        eventManager.register(new LoginCookieVerification());
+//        eventManager.register(new LoginCookieVerification()); no more edging
+
+        // server list ping
+        eventManager.register(new ServerPingListener());
 
         // tablist
         PlayerTrackerService playerTracker = GrpcStubCollection.getPlayerTrackerService().orElse(null);

src/main/java/dev/emortal/velocity/misc/listener/ResourcePackSender.java

@@ -1,5 +1,6 @@
 package dev.emortal.velocity.misc.listener;
 
+import com.velocitypowered.api.event.Continuation;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.DisconnectEvent;
 import com.velocitypowered.api.event.player.PlayerResourcePackStatusEvent;
@@ -21,6 +22,7 @@
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
 final class ResourcePackSender {
@@ -31,6 +33,7 @@ final class ResourcePackSender {
     private ResourcePackInfo resourcePackInfo;
 
     private final Set<UUID> rpAcceptedPlayers = new HashSet<>();
+    private final ConcurrentHashMap<UUID, Continuation> pendingPack = new ConcurrentHashMap<>();
 
     ResourcePackSender(@NotNull ResourcePackProvider resourcePackProvider, @NotNull EmortalScheduler scheduler) {
         this.updateResourcePackInfo(resourcePackProvider);
@@ -76,21 +79,35 @@ private byte[] fetchSha1() throws NoSuchAlgorithmException, IOException {
     }
 
     @Subscribe
-    void onPlayerConfiguration(PlayerConfigurationEvent event) {
-        if (this.rpAcceptedPlayers.contains(event.player().getUniqueId())) return; // Don't send the resource pack if the player has already got it
+    void onPlayerConfiguration(PlayerConfigurationEvent event, Continuation continuation) {
+        if (this.rpAcceptedPlayers.contains(event.player().getUniqueId())) {
+            continuation.resume();
+            return; // Don't send the resource pack if the player has already got it
+        }
 
         event.player().sendResourcePackOffer(this.resourcePackInfo);
+        pendingPack.put(event.player().getUniqueId(), continuation);
     }
 
     @Subscribe
     void onPlayerResourceStatus(@NotNull PlayerResourcePackStatusEvent event) {
         LOGGER.info("Player {} resource pack status {}", event.getPlayer().getUsername(), event.getStatus());
         Player player = event.getPlayer();
         switch (event.getStatus()) {
-            case SUCCESSFUL ->  this.rpAcceptedPlayers.add(player.getUniqueId());
-            case DECLINED -> ChatMessages.RESOURCE_PACK_DECLINED.send(player);
-            case FAILED_DOWNLOAD -> ChatMessages.RESOURCE_PACK_FAILED.send(player);
+            case ACCEPTED -> {
+                this.rpAcceptedPlayers.add(event.getPlayer().getUniqueId());
+                this.pendingPack.get(player.getUniqueId()).resume();
+            }
+            case DECLINED -> {
+                player.disconnect(ChatMessages.RESOURCE_PACK_DECLINED.get());
+                this.pendingPack.get(player.getUniqueId()).resume();
+            }
+            case FAILED_DOWNLOAD, INVALID_URL, DISCARDED -> {
+                ChatMessages.RESOURCE_PACK_FAILED.send(player);
+                this.pendingPack.get(player.getUniqueId()).resume();
+            }
         }
+        this.pendingPack.remove(player.getUniqueId());
     }
 
     @Subscribe

src/main/java/dev/emortal/velocity/misc/listener/ServerPingListener.java

@@ -0,0 +1,51 @@
+package dev.emortal.velocity.misc.listener;
+
+import com.velocitypowered.api.event.Subscribe;
+import com.velocitypowered.api.event.proxy.ProxyPingEvent;
+import com.velocitypowered.api.proxy.server.ServerPing;
+import dev.emortal.velocity.lang.ChatMessages;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.concurrent.ThreadLocalRandom;
+
+public class ServerPingListener {
+
+    private static final String[] MOTDS = new String[] {
+            "coolest server to ever exist",
+            "better than hypixel",
+            "you should join",
+            "stop scrolling, click here!",
+            "Lunar client users: Beware!",
+            "using 3 server softwares!",
+            "gradient lover",
+            "emortal is watching",
+            "emortal says 2 + 2 = 5",
+            "Chuck Norris joined and said it was pretty good",
+            "Chuck Norris doesn't join, the server joins him",
+            "private lobbies when?",
+            "I heard SunriseMC was releasing soon...",
+            "This server is certified aladeen!",
+    };
+
+    @Subscribe
+    void onServerPing(@NotNull ProxyPingEvent event) {
+        ServerPing ping = event.getPing().asBuilder().description(createMessage()).build();
+        event.setPing(ping);
+    }
+
+    private @NotNull Component createMessage() {
+        String randomMessage = this.selectRandomMessage();
+        return Component.text()
+                .append(ChatMessages.PING_MOTD.get())
+                .appendNewline()
+                .append(Component.text(randomMessage, NamedTextColor.YELLOW))
+                .build();
+    }
+
+    private @NotNull String selectRandomMessage() {
+        return MOTDS[ThreadLocalRandom.current().nextInt(MOTDS.length)];
+    }
+
+}