impl velocity RP event. Updated to latest.

build.gradle.kts

@@ -17,9 +17,8 @@ repositories {
 dependencies {
     compileOnly("dev.simplix:protocolize-api:2.3.0")
     compileOnly("net.md-5:bungeecord-api:1.20-R0.1-SNAPSHOT")
-    compileOnly("com.velocitypowered:velocity-api:3.2.0-SNAPSHOT")
-    compileOnly("com.velocitypowered:velocity-proxy:3.0.1")
-    annotationProcessor("com.velocitypowered:velocity-api:3.2.0-SNAPSHOT")
+    compileOnly("com.velocitypowered:velocity-api:3.3.0-SNAPSHOT")
+    annotationProcessor("com.velocitypowered:velocity-api:3.3.0-SNAPSHOT")
 }
 
 

gradle.properties

@@ -1 +1 @@
-pluginVersion=1.2.1
+pluginVersion=1.2.2

src/main/java/io/th0rgal/packsmanager/velocity/BungeePackLayerVelocityPlugin.java

@@ -20,10 +20,7 @@
         name = "Bungee Pack Layer",
         version = "${version}",
         description = "${description}",
-        authors = {"th0rgal"},
-        dependencies = {
-                @Dependency(id = "protocolize")
-        }
+        authors = {"th0rgal"}
 )
 public class BungeePackLayerVelocityPlugin {
 
@@ -42,7 +39,7 @@ public BungeePackLayerVelocityPlugin(ProxyServer proxyServer, Logger logger) {
     public void onProxyInitialization(ProxyInitializeEvent event) {
         INSTANCE = this;
         this.resourcePackRequestListener = new ResourcePackRequestListener();
-        Protocolize.listenerProvider().registerListener(resourcePackRequestListener);
+        this.proxyServer.getEventManager().register(this, resourcePackRequestListener);
         this.proxyServer.getEventManager().register(this, new DisconnectListener());
     }
 

src/main/java/io/th0rgal/packsmanager/velocity/listeners/ResourcePackRequestListener.java

@@ -1,41 +1,32 @@
 package io.th0rgal.packsmanager.velocity.listeners;
 
-import com.velocitypowered.proxy.protocol.packet.ResourcePackRequest;
-
-import dev.simplix.protocolize.api.Direction;
-import dev.simplix.protocolize.api.listener.AbstractPacketListener;
-import dev.simplix.protocolize.api.listener.PacketReceiveEvent;
-import dev.simplix.protocolize.api.listener.PacketSendEvent;
+import com.velocitypowered.api.event.PostOrder;
+import com.velocitypowered.api.event.ResultedEvent;
+import com.velocitypowered.api.event.Subscribe;
+import com.velocitypowered.api.event.player.ServerResourcePackSendEvent;
+import com.velocitypowered.api.proxy.player.ResourcePackInfo;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-public class ResourcePackRequestListener extends AbstractPacketListener<ResourcePackRequest> {
-
-    private final Map<UUID, String> map = new HashMap<>();
+public class ResourcePackRequestListener {
 
-    public ResourcePackRequestListener() {
-        super(ResourcePackRequest.class, Direction.DOWNSTREAM, 0);
-    }
+    private final Map<UUID, byte[]> map = new HashMap<>();
 
-    @Override
-    public void packetReceive(PacketReceiveEvent<ResourcePackRequest> event) {
-        final ResourcePackRequest resourcePackRequest = event.packet();
-        final UUID uuid = event.player().uniqueId();
-        if (map.containsKey(uuid) && map.get(uuid).equals(resourcePackRequest.getHash())) {
-            event.cancelled(true);
+    @Subscribe(order = PostOrder.FIRST)
+    public void packetReceive(final ServerResourcePackSendEvent event) {
+        final ResourcePackInfo resourcePackRequest = event.getProvidedResourcePack();
+        final UUID uuid = event.getServerConnection().getPlayer().getUniqueId();
+        if (map.containsKey(uuid) && Arrays.equals(map.get(uuid), resourcePackRequest.getHash())) {
+            event.setResult(ResultedEvent.GenericResult.denied());
             return;
         }
         map.put(uuid, resourcePackRequest.getHash());
     }
-
-    @Override
-    public void packetSend(PacketSendEvent<ResourcePackRequest> event) {
-
-    }
-
     public void removePlayer(final UUID uuid) {
         map.remove(uuid);
     }
+
 }