implements #74

src/main/java/com/github/creeper123123321/viafabric/handler/FabricDecodeHandler.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.github.creeper123123321.viafabric.handler.serverside;
+package com.github.creeper123123321.viafabric.handler;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
@@ -42,6 +42,10 @@ public class FabricDecodeHandler extends MessageToMessageDecoder<ByteBuf> {
         this.info = info;
     }
 
+    public UserConnection getInfo() {
+        return info;
+    }
+
     @Override
     protected void decode(ChannelHandlerContext ctx, ByteBuf bytebuf, List<Object> out) throws Exception {
         if (!info.checkIncomingPacket()) throw CancelDecoderException.generate(null);

src/main/java/com/github/creeper123123321/viafabric/handler/FabricEncodeHandler.java

@@ -23,13 +23,14 @@
  * SOFTWARE.
  */
 
-package com.github.creeper123123321.viafabric.handler.serverside;
+package com.github.creeper123123321.viafabric.handler;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageEncoder;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.exception.CancelCodecException;
+import us.myles.ViaVersion.exception.CancelDecoderException;
 import us.myles.ViaVersion.exception.CancelEncoderException;
 import us.myles.ViaVersion.util.PipelineUtil;
 
@@ -44,7 +45,7 @@ public class FabricEncodeHandler extends MessageToMessageEncoder<ByteBuf> {
 
     @Override
     protected void encode(final ChannelHandlerContext ctx, ByteBuf bytebuf, final List<Object> out) throws Exception {
-        info.checkOutgoingPacket();
+        if (!info.checkOutgoingPacket()) throw CancelDecoderException.generate(null);
         if (!info.shouldTransformPacket()) {
             out.add(bytebuf.retain());
             return;

src/main/java/com/github/creeper123123321/viafabric/handler/clientside/VRDecodeHandler.java

@@ -1,70 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2018- creeper123123321 <https://creeper123123321.keybase.pub/>
- * Copyright (c) 2019- contributors <https://github.com/ViaVersion/ViaFabric/graphs/contributors>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.github.creeper123123321.viafabric.handler.clientside;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageDecoder;
-import us.myles.ViaVersion.api.data.UserConnection;
-import us.myles.ViaVersion.exception.CancelCodecException;
-import us.myles.ViaVersion.exception.CancelDecoderException;
-
-import java.util.List;
-
-public class VRDecodeHandler extends MessageToMessageDecoder<ByteBuf> {
-    private final UserConnection info;
-
-    public VRDecodeHandler(UserConnection info) {
-        this.info = info;
-    }
-
-    @Override
-    protected void decode(ChannelHandlerContext ctx, ByteBuf bytebuf, List<Object> out) throws Exception {
-        info.checkOutgoingPacket();
-        if (!info.shouldTransformPacket()) {
-            out.add(bytebuf.retain());
-            return;
-        }
-
-        ByteBuf transformedBuf = ctx.alloc().buffer().writeBytes(bytebuf);
-        try {
-            info.transformOutgoing(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 UserConnection getInfo() {
-        return info;
-    }
-}

src/main/java/com/github/creeper123123321/viafabric/handler/clientside/VREncodeHandler.java

@@ -1,66 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2018- creeper123123321 <https://creeper123123321.keybase.pub/>
- * Copyright (c) 2019- contributors <https://github.com/ViaVersion/ViaFabric/graphs/contributors>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.github.creeper123123321.viafabric.handler.clientside;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageEncoder;
-import us.myles.ViaVersion.api.data.UserConnection;
-import us.myles.ViaVersion.exception.CancelCodecException;
-import us.myles.ViaVersion.exception.CancelEncoderException;
-
-import java.util.List;
-
-public class VREncodeHandler extends MessageToMessageEncoder<ByteBuf> {
-    private final UserConnection info;
-
-    public VREncodeHandler(UserConnection info) {
-        this.info = info;
-    }
-
-    @Override
-    protected void encode(ChannelHandlerContext ctx, ByteBuf bytebuf, List<Object> out) throws Exception {
-        if (!info.checkIncomingPacket()) throw CancelEncoderException.generate(null);
-        if (!info.shouldTransformPacket()) {
-            out.add(bytebuf.retain());
-            return;
-        }
-
-        ByteBuf transformedBuf = ctx.alloc().buffer().writeBytes(bytebuf);
-        try {
-            info.transformIncoming(transformedBuf, CancelEncoderException::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);
-    }
-}

src/main/java/com/github/creeper123123321/viafabric/mixin/debug/client/MixinDebugHud.java

@@ -26,7 +26,7 @@
 package com.github.creeper123123321.viafabric.mixin.debug.client;
 
 import com.github.creeper123123321.viafabric.handler.CommonTransformer;
-import com.github.creeper123123321.viafabric.handler.clientside.VRDecodeHandler;
+import com.github.creeper123123321.viafabric.handler.FabricDecodeHandler;
 import io.netty.channel.ChannelHandler;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.hud.DebugHud;
@@ -48,8 +48,8 @@ public class MixinDebugHud {
                 + Via.getManager().getConnectedClients().size() + " frontend)");
         @SuppressWarnings("ConstantConditions") ChannelHandler viaDecoder = ((MixinClientConnectionAccessor) MinecraftClient.getInstance().getNetworkHandler()
                 .getConnection()).getChannel().pipeline().get(CommonTransformer.HANDLER_DECODER_NAME);
-        if (viaDecoder instanceof VRDecodeHandler) {
+        if (viaDecoder instanceof FabricDecodeHandler) {
-            ProtocolInfo protocol = ((VRDecodeHandler) viaDecoder).getInfo().getProtocolInfo();
+            ProtocolInfo protocol = ((FabricDecodeHandler) viaDecoder).getInfo().getProtocolInfo();
             if (protocol != null) {
                 ProtocolVersion serverVer = ProtocolVersion.getProtocol(protocol.getServerProtocolVersion());
                 ProtocolVersion clientVer = ProtocolVersion.getProtocol(protocol.getProtocolVersion());

src/main/java/com/github/creeper123123321/viafabric/mixin/pipeline/MixinServerNetworkIoChInit.java

@@ -26,8 +26,8 @@
 package com.github.creeper123123321.viafabric.mixin.pipeline;
 
 import com.github.creeper123123321.viafabric.handler.CommonTransformer;
-import com.github.creeper123123321.viafabric.handler.serverside.FabricDecodeHandler;
+import com.github.creeper123123321.viafabric.handler.FabricDecodeHandler;
-import com.github.creeper123123321.viafabric.handler.serverside.FabricEncodeHandler;
+import com.github.creeper123123321.viafabric.handler.FabricEncodeHandler;
 import io.netty.channel.Channel;
 import io.netty.channel.socket.SocketChannel;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/com/github/creeper123123321/viafabric/mixin/pipeline/client/MixinClientConnectionChInit.java

@@ -28,9 +28,8 @@ package com.github.creeper123123321.viafabric.mixin.pipeline.client;
 import com.github.creeper123123321.viafabric.ViaFabric;
 import com.github.creeper123123321.viafabric.handler.CommonTransformer;
 import com.github.creeper123123321.viafabric.handler.clientside.ProtocolDetectionHandler;
-import com.github.creeper123123321.viafabric.handler.clientside.VRDecodeHandler;
+import com.github.creeper123123321.viafabric.handler.FabricDecodeHandler;
-import com.github.creeper123123321.viafabric.handler.clientside.VREncodeHandler;
+import com.github.creeper123123321.viafabric.handler.FabricEncodeHandler;
-import com.github.creeper123123321.viafabric.platform.VRClientSideUserConnection;
 import com.github.creeper123123321.viafabric.protocol.ViaFabricHostnameProtocol;
 import io.netty.channel.Channel;
 import io.netty.channel.socket.SocketChannel;
@@ -46,12 +45,12 @@ public class MixinClientConnectionChInit {
     @Inject(method = "initChannel", at = @At(value = "TAIL"), remap = false)
     private void onInitChannel(Channel channel, CallbackInfo ci) {
         if (channel instanceof SocketChannel) {
-            UserConnection user = new VRClientSideUserConnection(channel);
+            UserConnection user = new UserConnection(channel, true);
             new ProtocolPipeline(user).add(ViaFabricHostnameProtocol.INSTANCE);
 
             channel.pipeline()
-                    .addBefore("encoder", CommonTransformer.HANDLER_ENCODER_NAME, new VREncodeHandler(user))
+                    .addBefore("encoder", CommonTransformer.HANDLER_ENCODER_NAME, new FabricEncodeHandler(user))
-                    .addBefore("decoder", CommonTransformer.HANDLER_DECODER_NAME, new VRDecodeHandler(user));
+                    .addBefore("decoder", CommonTransformer.HANDLER_DECODER_NAME, new FabricDecodeHandler(user));
             if (ViaFabric.config.isClientSideEnabled()) {
                 channel.pipeline().addAfter(CommonTransformer.HANDLER_ENCODER_NAME, "via-autoprotocol", new ProtocolDetectionHandler());
             }

src/main/java/com/github/creeper123123321/viafabric/platform/VRClientSideUserConnection.java

@@ -1,67 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2018- creeper123123321 <https://creeper123123321.keybase.pub/>
- * Copyright (c) 2019- contributors <https://github.com/ViaVersion/ViaFabric/graphs/contributors>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.github.creeper123123321.viafabric.platform;
-
-import com.github.creeper123123321.viafabric.handler.CommonTransformer;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import us.myles.ViaVersion.api.data.UserConnection;
-
-public class VRClientSideUserConnection extends UserConnection {
-    public VRClientSideUserConnection(Channel socketChannel) {
-        super(socketChannel);
-    }
-    // Based on https://github.com/Gerrygames/ClientViaVersion/blob/master/src/main/java/de/gerrygames/the5zig/clientviaversion/reflection/Injector.java
-
-    @Override
-    public void sendRawPacket(final ByteBuf packet, boolean currentThread) {
-        Runnable act = () -> getChannel().pipeline().context(CommonTransformer.HANDLER_DECODER_NAME)
-                .fireChannelRead(packet);
-        if (currentThread) {
-            act.run();
-        } else {
-            getChannel().eventLoop().execute(act);
-        }
-    }
-
-    @Override
-    public ChannelFuture sendRawPacketFuture(ByteBuf packet) {
-        getChannel().pipeline().context(CommonTransformer.HANDLER_DECODER_NAME).fireChannelRead(packet);
-        return getChannel().newSucceededFuture();
-    }
-
-    @Override
-    public void sendRawPacketToServer(ByteBuf packet, boolean currentThread) {
-        if (currentThread) {
-            getChannel().pipeline().context(CommonTransformer.HANDLER_ENCODER_NAME).writeAndFlush(packet);
-        } else {
-            getChannel().eventLoop().submit(() -> {
-                getChannel().pipeline().context(CommonTransformer.HANDLER_ENCODER_NAME).writeAndFlush(packet);
-            });
-        }
-    }
-}

src/main/java/com/github/creeper123123321/viafabric/platform/VRConnectionManager.java

@@ -1,36 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2018- creeper123123321 <https://creeper123123321.keybase.pub/>
- * Copyright (c) 2019- contributors <https://github.com/ViaVersion/ViaFabric/graphs/contributors>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.github.creeper123123321.viafabric.platform;
-
-import us.myles.ViaVersion.api.data.UserConnection;
-import us.myles.ViaVersion.api.platform.ViaConnectionManager;
-
-public class VRConnectionManager extends ViaConnectionManager {
-    @Override
-    public boolean isFrontEnd(UserConnection connection) {
-        return !(connection instanceof VRClientSideUserConnection);
-    }
-}

src/main/java/com/github/creeper123123321/viafabric/platform/VRPlatform.java

@@ -83,7 +83,7 @@ public class VRPlatform implements ViaPlatform<UUID> {
         Path configDir = FabricLoader.getInstance().getConfigDirectory().toPath().resolve("ViaFabric");
         config = new VRViaConfig(configDir.resolve("viaversion.yml").toFile());
         dataFolder = configDir.toFile();
-        connectionManager = new VRConnectionManager();
+        connectionManager = new ViaConnectionManager();
         api = new VRViaAPI();
     }
 

src/main/java/com/github/creeper123123321/viafabric/providers/VRVersionProvider.java

@@ -27,7 +27,6 @@ package com.github.creeper123123321.viafabric.providers;
 
 import com.github.creeper123123321.viafabric.ViaFabric;
 import com.github.creeper123123321.viafabric.ViaFabricAddress;
-import com.github.creeper123123321.viafabric.platform.VRClientSideUserConnection;
 import com.github.creeper123123321.viafabric.service.ProtocolAutoDetector;
 import com.github.creeper123123321.viafabric.util.ProtocolUtils;
 import com.google.common.primitives.Ints;
@@ -85,7 +84,7 @@ public class VRVersionProvider extends VersionProvider {
 
     @Override
     public int getServerProtocol(UserConnection connection) throws Exception {
-        if (connection instanceof VRClientSideUserConnection) {
+        if (connection.isClientSide()) {
             ProtocolInfo info = Objects.requireNonNull(connection.getProtocolInfo());
 
             if (!ViaFabric.config.isClientSideEnabled()) {