fix: viaversion injection for 1.20.2+

RelativityMC · Dec 3, 2024 · 80ae165 · 80ae165
1 parent 2f73221
commit 80ae165
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/...in/java/com/ishland/raknetify/fabric/common/compat/viafabric/ViaFabricCompatInjector.java b/...in/java/com/ishland/raknetify/fabric/common/compat/viafabric/ViaFabricCompatInjector.java
@@ -25,8 +25,10 @@
 package com.ishland.raknetify.fabric.common.compat.viafabric;
 
 import com.google.common.base.Preconditions;
+import com.ishland.raknetify.fabric.mixin.RaknetifyFabricMixinPlugin;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
+import io.netty.channel.ChannelPipeline;
 import io.netty.handler.codec.MessageToMessageDecoder;
 import io.netty.handler.codec.MessageToMessageEncoder;
 import net.fabricmc.loader.api.FabricLoader;
@@ -46,7 +48,17 @@ public static void inject(Channel channel, boolean isClientSide) {
                 final Class<?> userConnectionClass = Class.forName("com.viaversion.viaversion.api.connection.UserConnection");
 
                 final Class<?> protocolPipelineImplClass = Class.forName("com.viaversion.viaversion.protocol.ProtocolPipelineImpl");
-                protocolPipelineImplClass.getConstructor(userConnectionClass).newInstance(user);
+                Object protocolPipeline = protocolPipelineImplClass.getConstructor(userConnectionClass).newInstance(user);
+
+                if (RaknetifyFabricMixinPlugin.AFTER_1_20_2) {
+                    Class<?> protocolPipelineClass = Class.forName("com.viaversion.viaversion.api.protocol.ProtocolPipeline");
+                    Class<?> protocolClass = Class.forName("com.viaversion.viaversion.api.protocol.Protocol");
+                    if ((boolean) userConnectionClass.getMethod("isClientSide").invoke(user)) {
+                        Class<?> hostnameParserProtocolClass = Class.forName("com.viaversion.fabric.common.protocol.HostnameParserProtocol");
+                        Object hostnameParserProtocolInstance = hostnameParserProtocolClass.getField("INSTANCE").get(null);
+                        protocolPipelineClass.getMethod("add", protocolClass).invoke(protocolPipeline, hostnameParserProtocolInstance);
+                    }
+                }
 
                 final Class<?> commonTransformerClass = Class.forName("com.viaversion.fabric.common.handler.CommonTransformer");
                 final String handlerEncoderName = (String) commonTransformerClass.getField("HANDLER_ENCODER_NAME").get(null);
@@ -58,8 +70,8 @@ public static void inject(Channel channel, boolean isClientSide) {
                 @SuppressWarnings("unchecked") final Class<? extends MessageToMessageDecoder<ByteBuf>> fabricDecodeHandlerClass = (Class<? extends MessageToMessageDecoder<ByteBuf>>) Class.forName("com.viaversion.fabric.common.handler.FabricDecodeHandler");
                 final MessageToMessageDecoder<ByteBuf> fabricDecodeHandler = fabricDecodeHandlerClass.getConstructor(userConnectionClass).newInstance(user);
 
-                channel.pipeline().addBefore("encoder", handlerEncoderName, fabricEncodeHandler);
-                channel.pipeline().addBefore("decoder", handlerDecoderName, fabricDecodeHandler);
+                channel.pipeline().addBefore(determineEncoderName(channel.pipeline()), handlerEncoderName, fabricEncodeHandler);
+                channel.pipeline().addBefore(determineDecoderName(channel.pipeline()), handlerDecoderName, fabricDecodeHandler);
             } catch (Throwable t) {
                 //noinspection RedundantStringFormatCall
                 System.err.println(String.format("Raknetify: Could not inject ViaVersion compatibility into RakNet channel %s: %s", channel, t));
@@ -68,4 +80,16 @@ public static void inject(Channel channel, boolean isClientSide) {
         }
     }
 
+    private static String determineEncoderName(ChannelPipeline pipeline) {
+        if (pipeline.get("encoder") != null) return "encoder";
+        if (pipeline.get("outbound_config") != null) return "outbound_config";
+        throw new UnsupportedOperationException();
+    }
+
+    private static String determineDecoderName(ChannelPipeline pipeline) {
+        if (pipeline.get("decoder") != null) return "decoder";
+        if (pipeline.get("inbound_config") != null) return "inbound_config";
+        throw new UnsupportedOperationException();
+    }
+
 }
diff --git a/fabric/src/main/java/com/ishland/raknetify/fabric/mixin/RaknetifyFabricMixinPlugin.java b/fabric/src/main/java/com/ishland/raknetify/fabric/mixin/RaknetifyFabricMixinPlugin.java
@@ -39,12 +39,14 @@
 public class RaknetifyFabricMixinPlugin implements IMixinConfigPlugin {
 
     public static final boolean AFTER_1_20_1;
+    public static final boolean AFTER_1_20_2;
     public static final boolean AFTER_1_20_4;
     public static final boolean AFTER_1_20_5;
 
     static {
         try {
             AFTER_1_20_1 = VersionPredicate.parse(">1.20.1").test(FabricLoader.getInstance().getModContainer("minecraft").get().getMetadata().getVersion());
+            AFTER_1_20_2 = VersionPredicate.parse(">1.20.2").test(FabricLoader.getInstance().getModContainer("minecraft").get().getMetadata().getVersion());
             AFTER_1_20_4 = VersionPredicate.parse(">1.20.4").test(FabricLoader.getInstance().getModContainer("minecraft").get().getMetadata().getVersion());
             AFTER_1_20_5 = VersionPredicate.parse(">1.20.5").test(FabricLoader.getInstance().getModContainer("minecraft").get().getMetadata().getVersion());
         } catch (VersionParsingException e) {