From 0ca2f5c50a473b1b2a1c93f7b877a703142b0796 Mon Sep 17 00:00:00 2001
From: retrooper <retrooperdev@gmail.com>
Date: Fri, 22 Sep 2023 15:21:47 +0200
Subject: [PATCH] Minor tweaks to velocity (update api)

---
 .../packetevents/event/ProtocolPacketEvent.java        |  2 +-
 velocity/build.gradle                                  |  7 +++++--
 .../retrooper/packetevents/PacketEventsPlugin.java     | 10 +++++++++-
 .../velocity/factory/VelocityPacketEventsBuilder.java  |  1 -
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/api/src/main/java/com/github/retrooper/packetevents/event/ProtocolPacketEvent.java b/api/src/main/java/com/github/retrooper/packetevents/event/ProtocolPacketEvent.java
index 0d91bbe1df..f8e2dcb1ba 100644
--- a/api/src/main/java/com/github/retrooper/packetevents/event/ProtocolPacketEvent.java
+++ b/api/src/main/java/com/github/retrooper/packetevents/event/ProtocolPacketEvent.java
@@ -81,7 +81,7 @@ public ProtocolPacketEvent(PacketSide packetSide, Object channel,
         this.packetType = PacketType.getById(packetSide, user.getConnectionState(),
                 version, packetID);
         if (this.packetType == null) {
-            // mojang fucked up and keeps sending disconnect packets in the wrong protocol state
+            // mojang messed up and keeps sending disconnect packets in the wrong protocol state
             if (PacketType.getById(packetSide, ConnectionState.PLAY, version, packetID) == PacketType.Play.Server.DISCONNECT) {
                 throw new InvalidDisconnectPacketSend();
             }
diff --git a/velocity/build.gradle b/velocity/build.gradle
index 40447c7718..91e8ff510b 100644
--- a/velocity/build.gradle
+++ b/velocity/build.gradle
@@ -3,6 +3,9 @@ repositories {
     maven {
         url 'https://papermc.io/repo/repository/maven-public/'
     }
+    maven {
+        url 'https://repo.papermc.io/repository/maven-public/'
+    }
 }
 
 shadowJar {
@@ -13,8 +16,8 @@ shadowJar {
 
 dependencies {
     compileOnly 'io.netty:netty-all:4.1.75.Final'
-    compileOnly 'com.velocitypowered:velocity-api:1.0.0-SNAPSHOT'
-    annotationProcessor 'com.velocitypowered:velocity-api:1.0.0-SNAPSHOT'
+    compileOnly 'com.velocitypowered:velocity-api:3.1.0'
+    annotationProcessor 'com.velocitypowered:velocity-api:3.1.0'
     api project(':api')
     implementation project(':netty-common')
     //Velocity ships with adventure & gson
diff --git a/velocity/src/main/java/io/github/retrooper/packetevents/PacketEventsPlugin.java b/velocity/src/main/java/io/github/retrooper/packetevents/PacketEventsPlugin.java
index 23869bbca3..8b6d18a76a 100644
--- a/velocity/src/main/java/io/github/retrooper/packetevents/PacketEventsPlugin.java
+++ b/velocity/src/main/java/io/github/retrooper/packetevents/PacketEventsPlugin.java
@@ -22,8 +22,11 @@
 import com.github.retrooper.packetevents.event.PacketListenerAbstract;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.event.PacketSendEvent;
+import com.github.retrooper.packetevents.netty.channel.ChannelHelper;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientInteractEntity;
+import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerExplosion;
+import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerSystemChatMessage;
 import com.google.inject.Inject;
 import com.velocitypowered.api.event.PostOrder;
 import com.velocitypowered.api.event.Subscribe;
@@ -38,7 +41,7 @@
 
 import java.util.logging.Logger;
 
-@Plugin(id = "packetevents", name = "PacketEvents", version = "2.0.0")
+@Plugin(id = "packetevents", name = "PacketEvents", version = "2.0.2")
 public class PacketEventsPlugin {
     private final ProxyServer server;
     private final Logger logger;
@@ -75,6 +78,11 @@ public void onPacketReceive(PacketReceiveEvent event) {
             @Override
             public void onPacketSend(PacketSendEvent event) {
                 //System.out.println("Outgoing: " + event.getPacketType().getName());
+                /*if (event.getPacketType() == PacketType.Play.Server.SYSTEM_CHAT_MESSAGE) {
+                    System.out.println("Before processing, pipe: " + ChannelHelper.pipelineHandlerNamesAsString(event.getChannel()));
+                    WrapperPlayServerSystemChatMessage msg = new WrapperPlayServerSystemChatMessage(event);
+                    System.out.println("After processing: " + msg.getMessage());
+                }*/
             }
         });
         PacketEvents.getAPI().init();
diff --git a/velocity/src/main/java/io/github/retrooper/packetevents/velocity/factory/VelocityPacketEventsBuilder.java b/velocity/src/main/java/io/github/retrooper/packetevents/velocity/factory/VelocityPacketEventsBuilder.java
index 7aa0d1290d..983a7c1cb6 100644
--- a/velocity/src/main/java/io/github/retrooper/packetevents/velocity/factory/VelocityPacketEventsBuilder.java
+++ b/velocity/src/main/java/io/github/retrooper/packetevents/velocity/factory/VelocityPacketEventsBuilder.java
@@ -169,7 +169,6 @@ public void init() {
                     }
 
                     if (settings.isbStatsEnabled()) {
-                        // TODO Cross-platform metrics?
                     }
 
                     PacketType.Play.Client.load();