feat: bump velocity and make resource pack load earlier

Author: emortaldev

Dockerfile

@@ -1,10 +1,10 @@
-FROM --platform=$TARGETPLATFORM azul/zulu-openjdk:21-jre
+FROM eclipse-temurin:21-jre-alpin
 
 # Download packages
-RUN apt-get update && apt-get install -y wget
+RUN apk add --no-cache wget
 
 # We manually set the Velocity version to avoid bugs
-ENV VELOCITY_JAR_URL "https://fill-data.papermc.io/v1/objects/f82780ce33035ebe3d6ea7981f0e6e8a3e41a64f2080ef5c0f1266fada03cbee/velocity-3.4.0-SNAPSHOT-522.jar"
+ENV VELOCITY_JAR_URL "https://fill-data.papermc.io/v1/objects/61249fa5b9b33bc7e3223581eab6aedad790a295caf0e39da2ff3c8ec9d9117f/velocity-3.4.0-SNAPSHOT-523.jar"
 
 RUN mkdir /app
 WORKDIR /app

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -1,8 +1,9 @@
 package dev.emortal.velocity.misc.listener;
 
 import com.velocitypowered.api.event.Subscribe;
+import com.velocitypowered.api.event.connection.DisconnectEvent;
 import com.velocitypowered.api.event.player.PlayerResourcePackStatusEvent;
-import com.velocitypowered.api.event.player.ServerPostConnectEvent;
+import com.velocitypowered.api.event.player.configuration.PlayerConfigurationEvent;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.player.ResourcePackInfo;
 import dev.emortal.velocity.adapter.resourcepack.ResourcePackProvider;
@@ -17,6 +18,9 @@
 import java.net.URI;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 final class ResourcePackSender {
@@ -26,6 +30,8 @@ final class ResourcePackSender {
 
     private ResourcePackInfo resourcePackInfo;
 
+    private final Set<UUID> rpAcceptedPlayers = new HashSet<>();
+
     ResourcePackSender(@NotNull ResourcePackProvider resourcePackProvider, @NotNull EmortalScheduler scheduler) {
         this.updateResourcePackInfo(resourcePackProvider);
         scheduler.repeat(() -> this.updateResourcePackInfo(resourcePackProvider), 30, TimeUnit.SECONDS);
@@ -70,19 +76,26 @@ private byte[] fetchSha1() throws NoSuchAlgorithmException, IOException {
     }
 
     @Subscribe
-    void onPlayerJoin(@NotNull ServerPostConnectEvent event) {
-        if (event.getPreviousServer() != null) return; // Don't send the resource pack if the player is switching servers
+    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
 
-        event.getPlayer().sendResourcePackOffer(this.resourcePackInfo);
+        event.player().sendResourcePackOffer(this.resourcePackInfo);
     }
 
     @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);
         }
     }
+
+    @Subscribe
+    void onPlayerDisconnect(DisconnectEvent event) {
+        this.rpAcceptedPlayers.remove(event.getPlayer().getUniqueId());
+    }
+
 }