From 3d656d411d82788bbd613e120c585ca4d7a71e3c Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Wed, 5 Jun 2024 12:04:00 +0200
Subject: [PATCH] 1.21-pre3

---
 .../api/protocol/version/ProtocolVersion.java |   2 +-
 .../rewriter/BlockItemPacketRewriter1_21.java |   4 ++--
 .../rewriter/StructuredItemRewriter.java      |   8 ++++----
 .../viaversion/data/enchantments-1.21.nbt     | Bin 29334 -> 29334 bytes
 gradle.properties                             |   2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

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 1c7296650..2342e13e4 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 implements Comparable<ProtocolVersion> {
     public static final ProtocolVersion v1_20_2 = register(764, "1.20.2");
     public static final ProtocolVersion v1_20_3 = register(765, "1.20.3-1.20.4", new SubVersionRange("1.20", 3, 4));
     public static final ProtocolVersion v1_20_5 = register(766, "1.20.5-1.20.6", new SubVersionRange("1.20", 5, 6));
-    public static final ProtocolVersion v1_21 = register(767, 200, "1.21");
+    public static final ProtocolVersion v1_21 = register(767, 201, "1.21");
     public static final ProtocolVersion unknown = new ProtocolVersion(VersionType.SPECIAL, -1, -1, "UNKNOWN", null);
 
     public static ProtocolVersion register(int version, String name) {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/rewriter/BlockItemPacketRewriter1_21.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/rewriter/BlockItemPacketRewriter1_21.java
index 7e6097655..e141e6df2 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/rewriter/BlockItemPacketRewriter1_21.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/rewriter/BlockItemPacketRewriter1_21.java
@@ -119,7 +119,7 @@ public final class BlockItemPacketRewriter1_21 extends StructuredItemRewriter<Cl
     }
 
     public static void updateItemData(final Item item) {
-        final StructuredDataContainer dataContainer = item.structuredData();
+        final StructuredDataContainer dataContainer = item.dataContainer();
         dataContainer.replaceKey(StructuredDataKey.FOOD1_20_5, StructuredDataKey.FOOD1_21);
         dataContainer.replace(StructuredDataKey.ATTRIBUTE_MODIFIERS1_20_5, StructuredDataKey.ATTRIBUTE_MODIFIERS1_21, attributeModifiers -> {
             final AttributeModifiers1_21.AttributeModifier[] modifiers = Arrays.stream(attributeModifiers.modifiers()).map(modifier -> {
@@ -143,7 +143,7 @@ public final class BlockItemPacketRewriter1_21 extends StructuredItemRewriter<Cl
     }
 
     public static void downgradeItemData(final Item item) {
-        final StructuredDataContainer dataContainer = item.structuredData();
+        final StructuredDataContainer dataContainer = item.dataContainer();
         dataContainer.replaceKey(StructuredDataKey.FOOD1_21, StructuredDataKey.FOOD1_20_5);
         dataContainer.remove(StructuredDataKey.JUKEBOX_PLAYABLE);
         dataContainer.replace(StructuredDataKey.ATTRIBUTE_MODIFIERS1_21, StructuredDataKey.ATTRIBUTE_MODIFIERS1_20_5, attributeModifiers -> {
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/StructuredItemRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/StructuredItemRewriter.java
index f1ed610e8..930f63e6f 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/StructuredItemRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/StructuredItemRewriter.java
@@ -35,6 +35,7 @@ import com.viaversion.viaversion.api.rewriter.ComponentRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import it.unimi.dsi.fastutil.ints.Int2IntFunction;
 import java.util.Map;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class StructuredItemRewriter<C extends ClientboundPacketType, S extends ServerboundPacketType,
     T extends Protocol<C, ?, ?, S>> extends ItemRewriter<C, S, T> {
@@ -153,7 +154,7 @@ public class StructuredItemRewriter<C extends ClientboundPacketType, S extends S
     }
 
     protected void restoreTextComponents(final Item item) {
-        final StructuredDataContainer data = item.structuredData();
+        final StructuredDataContainer data = item.dataContainer();
         final StructuredData<CompoundTag> customData = data.getNonEmpty(StructuredDataKey.CUSTOM_DATA);
         if (customData == null) {
             return;
@@ -171,7 +172,7 @@ public class StructuredItemRewriter<C extends ClientboundPacketType, S extends S
     }
 
     protected CompoundTag createCustomTag(final Item item) {
-        final StructuredDataContainer data = item.structuredData();
+        final StructuredDataContainer data = item.dataContainer();
         final StructuredData<CompoundTag> customData = data.getNonEmpty(StructuredDataKey.CUSTOM_DATA);
         if (customData != null) {
             return customData.value();
@@ -196,7 +197,6 @@ public class StructuredItemRewriter<C extends ClientboundPacketType, S extends S
     @FunctionalInterface
     public interface ItemHandler {
 
-        @Nullable
-        Item rewrite(UserConnection connection, @Nullable Item item);
+        Item rewrite(UserConnection connection, Item item);
     }
 }
diff --git a/common/src/main/resources/assets/viaversion/data/enchantments-1.21.nbt b/common/src/main/resources/assets/viaversion/data/enchantments-1.21.nbt
index 442386850f5b170306255fa1166cbc16389d8d42..91baa7abd9a92e78490a2e66f97aade7b5e11fcd 100644
GIT binary patch
delta 50
zcmbRClyTZq#tnwjjM<xwq<?U;*8l(ipJB3NjP2wC1NP0u>e@_jA?wZeG<SFa03l8l
AtN;K2

delta 50
ycmbRClyTZq#tnwjjLDmgq<?U;HZTCeWXBlW$pr@Nn~T-8ncza!o9}7v@BjdxuMeyM

diff --git a/gradle.properties b/gradle.properties
index 6ce4914a7..53c76f127 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=5.0.0-1.21-pre2-SNAPSHOT
+projectVersion=5.0.0-1.21-pre3-SNAPSHOT
 
 # Smile emoji
 mcVersions=1.20.6,1.20.5,1.20.4, 1.20.3, 1.20.2, 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