From 1fb3df2e12d3316750a5830decfa73596bf9df0f Mon Sep 17 00:00:00 2001
From: RaphiMC <50594595+RaphiMC@users.noreply.github.com>
Date: Thu, 5 Oct 2023 23:33:11 +0200
Subject: [PATCH] Initial Via 4.8.1 update (non working)

---
 build.gradle                                      |  2 +-
 .../Protocolb1_5_0_2tob1_4_0_1.java               |  6 ++++++
 .../Protocol1_3_1_2to1_2_4_5.java                 |  4 ++--
 .../Protocol1_7_2_5to1_6_4.java                   | 15 ++++++++++-----
 .../baseprotocols/PreNettyBaseProtocol.java       |  8 ++++++++
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 40a40c5..054abe2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly "com.viaversion:viaversion:4.8.0"
+    compileOnly "com.viaversion:viaversion:4.8.1"
     compileOnly "org.yaml:snakeyaml:2.2"
     compileOnly "com.google.guava:guava:32.1.2-jre"
     compileOnly "io.netty:netty-handler:4.1.99.Final"
diff --git a/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_5_0_2tob1_4_0_1/Protocolb1_5_0_2tob1_4_0_1.java b/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_5_0_2tob1_4_0_1/Protocolb1_5_0_2tob1_4_0_1.java
index 7562c5f..97ef01d 100644
--- a/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_5_0_2tob1_4_0_1/Protocolb1_5_0_2tob1_4_0_1.java
+++ b/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_5_0_2tob1_4_0_1/Protocolb1_5_0_2tob1_4_0_1.java
@@ -50,6 +50,12 @@ public class Protocolb1_5_0_2tob1_4_0_1 extends AbstractProtocol<ClientboundPack
                 map(Typesb1_7_0_3.STRING, Types1_6_4.STRING); // server hash
             }
         });
+        this.registerClientbound(ClientboundPacketsb1_4.HANDSHAKE, ClientboundPacketsb1_5.HANDSHAKE, new PacketHandlers() {
+            @Override
+            public void register() {
+                map(Typesb1_7_0_3.STRING, Types1_6_4.STRING); // server hash
+            }
+        });
         this.registerClientbound(State.LOGIN, ClientboundPacketsb1_4.DISCONNECT.getId(), ClientboundPacketsb1_5.DISCONNECT.getId(), new PacketHandlers() {
             @Override
             public void register() {
diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_3_1_2to1_2_4_5/Protocol1_3_1_2to1_2_4_5.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_3_1_2to1_2_4_5/Protocol1_3_1_2to1_2_4_5.java
index 870483e..6004efb 100644
--- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_3_1_2to1_2_4_5/Protocol1_3_1_2to1_2_4_5.java
+++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_3_1_2to1_2_4_5/Protocol1_3_1_2to1_2_4_5.java
@@ -848,10 +848,10 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
         login.write(Type.BYTE, (byte) 0); // world height
         login.write(Type.BYTE, (byte) 0); // max players
 
-        final State oldState = info.getState();
+        final State oldState = info.getClientState();
         info.setState(State.LOGIN);
         login.sendToServer(Protocol1_3_1_2to1_2_4_5.class);
-        info.setState(oldState);
+        info.setClientState(oldState);
     }
 
     @Override
diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/Protocol1_7_2_5to1_6_4.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/Protocol1_7_2_5to1_6_4.java
index c95e8c3..05f8633 100644
--- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/Protocol1_7_2_5to1_6_4.java
+++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/Protocol1_7_2_5to1_6_4.java
@@ -33,6 +33,7 @@ import com.viaversion.viaversion.api.protocol.AbstractProtocol;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2IntMap;
 import com.viaversion.viaversion.libs.fastutil.objects.Object2IntMap;
@@ -124,9 +125,13 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
                     if (!protocolMetadata.skipEncryption) {
                         Via.getManager().getProviders().get(EncryptionProvider.class).enableDecryption(wrapper.user());
                     }
-                    info.setState(State.PLAY);
+
+                    // Parts of BaseProtocol1_7 GAME_PROFILE handler
+                    if (info.getProtocolVersion() < ProtocolVersion.v1_20_2.getVersion()) {
+                        info.setState(State.PLAY);
+                    }
                     Via.getManager().getConnectionManager().onLoginSuccess(wrapper.user());
-                    if (info.getPipeline().pipes().stream().allMatch(Via.getManager().getProtocolManager()::isBaseProtocol)) {
+                    if (!info.getPipeline().hasNonBaseProtocols()) {
                         wrapper.user().setActive(false);
                     }
                     if (Via.getManager().isDebug()) {
@@ -481,8 +486,8 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
                     for (int i = 0; i < amount; i++) {
                         wrapper.write(Type.STRING, wrapper.read(Types1_6_4.STRING)); // id
                         wrapper.passthrough(Type.DOUBLE); // baseValue
-                        final int modifierlength = wrapper.passthrough(Type.SHORT); // modifier count
-                        for (int x = 0; x < modifierlength; x++) {
+                        final int modifierCount = wrapper.passthrough(Type.SHORT); // modifier count
+                        for (int x = 0; x < modifierCount; x++) {
                             wrapper.passthrough(Type.UUID); // modifier uuid
                             wrapper.passthrough(Type.DOUBLE); // modifier amount
                             wrapper.passthrough(Type.BYTE); // modifier operation
@@ -1190,7 +1195,7 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
             userConnection.getChannel().pipeline().addFirst(new ChannelOutboundHandlerAdapter() {
                 @Override
                 public void close(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
-                    if (userConnection.getProtocolInfo().getState().equals(State.PLAY) && ctx.channel().isWritable() && userConnection.get(PlayerInfoStorage.class).entityId != -1) {
+                    if (ctx.channel().isWritable() && userConnection.getProtocolInfo().getClientState().equals(State.PLAY) && userConnection.get(PlayerInfoStorage.class).entityId != -1) {
                         final PacketWrapper disconnect = PacketWrapper.create(ServerboundPackets1_6_4.DISCONNECT, userConnection);
                         disconnect.write(Types1_6_4.STRING, "Quitting"); // reason
                         disconnect.sendToServer(Protocol1_7_2_5to1_6_4.class);
diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/baseprotocols/PreNettyBaseProtocol.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/baseprotocols/PreNettyBaseProtocol.java
index d51556d..f41e71d 100644
--- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/baseprotocols/PreNettyBaseProtocol.java
+++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/baseprotocols/PreNettyBaseProtocol.java
@@ -17,12 +17,14 @@
  */
 package net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.baseprotocols;
 
+import com.viaversion.viaversion.api.connection.ProtocolInfo;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.AbstractSimpleProtocol;
 import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.base.ServerboundHandshakePackets;
+import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets;
 import net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.storage.HandshakeStorage;
 import net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.storage.ProtocolMetadataStorage;
 
@@ -48,6 +50,12 @@ public class PreNettyBaseProtocol extends AbstractSimpleProtocol {
                 });
             }
         });
+
+        // Copied from BaseProtocol1_7
+        this.registerServerbound(State.LOGIN, ServerboundLoginPackets.LOGIN_ACKNOWLEDGED.getId(), ServerboundLoginPackets.LOGIN_ACKNOWLEDGED.getId(), wrapper -> {
+            final ProtocolInfo info = wrapper.user().getProtocolInfo();
+            info.setState(State.CONFIGURATION);
+        });
     }
 
     @Override