From a9288ebd3a666d363cf8af08d7f3d75f88d4955e Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Thu, 31 Aug 2023 00:42:47 +1000
Subject: [PATCH] 23w35a

---
 .../api/protocol/version/ProtocolVersion.java   |   2 +-
 .../rewriter/BlockItemPacketRewriter1_20_2.java |   9 +++++----
 .../packets/InventoryPackets.java               |   8 ++++----
 .../viaversion/data/identifiers-1.20.2.nbt      | Bin 0 -> 3257 bytes
 .../viaversion/data/mappings-1.20to1.20.2.nbt   | Bin 171 -> 451 bytes
 gradle.properties                               |   2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 common/src/main/resources/assets/viaversion/data/identifiers-1.20.2.nbt

diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
index 67883e1d8..ac70752f5 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
@@ -84,7 +84,7 @@ public class ProtocolVersion {
     public static final ProtocolVersion v1_19_3 = register(761, "1.19.3");
     public static final ProtocolVersion v1_19_4 = register(762, "1.19.4");
     public static final ProtocolVersion v1_20 = register(763, "1.20/1.20.1", new VersionRange("1.20", 0, 1));
-    public static final ProtocolVersion v1_20_2 = register(764, 146, "1.20.2");
+    public static final ProtocolVersion v1_20_2 = register(764, 147, "1.20.2");
     public static final ProtocolVersion unknown = register(-1, "UNKNOWN");
 
     public static ProtocolVersion register(int version, String name) {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java
index 9ce279fb6..72f9ddb57 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java
@@ -190,11 +190,12 @@ public final class BlockItemPacketRewriter1_20_2 extends ItemRewriter<Clientboun
                     wrapper.passthrough(Type.FLOAT); // Y
                 }
 
-                wrapper.passthrough(Type.STRING_ARRAY); // Criteria
+                // Remove criterion triggers
+                wrapper.read(Type.STRING_ARRAY); // Criteria
 
-                final int arrayLength = wrapper.passthrough(Type.VAR_INT);
-                for (int array = 0; array < arrayLength; array++) {
-                    wrapper.passthrough(Type.STRING_ARRAY); // String array
+                final int requirements = wrapper.passthrough(Type.VAR_INT);
+                for (int array = 0; array < requirements; array++) {
+                    wrapper.passthrough(Type.STRING_ARRAY);
                 }
 
                 wrapper.passthrough(Type.BOOLEAN); // Send telemetry
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 4e447608d..2becdc7dd 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
@@ -85,11 +85,11 @@ public final class InventoryPackets extends ItemRewriter<ClientboundPackets1_19_
                     wrapper.passthrough(Type.FLOAT); // Y
                 }
 
-                wrapper.passthrough(Type.STRING_ARRAY); // Criteria
+                wrapper.passthrough(Type.STRING_ARRAY); // Critereon triggers
 
-                int arrayLength = wrapper.passthrough(Type.VAR_INT);
-                for (int array = 0; array < arrayLength; array++) {
-                    wrapper.passthrough(Type.STRING_ARRAY); // String array
+                int requirements = wrapper.passthrough(Type.VAR_INT);
+                for (int array = 0; array < requirements; array++) {
+                    wrapper.passthrough(Type.STRING_ARRAY);
                 }
 
                 wrapper.write(Type.BOOLEAN, false); // Sends telemetry
diff --git a/common/src/main/resources/assets/viaversion/data/identifiers-1.20.2.nbt b/common/src/main/resources/assets/viaversion/data/identifiers-1.20.2.nbt
new file mode 100644
index 0000000000000000000000000000000000000000..f59871f274e684aea1a326ac29cc09c92c11c3d5
GIT binary patch
literal 3257
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

literal 0
HcmV?d00001

diff --git a/common/src/main/resources/assets/viaversion/data/mappings-1.20to1.20.2.nbt b/common/src/main/resources/assets/viaversion/data/mappings-1.20to1.20.2.nbt
index 3600151eff32df6f85ea2fbddfbf5f892723d226..e5b33d7a3c632ba061be56169296a219d20a783c 100644
GIT binary patch
literal 451
zcmZ9|xk>|37{&23TZBm~B9@Mz;46rTjSrAs7@ZNvB@>*{B7&WjE7sx?A3+m)5m)T&
z+<Fl;`U3v1nkL1M3m5M9oqK%AQO8oekR@qZlI5#7F_%uxW_g&$nInHbtW@HtlvHDB
z{N9qCM3y5r`@0w`$_{fL_DQ|VSi?Ftu!$|~;{b=K;Rwe#K^+a8;u2T5#tm-qfJZ#x
z887(2Cz|-ew-h*V;h`Y)Hwl)f|G`YCUF^XGF(FKVb6mhIH4DwMH@w3vVEFIgPR=fL
zqX&Z+!Z1cKiV`ABVHz`_kbp7*iU_u`BMq#`S0PIm%Tar~-d$U}-dU?%TXJ6|uiE;R
KxgeppD*XUUvQ^ap

delta 34
ncmX@iyqa->KBLD(14$u91_t$y+zd=5`3wvUAkL@B#f$*}kCq4F

diff --git a/gradle.properties b/gradle.properties
index f895d7fc7..8d1a7bfa4 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.8.0-23w33a-SNAPSHOT
+projectVersion=4.8.0-23w35a-SNAPSHOT
 
 # Smile emoji
 mcVersions=1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10, 1.9.4, 1.9.3, 1.9.2, 1.9.1, 1.9, 1.8.9