Correctly read exact component matchers in villager trades

Author: basaigh

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftTypes.java

@@ -564,14 +564,31 @@ public static void writeHashedStack(ByteBuf buf, HashedStack hashedStack) {
     public static VillagerTrade.ItemCost readItemCost(ByteBuf buf) {
         int item = MinecraftTypes.readVarInt(buf);
         int count = MinecraftTypes.readVarInt(buf);
-        List<DataComponentType<?>> components = MinecraftTypes.readList(buf, input -> DataComponentTypes.from(MinecraftTypes.readVarInt(input)));
-        return new VillagerTrade.ItemCost(item, count, components);
+        return new VillagerTrade.ItemCost(item, count, MinecraftTypes.readExactComponentMatcher(buf));
     }
 
     public static void writeItemCost(ByteBuf buf, VillagerTrade.ItemCost itemCost) {
         MinecraftTypes.writeVarInt(buf, itemCost.itemId());
         MinecraftTypes.writeVarInt(buf, itemCost.count());
-        MinecraftTypes.writeList(buf, itemCost.components(), (output, component) -> MinecraftTypes.writeVarInt(output, component.getId()));
+        MinecraftTypes.writeExactComponentMatcher(buf, itemCost.components());
+    }
+
+    public static Map<DataComponentType<?>, DataComponent<?, ?>> readExactComponentMatcher(ByteBuf buf) {
+        Map<DataComponentType<?>, DataComponent<?, ?>> dataComponents = new HashMap<>();
+        int length = MinecraftTypes.readVarInt(buf);
+        for (int i = 0; i < length; i++) {
+            DataComponentType<?> type = DataComponentTypes.from(MinecraftTypes.readVarInt(buf));
+            dataComponents.put(type, type.readDataComponent(buf));
+        }
+        return dataComponents;
+    }
+
+    public static void writeExactComponentMatcher(ByteBuf buf, Map<DataComponentType<?>, DataComponent<?, ?>> dataComponents) {
+        MinecraftTypes.writeVarInt(buf, dataComponents.size());
+        for (Map.Entry<DataComponentType<?>, DataComponent<?, ?>> entry : dataComponents.entrySet()) {
+            MinecraftTypes.writeVarInt(buf, entry.getKey().getId());
+            entry.getValue().write(buf);
+        }
     }
 
     public static TestInstanceBlockEntity readTestBlockEntity(ByteBuf buf) {

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/VillagerTrade.java

@@ -5,9 +5,10 @@
 import lombok.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.geysermc.mcprotocollib.protocol.data.game.item.ItemStack;
+import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponent;
 import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponentType;
 
-import java.util.List;
+import java.util.Map;
 
 @Data
 @AllArgsConstructor
@@ -23,6 +24,6 @@ public class VillagerTrade {
     private final float priceMultiplier;
     private final int demand;
 
-    public record ItemCost(int itemId, int count, List<DataComponentType<?>> components) {
+    public record ItemCost(int itemId, int count, Map<DataComponentType<?>, DataComponent<?, ?>> components) {
     }
 }

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/item/component/ItemTypes.java

@@ -13,8 +13,6 @@
 import org.geysermc.mcprotocollib.protocol.data.game.entity.Effect;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.EquipmentSlot;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.attribute.ModifierOperation;
-import org.geysermc.mcprotocollib.protocol.data.game.level.sound.BuiltinSound;
-import org.geysermc.mcprotocollib.protocol.data.game.level.sound.CustomSound;
 import org.geysermc.mcprotocollib.protocol.data.game.level.sound.Sound;
 
 import java.util.ArrayList;
@@ -107,12 +105,7 @@ public static void writeBlockPredicate(ByteBuf buf, AdventureModePredicate.Block
     }
 
     public static DataComponentMatchers readDataComponentMatchers(ByteBuf buf) {
-        Map<DataComponentType<?>, DataComponent<?, ?>> exactMatchers = new HashMap<>();
-        int exactCount = MinecraftTypes.readVarInt(buf);
-        for (int i = 0; i < exactCount; i++) {
-            DataComponentType<?> type = DataComponentTypes.from(MinecraftTypes.readVarInt(buf));
-            exactMatchers.put(type, type.readDataComponent(buf));
-        }
+        Map<DataComponentType<?>, DataComponent<?, ?>> exactMatchers = MinecraftTypes.readExactComponentMatcher(buf);
 
         int[] partialMatchers = new int[MinecraftTypes.readVarInt(buf)];
         for (int i = 0; i < partialMatchers.length; i++) {
@@ -123,11 +116,7 @@ public static DataComponentMatchers readDataComponentMatchers(ByteBuf buf) {
     }
 
     public static void writeDataComponentMatchers(ByteBuf buf, DataComponentMatchers matchers) {
-        MinecraftTypes.writeVarInt(buf, matchers.exactMatchers().size());
-        for (Map.Entry<DataComponentType<?>, DataComponent<?, ?>> entry : matchers.exactMatchers().entrySet()) {
-            MinecraftTypes.writeVarInt(buf, entry.getKey().getId());
-            entry.getValue().write(buf);
-        }
+        MinecraftTypes.writeExactComponentMatcher(buf, matchers.exactMatchers());
 
         MinecraftTypes.writeVarInt(buf, matchers.partialMatchers().length);
         for (int id : matchers.partialMatchers()) {