From 2f8114abb135469f7fadd1b65bfc231d8bcf2d80 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Mon, 18 Dec 2023 17:14:24 +0100
Subject: [PATCH] Finish 23w51a, maybe

---
 .../viaversion/api/data/MappingData.java      |   4 +++
 .../viaversion/api/data/MappingDataBase.java  |  10 ++++++
 .../data/MappingData.java                     |   2 +-
 .../packets/EntityPackets.java                |   2 +-
 .../packets/InventoryPackets.java             |   4 +--
 .../data/AttributeMappings.java               |  32 +++++++++++++++---
 .../rewriter/EntityPacketRewriter1_20_5.java  |  29 ++++++----------
 .../viaversion/data/identifiers-1.20.5.nbt    | Bin 0 -> 3377 bytes
 .../data/mappings-1.20.3to1.20.5.nbt          | Bin 0 -> 413 bytes
 9 files changed, 57 insertions(+), 26 deletions(-)
 create mode 100644 common/src/main/resources/assets/viaversion/data/identifiers-1.20.5.nbt
 create mode 100644 common/src/main/resources/assets/viaversion/data/mappings-1.20.3to1.20.5.nbt

diff --git a/api/src/main/java/com/viaversion/viaversion/api/data/MappingData.java b/api/src/main/java/com/viaversion/viaversion/api/data/MappingData.java
index 03265fced..6ccfc1b9f 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/data/MappingData.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/data/MappingData.java
@@ -79,6 +79,8 @@ public interface MappingData {
      */
     int getNewParticleId(int id);
 
+    int getNewAttributeId(int id);
+
     /**
      * Returns a list of tags to send if present.
      *
@@ -105,6 +107,8 @@ public interface MappingData {
 
     @Nullable Mappings getEnchantmentMappings();
 
+    @Nullable Mappings getAttributeMappings();
+
     @Nullable FullMappings getEntityMappings();
 
     @Nullable FullMappings getArgumentTypeMappings();
diff --git a/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataBase.java b/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataBase.java
index e01b9256a..3a13067b1 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataBase.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataBase.java
@@ -166,6 +166,11 @@ public class MappingDataBase implements MappingData {
         return checkValidity(id, particleMappings.getNewId(id), "particles");
     }
 
+    @Override
+    public int getNewAttributeId(final int id) {
+        return checkValidity(id, attributeMappings.getNewId(id), "attributes");
+    }
+
     @Override
     public @Nullable List<TagData> getTags(final RegistryType type) {
         return tags != null ? tags.get(type) : null;
@@ -216,6 +221,11 @@ public class MappingDataBase implements MappingData {
         return enchantmentMappings;
     }
 
+    @Override
+    public @Nullable Mappings getAttributeMappings() {
+        return attributeMappings;
+    }
+
     @Override
     public @Nullable FullMappings getEntityMappings() {
         return entityMappings;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/MappingData.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/MappingData.java
index 45baf1c7f..44ef9aba8 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/MappingData.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/MappingData.java
@@ -44,7 +44,7 @@ public class MappingData extends MappingDataBase {
         attributeMappings.put("generic.armorToughness", "minecraft:generic.armor_toughness");
     }
 
-    public BiMap<String, String> getAttributeMappings() {
+    public BiMap<String, String> attributeIdentifierMappings() {
         return attributeMappings;
     }
 }
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/EntityPackets.java
index 1895f5eb2..0c3f5fcd8 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/EntityPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/EntityPackets.java
@@ -236,7 +236,7 @@ public class EntityPackets {
             for (int i = 0; i < size; i++) {
                 // Attributes have been renamed and are now namespaced identifiers
                 String key = wrapper.read(Type.STRING);
-                String attributeIdentifier = protocol.getMappingData().getAttributeMappings().get(key);
+                String attributeIdentifier = protocol.getMappingData().attributeIdentifierMappings().get(key);
                 if (attributeIdentifier == null) {
                     attributeIdentifier = Key.namespaced(key);
                     if (!Key.isValid(attributeIdentifier)) {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java
index 3e2db6041..6188b4bea 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java
@@ -244,8 +244,8 @@ public class InventoryPackets extends ItemRewriter<ClientboundPackets1_15, Serve
             attributeName = Key.namespaced(attributeName);
         }
 
-        String mappedAttribute = (inverse ? Protocol1_16To1_15_2.MAPPINGS.getAttributeMappings().inverse()
-                : Protocol1_16To1_15_2.MAPPINGS.getAttributeMappings()).get(attributeName);
+        String mappedAttribute = (inverse ? Protocol1_16To1_15_2.MAPPINGS.attributeIdentifierMappings().inverse()
+                : Protocol1_16To1_15_2.MAPPINGS.attributeIdentifierMappings()).get(attributeName);
         if (mappedAttribute == null) return;
 
         attributeNameTag.setValue(mappedAttribute);
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/AttributeMappings.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/AttributeMappings.java
index 611ce8c35..088a41017 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/AttributeMappings.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/AttributeMappings.java
@@ -17,20 +17,44 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data;
 
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+/**
+ * String to/from int ID mappings for 1.20.3 attributes.
+ */
 public final class AttributeMappings {
 
-    private static final String[] ATTRIBUTES;
+    private static final String[] ATTRIBUTES = {
+            "generic.armor",
+            "generic.armor_toughness",
+            "generic.attack_damage",
+            "generic.attack_knockback",
+            "generic.attack_speed",
+            "generic.flying_speed",
+            "generic.follow_range",
+            "horse.jump_strength",
+            "generic.knockback_resistance",
+            "generic.luck",
+            "generic.max_absorption",
+            "generic.max_health",
+            "generic.movement_speed",
+            "zombie.spawn_reinforcements"
+    };
+    private static final Object2IntMap<String> STRING_TO_ID = new Object2IntOpenHashMap<>();
 
     static {
-
+        for (int i = 0; i < ATTRIBUTES.length; i++) {
+            STRING_TO_ID.put(ATTRIBUTES[i], i);
+        }
     }
 
-    public @Nullable String attribute(final int id) {
+    public static @Nullable String attribute(final int id) {
         return id >= 0 && id < ATTRIBUTES.length ? ATTRIBUTES[id] : null;
     }
 
-    public int id(final String attribute) {
+    public static int id(final String attribute) {
+        return STRING_TO_ID.getOrDefault(attribute, -1);
     }
 }
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java
index 39b2a0251..c8325ca9c 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java
@@ -26,6 +26,7 @@ import com.viaversion.viaversion.api.type.types.version.Types1_20_3;
 import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundConfigurationPackets1_20_3;
 import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundPackets1_20_3;
 import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.Protocol1_20_5To1_20_3;
+import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.AttributeMappings;
 import com.viaversion.viaversion.rewriter.EntityRewriter;
 import com.viaversion.viaversion.util.Key;
 
@@ -37,9 +38,8 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
 
     @Override
     public void registerPackets() {
-        // Tracks entities, applies metadata rewrites registered below, untracks entities
         registerTrackerWithData1_19(ClientboundPackets1_20_3.SPAWN_ENTITY, EntityTypes1_20_5.FALLING_BLOCK);
-        registerMetadataRewriter(ClientboundPackets1_20_3.ENTITY_METADATA, /*Types1_OLD.METADATA_LIST, */Types1_20_3.METADATA_LIST);
+        registerMetadataRewriter(ClientboundPackets1_20_3.ENTITY_METADATA, Types1_20_3.METADATA_LIST);
         registerRemoveEntities(ClientboundPackets1_20_3.REMOVE_ENTITIES);
 
         protocol.registerClientbound(State.CONFIGURATION, ClientboundConfigurationPackets1_20_3.REGISTRY_DATA, new PacketHandlers() {
@@ -54,7 +54,7 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
         protocol.registerClientbound(ClientboundPackets1_20_3.JOIN_GAME, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.INT); // Entity id
+                map(Type.INT); // Entity ID
                 map(Type.BOOLEAN); // Hardcore
                 map(Type.STRING_ARRAY); // World List
                 map(Type.VAR_INT); // Max players
@@ -79,8 +79,8 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
         });
 
         protocol.registerClientbound(ClientboundPackets1_20_3.ENTITY_EFFECT, wrapper -> {
-            wrapper.passthrough(Type.VAR_INT); // Entity id
-            wrapper.passthrough(Type.VAR_INT); // Effect id
+            wrapper.passthrough(Type.VAR_INT); // Entity ID
+            wrapper.passthrough(Type.VAR_INT); // Effect ID
             wrapper.passthrough(Type.BYTE); // Amplifier
             wrapper.passthrough(Type.VAR_INT); // Duration
             wrapper.passthrough(Type.BYTE); // Flags
@@ -88,17 +88,19 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
         });
 
         protocol.registerClientbound(ClientboundPackets1_20_3.ENTITY_PROPERTIES, wrapper -> {
-            wrapper.passthrough(Type.VAR_INT); // Entity id
+            wrapper.passthrough(Type.VAR_INT); // Entity ID
 
             final int size = wrapper.passthrough(Type.VAR_INT);
             for (int i = 0; i < size; i++) {
-                final String attributeIdentifier = Key.namespaced(wrapper.read(Type.STRING));
-                wrapper.write(Type.VAR_INT, protocol.getMappingData());
+                // From a string to a registry int ID
+                final String attributeIdentifier = Key.stripMinecraftNamespace(wrapper.read(Type.STRING));
+                final int id = AttributeMappings.id(attributeIdentifier);
+                wrapper.write(Type.VAR_INT, protocol.getMappingData().getNewAttributeId(id));
 
                 wrapper.passthrough(Type.DOUBLE); // Base
                 final int modifierSize = wrapper.passthrough(Type.VAR_INT);
                 for (int j = 0; j < modifierSize; j++) {
-                    wrapper.passthrough(Type.UUID); // Id
+                    wrapper.passthrough(Type.UUID); // ID
                     wrapper.passthrough(Type.DOUBLE); // Amount
                     wrapper.passthrough(Type.BYTE); // Operation
                 }
@@ -108,15 +110,6 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
 
     @Override
     protected void registerRewrites() {
-        /* Uncomment if metatype classes changed
-        filter().handler((event, meta) -> {
-            int id = meta.metaType().typeId();
-            if (id >= SomeAddedIndex) {
-                id++;
-            }
-            meta.setMetaType(Types1_20_3.META_TYPES.byId(id));
-        });*/
-
         registerMetaTypeHandler(
                 Types1_20_3.META_TYPES.itemType,
                 Types1_20_3.META_TYPES.blockStateType,
diff --git a/common/src/main/resources/assets/viaversion/data/identifiers-1.20.5.nbt b/common/src/main/resources/assets/viaversion/data/identifiers-1.20.5.nbt
new file mode 100644
index 0000000000000000000000000000000000000000..9261c9ba6a8a115a826daea3857911fe361e5646
GIT binary patch
literal 3377
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

literal 0
HcmV?d00001

diff --git a/common/src/main/resources/assets/viaversion/data/mappings-1.20.3to1.20.5.nbt b/common/src/main/resources/assets/viaversion/data/mappings-1.20.3to1.20.5.nbt
new file mode 100644
index 0000000000000000000000000000000000000000..0cbf9fbe2461a3cad08b61e174dacad970ba6965
GIT binary patch
literal 413
zcmZXQv2MaJ5QhK6NuW-Ps;V18s>D06wmTzF;53%73JJnT1_t^zUAuJVjgWW*ey4;X
zSo&o7eD~ei8c-NCcI#bT0f;p6VpV^Bc`;(Wf?k`=#+D1Wx4`l>LhMSVkoao=8mSYz
z?x&{HHZ{7Xrf)f7BkU2g=a`%rkop>!FmR?U^YyMO`?l<*XUkM)ODLF;ck)AiJ8QW3
zAan9Zj<gSLB~IMk!|>hn<Iwpdmd2ek9QY^DMr7-X-TfEge^TU7jae~$M8ax4+!YC<
S4akr@5KVIONS;Wjc?K>&Ktt;Q

literal 0
HcmV?d00001