From 891f55192d64c9a9dd867aeb015c1980d84666cb Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Wed, 3 May 2023 15:21:24 +0200
Subject: [PATCH] 23w18a, maybe

---
 .../Protocol1_16To1_15_2.java                 |  4 +--
 .../provider/PlayerAbilitiesProvider.java     |  5 +--
 .../packets/InventoryPackets.java             | 36 ++++++++++++++++++-
 gradle.properties                             |  2 +-
 4 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
index 7be3bcd5c..f62c588d1 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
@@ -200,8 +200,8 @@ public class Protocol1_16To1_15_2 extends AbstractProtocol<ClientboundPackets1_1
             wrapper.passthrough(Type.BYTE); // Flags
 
             final PlayerAbilitiesProvider playerAbilities = Via.getManager().getProviders().get(PlayerAbilitiesProvider.class);
-            wrapper.write(Type.FLOAT, playerAbilities.getFlyingSpeed());
-            wrapper.write(Type.FLOAT, playerAbilities.getWalkingSpeed());
+            wrapper.write(Type.FLOAT, playerAbilities.getFlyingSpeed(wrapper.user()));
+            wrapper.write(Type.FLOAT, playerAbilities.getWalkingSpeed(wrapper.user()));
         });
 
         cancelServerbound(ServerboundPackets1_16.GENERATE_JIGSAW);
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/provider/PlayerAbilitiesProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/provider/PlayerAbilitiesProvider.java
index 639760e9a..764ec8456 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/provider/PlayerAbilitiesProvider.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/provider/PlayerAbilitiesProvider.java
@@ -17,15 +17,16 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider;
 
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.platform.providers.Provider;
 
 public class PlayerAbilitiesProvider implements Provider {
 
-    public float getFlyingSpeed() {
+    public float getFlyingSpeed(final UserConnection connection) {
         return 0.05F;
     }
 
-    public float getWalkingSpeed() {
+    public float getWalkingSpeed(final UserConnection connection) {
         return 0.1F;
     }
 }
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/packets/InventoryPackets.java
index e66207e95..644927ecb 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/packets/InventoryPackets.java
@@ -54,7 +54,6 @@ public final class InventoryPackets extends ItemRewriter<ClientboundPackets1_19_
         registerSetCooldown(ClientboundPackets1_19_4.COOLDOWN);
         registerWindowItems1_17_1(ClientboundPackets1_19_4.WINDOW_ITEMS);
         registerSetSlot1_17_1(ClientboundPackets1_19_4.SET_SLOT);
-        registerAdvancements(ClientboundPackets1_19_4.ADVANCEMENTS, Type.FLAT_VAR_INT_ITEM);
         registerEntityEquipmentArray(ClientboundPackets1_19_4.ENTITY_EQUIPMENT);
         registerClickWindow1_17_1(ServerboundPackets1_19_4.CLICK_WINDOW);
         registerTradeList1_19(ClientboundPackets1_19_4.TRADE_LIST);
@@ -62,6 +61,41 @@ public final class InventoryPackets extends ItemRewriter<ClientboundPackets1_19_
         registerWindowPropertyEnchantmentHandler(ClientboundPackets1_19_4.WINDOW_PROPERTY);
         registerSpawnParticle1_19(ClientboundPackets1_19_4.SPAWN_PARTICLE);
 
+        protocol.registerClientbound(ClientboundPackets1_19_4.ADVANCEMENTS, wrapper -> {
+            wrapper.passthrough(Type.BOOLEAN); // Reset/clear
+            int size = wrapper.passthrough(Type.VAR_INT); // Mapping size
+            for (int i = 0; i < size; i++) {
+                wrapper.passthrough(Type.STRING); // Identifier
+
+                // Parent
+                if (wrapper.passthrough(Type.BOOLEAN))
+                    wrapper.passthrough(Type.STRING);
+
+                // Display data
+                if (wrapper.passthrough(Type.BOOLEAN)) {
+                    wrapper.passthrough(Type.COMPONENT); // Title
+                    wrapper.passthrough(Type.COMPONENT); // Description
+                    handleItemToClient(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM)); // Icon
+                    wrapper.passthrough(Type.VAR_INT); // Frame type
+                    int flags = wrapper.passthrough(Type.INT); // Flags
+                    if ((flags & 1) != 0) {
+                        wrapper.passthrough(Type.STRING); // Background texture
+                    }
+                    wrapper.passthrough(Type.FLOAT); // X
+                    wrapper.passthrough(Type.FLOAT); // Y
+                }
+
+                wrapper.passthrough(Type.STRING_ARRAY); // Criteria
+
+                int arrayLength = wrapper.passthrough(Type.VAR_INT);
+                for (int array = 0; array < arrayLength; array++) {
+                    wrapper.passthrough(Type.STRING_ARRAY); // String array
+                }
+
+                wrapper.write(Type.BOOLEAN, false); // Sends telemetry
+            }
+        });
+
         protocol.registerClientbound(ClientboundPackets1_19_4.OPEN_SIGN_EDITOR, wrapper -> {
             wrapper.passthrough(Type.POSITION1_14);
             wrapper.write(Type.BOOLEAN, true); // Front text
diff --git a/gradle.properties b/gradle.properties
index eb0b15e48..5b33f7536 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 # Project properties - we put these here so they can be modified without causing a recompile of the build scripts
-projectVersion=4.7.0-23w17a-SNAPSHOT
+projectVersion=4.7.0-23w18a-SNAPSHOT
 
 # Gradle properties
 org.gradle.daemon=true