feat: Re-added secure chat popup support

Author: 4drian3d

gradle/libs.versions.toml

@@ -34,7 +34,7 @@ fabric-loader = { group = "net.fabricmc", name = "fabric-loader", version.ref =
 
 bstats = { module = "org.bstats:bstats-velocity", version.ref = "bstats" }
 
-packetevents = { group = "com.github.retrooper.packetevents", name = "velocity", version = "2.3.0" }
+packetevents = { group = "com.github.retrooper", name = "packetevents-velocity", version = "2.4.0" }
 vpacketevents = { group = "io.github.4drian3d", name = "vpacketevents-api", version = "1.1.0" }
 
 annotations = "org.jetbrains:annotations:24.1.0"

velocity/src/main/java/io/github/_4drian3d/signedvelocity/velocity/packet/PacketEventsAdapter.java

@@ -5,6 +5,7 @@
 import com.github.retrooper.packetevents.event.PacketListenerPriority;
 import com.github.retrooper.packetevents.event.PacketSendEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
+import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerJoinGame;
 import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerServerData;
 
 final class PacketEventsAdapter implements PacketAdapter {
@@ -19,13 +20,14 @@ public void register() {
   private static final class DataListener implements PacketListener {
     @Override
     public void onPacketSend(final PacketSendEvent event) {
-      if (event.getPacketType() != PacketType.Play.Server.SERVER_DATA) {
-        return;
-      }
-      final WrapperPlayServerServerData packet = new WrapperPlayServerServerData(event);
-      if (!packet.isEnforceSecureChat()) {
+      if (event.getPacketType() == PacketType.Play.Server.SERVER_DATA) {
+        final WrapperPlayServerServerData packet = new WrapperPlayServerServerData(event);
         packet.setEnforceSecureChat(true);
       }
+      if (event.getPacketType() == PacketType.Play.Server.JOIN_GAME) {
+        final WrapperPlayServerJoinGame packet = new WrapperPlayServerJoinGame(event);
+        packet.setEnforcesSecureChat(true);
+      }
     }
   }
 }

velocity/src/main/java/io/github/_4drian3d/signedvelocity/velocity/packet/VPacketEventsAdapter.java

@@ -2,24 +2,12 @@
 
 import com.google.inject.Inject;
 import com.velocitypowered.api.event.EventManager;
+import com.velocitypowered.proxy.protocol.packet.JoinGamePacket;
 import com.velocitypowered.proxy.protocol.packet.ServerDataPacket;
 import io.github._4drian3d.signedvelocity.velocity.SignedVelocity;
 import io.github._4drian3d.vpacketevents.api.event.PacketSendEvent;
 
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-
 final class VPacketEventsAdapter implements PacketAdapter {
-  private static final MethodHandle ENFORCED_SETTER;
-
-  static {
-    try {
-      final MethodHandles.Lookup lookup = MethodHandles.privateLookupIn(ServerDataPacket.class, MethodHandles.lookup());
-      ENFORCED_SETTER = lookup.findSetter(ServerDataPacket.class, "secureChatEnforced", Boolean.TYPE);
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
 
   @Inject
   private EventManager eventManager;
@@ -29,16 +17,11 @@ final class VPacketEventsAdapter implements PacketAdapter {
   @Override
   public void register() {
     eventManager.register(plugin, PacketSendEvent.class, event -> {
-      if (!(event.getPacket() instanceof final ServerDataPacket serverData)) {
-        return;
-      }
-      if (serverData.isSecureChatEnforced()) {
-        return;
+      if (event.getPacket() instanceof final ServerDataPacket serverData) {
+        serverData.setSecureChatEnforced(true);
       }
-      try {
-        ENFORCED_SETTER.invoke(serverData, true);
-      } catch (Throwable e) {
-        throw new RuntimeException(e);
+      if (event.getPacket() instanceof final JoinGamePacket joinPacket) {
+        joinPacket.setEnforcesSecureChat(true);
       }
     });
   }