Merge branch 'update-api'

Author: florianreuth

README.md

@@ -1,10 +1,6 @@
 # ViaBungee
 
-> [!WARNING]  
-> This currently only works if **both client and server are below 1.20.2**.
-
-See https://github.com/ViaVersion/ViaVersion for the main project. Note that we recommend putting ViaVersion on your 
-backend servers, or switching to [Velocity](https://github.com/PaperMC/Velocity) or [ViaProxy](https://github.com/ViaVersion/ViaProxy) with [BungeeViaProxy plugin](https://github.com/ViaVersionAddons/BungeeViaProxy) as ViaBungee is fairly unstable due to platform limitations.
+See https://github.com/ViaVersion/ViaVersion for the main project.
 
 ## To get started
 

build.gradle.kts

@@ -11,7 +11,7 @@ dependencies {
     compileOnly("com.viaversion:viabackwards-common:5.2.1")
     compileOnly("com.viaversion:viarewind-common:4.0.5")
     compileOnly("com.viaversion:viaaprilfools-common:4.0.0")
-    compileOnly("net.md-5:bungeecord-api:1.20-R0.3-SNAPSHOT")
+    compileOnly("net.md-5:bungeecord-api:1.21-R0.1-SNAPSHOT")
     implementation("net.lenni0451:Reflect:1.4.0")
 }
 

settings.gradle.kts

@@ -3,6 +3,7 @@ rootProject.name = "viabungee"
 dependencyResolutionManagement {
     repositories {
         maven("https://repo.viaversion.com")
+        maven("https://oss.sonatype.org/content/groups/public")
         maven("https://repo.papermc.io/repository/maven-public/")
         maven("https://maven.lenni0451.net/everything")
         mavenCentral()

src/main/java/com/viaversion/bungee/ViaBungeePlatform.java

@@ -51,7 +51,6 @@
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Plugin;
-import net.md_5.bungee.protocol.ProtocolConstants;
 
 public final class ViaBungeePlatform implements ViaServerProxyPlatform<ProxiedPlayer> {
     private final ProtocolDetectorService protocolDetectorService = new ProtocolDetectorService();
@@ -63,8 +62,8 @@ public final class ViaBungeePlatform implements ViaServerProxyPlatform<ProxiedPl
     public ViaBungeePlatform(final ViaBungeePlugin plugin, final File pluginFolder) {
         this.plugin = plugin;
         try {
-            ProtocolConstants.class.getField("MINECRAFT_1_21");
-        } catch (final NoSuchFieldException e) {
+            ProxyServer.getInstance().unsafe();
+        } catch (final NoSuchMethodError e) {
             getLogger().warning("      / \\");
             getLogger().warning("     /   \\");
             getLogger().warning("    /  |  \\");
@@ -74,9 +73,6 @@ public ViaBungeePlatform(final ViaBungeePlugin plugin, final File pluginFolder)
             getLogger().warning("/_____________\\");
         }
 
-        getLogger().warning("ViaVersion does not work as intended across many different server versions, especially the more recent ones. " +
-            "Consider moving Via plugins to your backend server or switching to Velocity.");
-
         api = new BungeeViaAPI();
         viaConfig = new BungeeViaConfig(getDataFolder(), getLogger());
         bungeeConfig = new ViaBungeeConfig(new File(pluginFolder, "config.yml"), getLogger());

src/main/java/com/viaversion/bungee/handlers/BungeeChannelInitializer.java

@@ -20,6 +20,8 @@
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.exception.CancelCodecException;
 import com.viaversion.viaversion.exception.CancelDecoderException;
+import com.viaversion.viaversion.util.ByteBufUtil;
+import com.viaversion.viaversion.util.PipelineUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
@@ -28,36 +30,40 @@
 
 @ChannelHandler.Sharable
 public class BungeeDecodeHandler extends MessageToMessageDecoder<ByteBuf> {
-    private final UserConnection info;
 
-    public BungeeDecodeHandler(UserConnection info) {
-        this.info = info;
+    private final UserConnection user;
+
+    public BungeeDecodeHandler(UserConnection user) {
+        this.user = user;
     }
 
     @Override
-    protected void decode(final ChannelHandlerContext ctx, ByteBuf bytebuf, List<Object> out) throws Exception {
-        if (!ctx.channel().isActive()) {
+    protected void decode(final ChannelHandlerContext ctx, ByteBuf bytebuf, List<Object> out) {
+        if (!user.checkServerboundPacket()) {
             throw CancelDecoderException.generate(null);
         }
-
-        if (!info.checkServerboundPacket()) throw CancelDecoderException.generate(null);
-        if (!info.shouldTransformPacket()) {
+        if (!user.shouldTransformPacket()) {
             out.add(bytebuf.retain());
             return;
         }
 
-        ByteBuf transformedBuf = ctx.alloc().buffer().writeBytes(bytebuf);
+        ByteBuf transformedBuf = ByteBufUtil.copy(ctx.alloc(), bytebuf);
         try {
-            info.transformServerbound(transformedBuf, CancelDecoderException::generate);
+            user.transformIncoming(transformedBuf, CancelDecoderException::generate);
             out.add(transformedBuf.retain());
         } finally {
             transformedBuf.release();
         }
     }
 
     @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        if (cause instanceof CancelCodecException) return;
-        super.exceptionCaught(ctx, cause);
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+        try {
+            super.channelRead(ctx, msg);
+        } catch (Throwable e) {
+            if (!PipelineUtil.containsCause(e, CancelCodecException.class)) {
+                throw e;
+            }
+        }
     }
 }

src/main/java/com/viaversion/bungee/handlers/BungeeDecodeHandler.java

@@ -17,96 +17,61 @@
  */
 package com.viaversion.bungee.handlers;
 
-import com.viaversion.bungee.util.BungeePipelineUtil;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.exception.CancelCodecException;
 import com.viaversion.viaversion.exception.CancelEncoderException;
+import com.viaversion.viaversion.util.ByteBufUtil;
+import com.viaversion.viaversion.util.PipelineUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
 import io.netty.handler.codec.MessageToMessageEncoder;
 import java.util.List;
 
 @ChannelHandler.Sharable
 public class BungeeEncodeHandler extends MessageToMessageEncoder<ByteBuf> {
-    private final UserConnection info;
-    private boolean handledCompression;
 
-    public BungeeEncodeHandler(UserConnection info) {
-        this.info = info;
+    private final UserConnection connection;
+
+    public BungeeEncodeHandler(UserConnection connection) {
+        this.connection = connection;
     }
 
     @Override
-    protected void encode(final ChannelHandlerContext ctx, ByteBuf bytebuf, List<Object> out) throws Exception {
-        if (!ctx.channel().isActive()) {
+    protected void encode(final ChannelHandlerContext ctx, ByteBuf bytebuf, List<Object> out) {
+        if (!connection.checkClientboundPacket()) {
             throw CancelEncoderException.generate(null);
         }
-
-        if (!info.checkClientboundPacket()) throw CancelEncoderException.generate(null);
-        if (!info.shouldTransformPacket()) {
+        if (!connection.shouldTransformPacket()) {
             out.add(bytebuf.retain());
             return;
         }
 
-        ByteBuf transformedBuf = ctx.alloc().buffer().writeBytes(bytebuf);
+        ByteBuf transformedBuf = ByteBufUtil.copy(ctx.alloc(), bytebuf);
         try {
-            boolean needsCompress = handleCompressionOrder(ctx, transformedBuf);
-            info.transformClientbound(transformedBuf, CancelEncoderException::generate);
-
-            if (needsCompress) {
-                recompress(ctx, transformedBuf);
-            }
-
+            connection.transformOutgoing(transformedBuf, CancelEncoderException::generate);
             out.add(transformedBuf.retain());
         } finally {
             transformedBuf.release();
         }
     }
 
-    private boolean handleCompressionOrder(ChannelHandlerContext ctx, ByteBuf buf) {
-        boolean needsCompress = false;
-        if (!handledCompression && ctx.pipeline().names().indexOf("compress") > ctx.pipeline().names().indexOf("via-encoder")) {
-            // Need to decompress this packet due to bad order
-            ByteBuf decompressed = BungeePipelineUtil.decompress(ctx, buf);
-
-            // Ensure the buffer wasn't reused
-            if (buf != decompressed) {
-                try {
-                    buf.clear().writeBytes(decompressed);
-                } finally {
-                    decompressed.release();
-                }
-            }
-
-            // Reorder the pipeline
-            ChannelHandler decoder = ctx.pipeline().get("via-decoder");
-            ChannelHandler encoder = ctx.pipeline().get("via-encoder");
-            ctx.pipeline().remove(decoder);
-            ctx.pipeline().remove(encoder);
-            ctx.pipeline().addAfter("decompress", "via-decoder", decoder);
-            ctx.pipeline().addAfter("compress", "via-encoder", encoder);
-            needsCompress = true;
-            handledCompression = true;
-        }
-        return needsCompress;
-    }
 
-    private void recompress(ChannelHandlerContext ctx, ByteBuf buf) {
-        ByteBuf compressed = BungeePipelineUtil.compress(ctx, buf);
+    @Override
+    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
         try {
-            buf.clear().writeBytes(compressed);
-        } finally {
-            compressed.release();
+            super.write(ctx, msg, promise);
+        } catch (Throwable e) {
+            if (!PipelineUtil.containsCause(e, CancelCodecException.class)) {
+                throw e;
+            } else {
+                promise.setSuccess();
+            }
         }
     }
 
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        if (cause instanceof CancelCodecException) return;
-        super.exceptionCaught(ctx, cause);
-    }
-
     public UserConnection connection() {
-        return info;
+        return connection;
     }
 }