From 025a892daf66d00c019422b6d5d531adfe261bb5 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
Date: Wed, 3 Nov 2021 19:17:46 +0100
Subject: [PATCH] 21w44a

---
 build.gradle.kts                                 |  2 +-
 .../Protocol1_17_1To1_18.java                    | 16 ++++++++++++++++
 gradle/libs.versions.toml                        |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 773e3f85..ffddaf3c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 allprojects {
     group = "com.viaversion"
-    version = "4.1.0-21w42a-SNAPSHOT"
+    version = "4.1.0-21w44a-SNAPSHOT"
     description = "Allow older clients to join newer server versions."
 }
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/Protocol1_17_1To1_18.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/Protocol1_17_1To1_18.java
index 18f12eba..fcfeadb7 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/Protocol1_17_1To1_18.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/Protocol1_17_1To1_18.java
@@ -25,6 +25,8 @@ import com.viaversion.viabackwards.protocol.protocol1_17_1to1_18.packets.EntityP
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
 import com.viaversion.viaversion.api.minecraft.entities.Entity1_17Types;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.protocols.protocol1_17_1to1_17.ClientboundPackets1_17_1;
 import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ServerboundPackets1_17;
@@ -58,6 +60,20 @@ public final class Protocol1_17_1To1_18 extends BackwardsProtocol<ClientboundPac
         final TagRewriter tagRewriter = new TagRewriter(this);
         tagRewriter.addEmptyTag(RegistryType.BLOCK, "minecraft:lava_pool_stone_replaceables");
         tagRewriter.registerGeneric(ClientboundPackets1_18.TAGS);
+
+        registerServerbound(ServerboundPackets1_17.CLIENT_SETTINGS, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.STRING); // Language
+                map(Type.BYTE); // View distance
+                map(Type.VAR_INT); // Chat visibility
+                map(Type.BOOLEAN); // Chat colors
+                map(Type.UNSIGNED_BYTE); // Model customization
+                map(Type.VAR_INT); // Main hand
+                map(Type.BOOLEAN); // Text filtering enabled
+                create(Type.BOOLEAN, true); // Allow listing in server list preview
+            }
+        });
     }
 
     @Override
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a0121ccc..ae51b367 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ metadata.format.version = "1.1"
 [versions]
 
 # ViaVersion
-viaver = "4.1.0-21w42a-SNAPSHOT"
+viaver = "4.1.0-21w44a-SNAPSHOT"
 
 # Common provided
 netty = "4.0.20.Final"