1.1.15: Velocity b329+ support

Elytrium · Jan 23, 2024 · f9db228 · f9db228
1 parent 1c93575
commit f9db228
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.1.14
+1.1.15
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ plugins {
 }
 
 setGroup("net.elytrium")
-setVersion("1.1.14")
+setVersion("1.1.15")
 
 compileJava {
     getOptions().setEncoding("UTF-8")

diff --git a/src/main/java/net/elytrium/limbofilter/cache/CachedPackets.java b/src/main/java/net/elytrium/limbofilter/cache/CachedPackets.java
@@ -21,11 +21,11 @@
 import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
-import com.velocitypowered.proxy.protocol.packet.Disconnect;
+import com.velocitypowered.proxy.protocol.packet.DisconnectPacket;
 import com.velocitypowered.proxy.protocol.packet.chat.ChatType;
 import com.velocitypowered.proxy.protocol.packet.chat.ComponentHolder;
-import com.velocitypowered.proxy.protocol.packet.chat.SystemChat;
-import com.velocitypowered.proxy.protocol.packet.chat.legacy.LegacyChat;
+import com.velocitypowered.proxy.protocol.packet.chat.SystemChatPacket;
+import com.velocitypowered.proxy.protocol.packet.chat.legacy.LegacyChatPacket;
 import com.velocitypowered.proxy.protocol.packet.title.GenericTitlePacket;
 import java.text.MessageFormat;
 import java.util.UUID;
@@ -321,23 +321,24 @@ private MinecraftPacket createSetSlotPacketModern(PacketFactory packetFactory, V
 
   public void createChatPacket(PreparedPacket packet, String text) {
     packet
-        .prepare(new LegacyChat(
+        .prepare(new LegacyChatPacket(
             ProtocolUtils.getJsonChatSerializer(ProtocolVersion.MINIMUM_VERSION).serialize(
                 LimboFilter.getSerializer().deserialize(text)
-            ), LegacyChat.CHAT_TYPE, null
+            ), LegacyChatPacket.CHAT_TYPE, null
         ), ProtocolVersion.MINIMUM_VERSION, ProtocolVersion.MINECRAFT_1_15_2)
-        .prepare(new LegacyChat(
+        .prepare(new LegacyChatPacket(
             ProtocolUtils.getJsonChatSerializer(ProtocolVersion.MINECRAFT_1_16).serialize(
                 LimboFilter.getSerializer().deserialize(text)
-            ), LegacyChat.CHAT_TYPE, null
+            ), LegacyChatPacket.CHAT_TYPE, null
         ), ProtocolVersion.MINECRAFT_1_16, ProtocolVersion.MINECRAFT_1_18_2)
-        .prepare(version -> new SystemChat(
+        .prepare(version -> new SystemChatPacket(
             new ComponentHolder(version, LimboFilter.getSerializer().deserialize(text)), ChatType.SYSTEM
         ), ProtocolVersion.MINECRAFT_1_19);
   }
 
   private PreparedPacket createDisconnectPacket(LimboFactory factory, String message) {
-    return factory.createPreparedPacket().prepare(version -> Disconnect.create(LimboFilter.getSerializer().deserialize(message), version, false)).build();
+    return factory.createPreparedPacket().prepare(version ->
+        DisconnectPacket.create(LimboFilter.getSerializer().deserialize(message), version, false)).build();
   }
 
   public void createTitlePacket(PreparedPacket preparedPacket, String title, String subtitle) {

diff --git a/src/main/java/net/elytrium/limbofilter/handler/BotFilterSessionHandler.java b/src/main/java/net/elytrium/limbofilter/handler/BotFilterSessionHandler.java
@@ -19,8 +19,8 @@
 
 import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.proxy.Player;
-import com.velocitypowered.proxy.protocol.packet.ClientSettings;
-import com.velocitypowered.proxy.protocol.packet.PluginMessage;
+import com.velocitypowered.proxy.protocol.packet.ClientSettingsPacket;
+import com.velocitypowered.proxy.protocol.packet.PluginMessagePacket;
 import com.velocitypowered.proxy.protocol.util.PluginMessageUtil;
 import java.util.HashMap;
 import java.util.Map;
@@ -272,16 +272,16 @@ private boolean equalsCaptchaAnswer(String message) {
 
   @Override
   public void onGeneric(Object packet) {
-    if (packet instanceof PluginMessage) {
-      PluginMessage pluginMessage = (PluginMessage) packet;
+    if (packet instanceof PluginMessagePacket) {
+      PluginMessagePacket pluginMessage = (PluginMessagePacket) packet;
       if (PluginMessageUtil.isMcBrand(pluginMessage) && !this.checkedByBrand) {
         String brand = PluginMessageUtil.readBrandMessage(pluginMessage.content());
         LimboFilter.getLogger().info("{} has client brand {}", this.proxyPlayer, brand);
         if (!Settings.IMP.MAIN.BLOCKED_CLIENT_BRANDS.contains(brand)) {
           this.checkedByBrand = true;
         }
       }
-    } else if (packet instanceof ClientSettings) {
+    } else if (packet instanceof ClientSettingsPacket) {
       if (Settings.IMP.MAIN.CHECK_CLIENT_SETTINGS && !this.checkedBySettings) {
         this.checkedBySettings = true;
       }