From 56b3e56c9f9171f045bcfeb549e4a77613f2e0eb Mon Sep 17 00:00:00 2001
From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com>
Date: Sun, 21 Apr 2024 18:26:59 +0200
Subject: [PATCH] Move out handshake accessor interface

---
 README.md                                                  | 2 +-
 .../mixin/pipeline/client/MixinHandshakeC2SPacket.java     | 4 ++--
 .../fabric/mc1122/service/HandshakeInterceptor.java        | 6 ++++++
 .../fabric/mc1122/service/ProtocolAutoDetector.java        | 7 +------
 4 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/service/HandshakeInterceptor.java

diff --git a/README.md b/README.md
index c524f50..e6b9b19 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 
 Allows the connection to/from different Minecraft versions on your Minecraft client/server (LAN worlds too)
 
-This mod can be installed on 1.8.9, 1.12.2, 1.14.4, 1.15.2, 1.16.5, 1.17.1, 1.18.2, 1.19.4, 1.20.4 with Fabric Loader.
+This mod can be installed on 1.8.9, 1.12.2, 1.14.4, 1.15.2, 1.16.5, 1.17.1, 1.18.2, 1.19.4, 1.20.4, 1.20.5 with Fabric Loader.
 
 ## Dependencies
 
diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/pipeline/client/MixinHandshakeC2SPacket.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/pipeline/client/MixinHandshakeC2SPacket.java
index 0739cc3..1f3a7a3 100644
--- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/pipeline/client/MixinHandshakeC2SPacket.java
+++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/pipeline/client/MixinHandshakeC2SPacket.java
@@ -1,12 +1,12 @@
 package com.viaversion.fabric.mc1122.mixin.pipeline.client;
 
-import com.viaversion.fabric.mc1122.service.ProtocolAutoDetector;
+import com.viaversion.fabric.mc1122.service.HandshakeInterceptor;
 import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(HandshakeC2SPacket.class)
-public class MixinHandshakeC2SPacket implements ProtocolAutoDetector.IHandshakeC2SPacket {
+public class MixinHandshakeC2SPacket implements HandshakeInterceptor {
 
     @Shadow
     private int protocolVersion;
diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/service/HandshakeInterceptor.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/service/HandshakeInterceptor.java
new file mode 100644
index 0000000..177afee
--- /dev/null
+++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/service/HandshakeInterceptor.java
@@ -0,0 +1,6 @@
+package com.viaversion.fabric.mc1122.service;
+
+public interface HandshakeInterceptor {
+
+    void viaFabric$setProtocolVersion(final int version);
+}
\ No newline at end of file
diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/service/ProtocolAutoDetector.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/service/ProtocolAutoDetector.java
index 5bd2428..d3a7d81 100644
--- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/service/ProtocolAutoDetector.java
+++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/service/ProtocolAutoDetector.java
@@ -113,7 +113,7 @@ public class ProtocolAutoDetector {
 
                                 HandshakeC2SPacket handshakeC2SPacket = new HandshakeC2SPacket(address.getHostString(),
                                         address.getPort(), NetworkState.STATUS);
-                                ((IHandshakeC2SPacket) handshakeC2SPacket).viaFabric$setProtocolVersion(
+                                ((HandshakeInterceptor) handshakeC2SPacket).viaFabric$setProtocolVersion(
                                         Via.getAPI().getServerVersion().lowestSupportedVersion());
                                 clientConnection.send(handshakeC2SPacket);
                                 clientConnection.send(new QueryRequestC2SPacket());
@@ -138,9 +138,4 @@ public class ProtocolAutoDetector {
             return CompletableFuture.completedFuture(null);
         }
     }
-
-    public interface IHandshakeC2SPacket {
-
-        void viaFabric$setProtocolVersion(final int version);
-    }
 }