Fix unit reader/writer for the INTANGIBLE_PROJECTILE component

Author: onebeastchris

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

@@ -443,7 +443,13 @@ public static ItemStack readOptionalItemStack(ByteBuf buf, boolean untrusted) {
         }
 
         int item = MinecraftTypes.readVarInt(buf);
-        return new ItemStack(item, count, MinecraftTypes.readDataComponentPatch(buf, untrusted));
+        DataComponents components;
+        try {
+            components = MinecraftTypes.readDataComponentPatch(buf, untrusted);
+        } catch (IllegalArgumentException e) {
+            throw new IllegalArgumentException("Exception while reading components for item " + item, e);
+        }
+        return new ItemStack(item, count, components);
     }
 
     public static void writeOptionalItemStack(ByteBuf buf, ItemStack item, boolean untrusted) {
@@ -475,21 +481,21 @@ public static DataComponents readDataComponentPatch(ByteBuf buf, boolean untrust
         Map<DataComponentType<?>, DataComponent<?, ?>> dataComponents = new HashMap<>();
         if (untrusted) {
             for (int k = 0; k < nonNullComponents; k++) {
-                DataComponentType<?> dataComponentType = DataComponentTypes.from(MinecraftTypes.readVarInt(buf));
+                DataComponentType<?> dataComponentType = DataComponentTypes.read(buf);
                 MinecraftTypes.readVarInt(buf);
                 DataComponent<?, ?> dataComponent = dataComponentType.readDataComponent(buf);
                 dataComponents.put(dataComponentType, dataComponent);
             }
         } else {
             for (int k = 0; k < nonNullComponents; k++) {
-                DataComponentType<?> dataComponentType = DataComponentTypes.from(MinecraftTypes.readVarInt(buf));
+                DataComponentType<?> dataComponentType = DataComponentTypes.read(buf);
                 DataComponent<?, ?> dataComponent = dataComponentType.readDataComponent(buf);
                 dataComponents.put(dataComponentType, dataComponent);
             }
         }
 
         for (int k = 0; k < nullComponents; k++) {
-            DataComponentType<?> dataComponentType = DataComponentTypes.from(MinecraftTypes.readVarInt(buf));
+            DataComponentType<?> dataComponentType = DataComponentTypes.read(buf);
             DataComponent<?, ?> dataComponent = dataComponentType.readNullDataComponent();
             dataComponents.put(dataComponentType, dataComponent);
         }

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

@@ -43,7 +43,7 @@ public class DataComponentTypes {
     public static final IntComponentType REPAIR_COST = register(id -> new IntComponentType(id, "repair_cost", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new));
     public static final DataComponentType<Unit> CREATIVE_SLOT_LOCK = register(id -> new DataComponentType<>(id, "creative_slot_lock", unitReader(), unitWriter(), ObjectDataComponent::new));
     public static final BooleanComponentType ENCHANTMENT_GLINT_OVERRIDE = register(id -> new BooleanComponentType(id, "enchantment_glint_override", ByteBuf::readBoolean, ByteBuf::writeBoolean, BooleanDataComponent::new));
-    public static final DataComponentType<Unit> INTANGIBLE_PROJECTILE = register(id -> new DataComponentType<>(id, "intangible_projectile", unitReader(), unitWriter(), ObjectDataComponent::new));
+    public static final DataComponentType<Unit> INTANGIBLE_PROJECTILE = register(id -> new DataComponentType<>(id, "intangible_projectile", emptyNbtReader(), emptyNbtWriter(), ObjectDataComponent::new));
     public static final DataComponentType<FoodProperties> FOOD = register(id -> new DataComponentType<>(id, "food", ItemTypes::readFoodProperties, ItemTypes::writeFoodProperties, ObjectDataComponent::new));
     public static final DataComponentType<Consumable> CONSUMABLE = register(id -> new DataComponentType<>(id, "consumable", ItemTypes::readConsumable, ItemTypes::writeConsumable, ObjectDataComponent::new));
     public static final DataComponentType<ItemStack> USE_REMAINDER = register(id -> new DataComponentType<>(id, "use_remainder", MinecraftTypes::readItemStack, MinecraftTypes::writeItemStack, ObjectDataComponent::new));
@@ -157,6 +157,17 @@ private static DataComponentType.Writer<Unit> unitWriter() {
         };
     }
 
+    private static DataComponentType.Reader<Unit> emptyNbtReader() {
+        return (input) -> {
+            MinecraftTypes.readAnyTag(input);
+            return Unit.INSTANCE;
+        };
+    }
+
+    private static DataComponentType.Writer<Unit> emptyNbtWriter() {
+        return (output, value) -> MinecraftTypes.writeAnyTag(output, NbtMap.EMPTY);
+    }
+
     public static DataComponentType<?> read(ByteBuf in) {
         int id = MinecraftTypes.readVarInt(in);
         if (id >= VALUES.size()) {