From f439382ee54454938ec07f1f93d68bc26ba3b03d Mon Sep 17 00:00:00 2001
From: RaphiMC <50594595+RaphiMC@users.noreply.github.com>
Date: Sun, 16 Jun 2024 18:27:05 +0200
Subject: [PATCH] Added 1.21 client and server support

---
 build.gradle                                       | 14 +++++++-------
 .../mixins/MixinBlockItemPacketRewriter1_20_5.java |  4 ++--
 .../mixins/MixinEntityPacketRewriter1_20_5.java    |  3 +--
 .../mixins/MixinItemPacketRewriter1_9.java         | 12 ++++++------
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index bb537db..1182617 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,16 +53,16 @@ repositories {
 }
 
 dependencies {
-    include "com.viaversion:viaversion-common:5.0.0-SNAPSHOT"
-    include "com.viaversion:viabackwards-common:5.0.0-SNAPSHOT"
-    include "com.viaversion:viarewind-common:4.0.0-SNAPSHOT"
-    include "net.raphimc:ViaLegacy:3.0.0-SNAPSHOT"
-    include "net.raphimc:ViaAprilFools:3.0.0-SNAPSHOT"
-    include("net.raphimc:ViaBedrock:0.0.8-SNAPSHOT") {
+    include "com.viaversion:viaversion-common:5.0.0"
+    include "com.viaversion:viabackwards-common:5.0.0"
+    include "com.viaversion:viarewind-common:4.0.0"
+    include "net.raphimc:ViaLegacy:3.0.0"
+    include "net.raphimc:ViaAprilFools:3.0.0"
+    include("net.raphimc:ViaBedrock:0.0.9-SNAPSHOT") {
         exclude group: "io.netty"
         exclude group: "io.jsonwebtoken"
     }
-    include("net.raphimc:ViaLoader:3.0.0-SNAPSHOT") {
+    include("net.raphimc:ViaLoader:3.0.0") {
         exclude group: "org.slf4j", module: "slf4j-api"
     }
 
diff --git a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinBlockItemPacketRewriter1_20_5.java b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinBlockItemPacketRewriter1_20_5.java
index 4e80d16..519a21a 100644
--- a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinBlockItemPacketRewriter1_20_5.java
+++ b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinBlockItemPacketRewriter1_20_5.java
@@ -139,7 +139,7 @@ public abstract class MixinBlockItemPacketRewriter1_20_5 extends ItemRewriter<Cl
         }
         if (user.getProtocolInfo().serverProtocolVersion().betweenInclusive(LegacyProtocolVersion.b1_8tob1_8_1, ProtocolVersion.v1_8)) {
             if (this.swordItems1_8.contains(identifier)) {
-                data.set(StructuredDataKey.FOOD, new FoodProperties(0, 0F, true, 3600, new FoodEffect[0]));
+                data.set(StructuredDataKey.FOOD1_20_5, new FoodProperties(0, 0F, true, 3600, null, new FoodEffect[0]));
             }
         }
         if (user.getProtocolInfo().serverProtocolVersion().olderThanOrEqualTo(LegacyProtocolVersion.b1_8tob1_8_1)) {
@@ -150,7 +150,7 @@ public abstract class MixinBlockItemPacketRewriter1_20_5 extends ItemRewriter<Cl
         if (user.getProtocolInfo().serverProtocolVersion().olderThanOrEqualTo(LegacyProtocolVersion.b1_7tob1_7_3)) {
             if (this.foodItems_b1_7_3.contains(identifier)) {
                 data.set(StructuredDataKey.MAX_STACK_SIZE, 1);
-                data.addEmpty(StructuredDataKey.FOOD);
+                data.addEmpty(StructuredDataKey.FOOD1_20_5);
             }
         }
 
diff --git a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinEntityPacketRewriter1_20_5.java b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinEntityPacketRewriter1_20_5.java
index a8e303f..70ff128 100644
--- a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinEntityPacketRewriter1_20_5.java
+++ b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinEntityPacketRewriter1_20_5.java
@@ -28,7 +28,6 @@ import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ClientboundPac
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.rewriter.EntityPacketRewriter1_20_5;
 import com.viaversion.viaversion.rewriter.EntityRewriter;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
@@ -52,7 +51,7 @@ public abstract class MixinEntityPacketRewriter1_20_5 extends EntityRewriter<Cli
     }
 
     @Shadow
-    protected abstract void writeAttribute(PacketWrapper wrapper, String attributeId, double base, @Nullable UUID modifierId, double amount);
+    protected abstract void writeAttribute(PacketWrapper wrapper, String attributeId, double base, UUID modifierId, double amount);
 
     /**
      * @author RK_01
diff --git a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinItemPacketRewriter1_9.java b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinItemPacketRewriter1_9.java
index 945496e..789e97b 100644
--- a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinItemPacketRewriter1_9.java
+++ b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinItemPacketRewriter1_9.java
@@ -21,7 +21,7 @@ package net.raphimc.viaproxy.injection.mixins;
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.ListTag;
 import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.minecraft.item.data.ModifierData;
+import com.viaversion.viaversion.api.minecraft.item.data.AttributeModifiers1_20_5;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
 import com.viaversion.viaversion.libs.gson.JsonElement;
@@ -51,7 +51,7 @@ public abstract class MixinItemPacketRewriter1_9 extends ItemRewriter<Clientboun
     private final Int2ObjectMap<String> itemIdentifiers = new Int2ObjectOpenHashMap<>();
 
     @Unique
-    private final Map<String, Map<String, Pair<String, ModifierData>>> itemAttributes = new HashMap<>();
+    private final Map<String, Map<String, Pair<String, AttributeModifiers1_20_5.ModifierData>>> itemAttributes = new HashMap<>();
 
     // TODO: ClassTransform bug: Constructor merging is broken
     /*public MixinItemPacketRewriter1_9(Protocol1_8To1_9 protocol, Type<Item> itemType, Type<Item[]> itemArrayType, Type<Item> mappedItemType, Type<Item[]> mappedItemArrayType) {
@@ -72,11 +72,11 @@ public abstract class MixinItemPacketRewriter1_9 extends ItemRewriter<Clientboun
         final JsonObject itemAttributes = ViaProxyMappingDataLoader.INSTANCE.loadData("item-attributes-1.8.json");
         for (Map.Entry<String, JsonElement> itemEntry : itemAttributes.entrySet()) {
             final String itemIdentifier = itemEntry.getKey();
-            final Map<String, Pair<String, ModifierData>> attributes = new HashMap<>();
+            final Map<String, Pair<String, AttributeModifiers1_20_5.ModifierData>> attributes = new HashMap<>();
             for (Map.Entry<String, JsonElement> attributeEntry : itemEntry.getValue().getAsJsonObject().entrySet()) {
                 final String attribute = attributeEntry.getKey();
                 final JsonObject attributeData = attributeEntry.getValue().getAsJsonObject();
-                final ModifierData modifierData = new ModifierData(UUID.fromString(attributeData.get("id").getAsString()), attributeData.get("name").getAsString(), attributeData.get("amount").getAsDouble(), attributeData.get("operation").getAsInt());
+                final AttributeModifiers1_20_5.ModifierData modifierData = new AttributeModifiers1_20_5.ModifierData(UUID.fromString(attributeData.get("id").getAsString()), attributeData.get("name").getAsString(), attributeData.get("amount").getAsDouble(), attributeData.get("operation").getAsInt());
                 final String slot = attributeData.get("slot").getAsString();
                 attributes.put(attribute, new Pair<>(slot, modifierData));
             }
@@ -91,7 +91,7 @@ public abstract class MixinItemPacketRewriter1_9 extends ItemRewriter<Clientboun
 
         final String identifier = this.itemIdentifiers.get(item.identifier());
         if (identifier != null && this.itemAttributes.containsKey(identifier)) {
-            final Map<String, Pair<String, ModifierData>> attributes = this.itemAttributes.get(identifier);
+            final Map<String, Pair<String, AttributeModifiers1_20_5.ModifierData>> attributes = this.itemAttributes.get(identifier);
             final CompoundTag attributeFixTag = new CompoundTag();
             CompoundTag tag = item.tag();
             if (tag == null) {
@@ -104,7 +104,7 @@ public abstract class MixinItemPacketRewriter1_9 extends ItemRewriter<Clientboun
             ListTag<CompoundTag> attributeModifiers = tag.getListTag("AttributeModifiers", CompoundTag.class);
             if (attributeModifiers == null) {
                 attributeModifiers = new ListTag<>(CompoundTag.class);
-                for (Map.Entry<String, Pair<String, ModifierData>> entry : attributes.entrySet()) {
+                for (Map.Entry<String, Pair<String, AttributeModifiers1_20_5.ModifierData>> entry : attributes.entrySet()) {
                     final CompoundTag attributeModifier = new CompoundTag();
                     attributeModifier.putString("AttributeName", entry.getKey());
                     attributeModifier.putString("Name", entry.getValue().value().name());