Add some missing changes from 25w03/4a

Author: basaigh

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

@@ -45,11 +45,9 @@
 import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.MetadataType;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.MetadataTypes;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.PaintingVariant;
-import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.PigVariant;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.Pose;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.SnifferState;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.VillagerData;
-import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.WolfVariant;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.object.Direction;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.player.BlockBreakStage;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode;
@@ -611,61 +609,6 @@ public static void writePose(ByteBuf buf, Pose pose) {
         MinecraftTypes.writeEnum(buf, pose);
     }
 
-    public static Holder<WolfVariant> readWolfVariant(ByteBuf buf) {
-        return MinecraftTypes.readHolder(buf, input -> {
-            Key wildTexture = MinecraftTypes.readResourceLocation(input);
-            Key tameTexture = MinecraftTypes.readResourceLocation(input);
-            Key angryTexture = MinecraftTypes.readResourceLocation(input);
-            Key biomeLocation = null;
-            int[] biomeHolders = null;
-
-            int length = MinecraftTypes.readVarInt(input) - 1;
-            if (length == -1) {
-                biomeLocation = MinecraftTypes.readResourceLocation(input);
-            } else {
-                biomeHolders = new int[length];
-                for (int j = 0; j < length; j++) {
-                    biomeHolders[j] = MinecraftTypes.readVarInt(input);
-                }
-            }
-            return new WolfVariant(wildTexture, tameTexture, angryTexture, biomeLocation, biomeHolders);
-        });
-    }
-
-    public static void writeWolfVariant(ByteBuf buf, Holder<WolfVariant> variantHolder) {
-        MinecraftTypes.writeHolder(buf, variantHolder, (output, variant) -> {
-            MinecraftTypes.writeResourceLocation(output, variant.wildTexture());
-            MinecraftTypes.writeResourceLocation(output, variant.tameTexture());
-            MinecraftTypes.writeResourceLocation(output, variant.angryTexture());
-            if (variant.biomeLocation() != null) {
-                MinecraftTypes.writeVarInt(output, 0);
-                MinecraftTypes.writeResourceLocation(output, variant.biomeLocation());
-            } else {
-                MinecraftTypes.writeVarInt(output, variant.biomeHolders().length + 1);
-                for (int holder : variant.biomeHolders()) {
-                    MinecraftTypes.writeVarInt(output, holder);
-                }
-            }
-        });
-    }
-
-    public static Holder<PigVariant> readPigVariant(ByteBuf buf) {
-        return MinecraftTypes.readHolder(buf, input -> {
-            int modelId = MinecraftTypes.readVarInt(input);
-            Key texture = MinecraftTypes.readResourceLocation(input);
-            HolderSet biomes = MinecraftTypes.readNullable(input, MinecraftTypes::readHolderSet);
-            return new PigVariant(modelId, texture, biomes);
-        });
-    }
-
-    public static void writePigVariant(ByteBuf buf, Holder<PigVariant> variantHolder) {
-        MinecraftTypes.writeHolder(buf, variantHolder, (output, variant) -> {
-            MinecraftTypes.writeVarInt(buf, variant.modelId());
-            MinecraftTypes.writeResourceLocation(buf, variant.texture());
-            MinecraftTypes.writeNullable(buf, variant.biomes(), MinecraftTypes::writeHolderSet);
-        });
-    }
-
     public static Holder<Key> readChickenVariant(ByteBuf buf) {
         if (buf.readBoolean()) {
             return Holder.ofId(MinecraftTypes.readVarInt(buf));

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/EquipmentSlot.java

@@ -7,7 +7,8 @@ public enum EquipmentSlot {
     LEGGINGS,
     CHESTPLATE,
     HELMET,
-    BODY;
+    BODY,
+    SADDLE;
 
     private static final EquipmentSlot[] VALUES = values();
 

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/MetadataTypes.java

@@ -29,6 +29,7 @@
 public class MetadataTypes {
     private static final List<MetadataType<?>> VALUES = new ArrayList<>();
 
+    // TODO: check all types before release
     public static final ByteMetadataType BYTE = register(id -> new ByteMetadataType(id, ByteBuf::readByte, ByteBuf::writeByte, ByteEntityMetadata::new));
     public static final IntMetadataType INT = register(id -> new IntMetadataType(id, MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntEntityMetadata::new));
     public static final LongMetadataType LONG = register(id -> new LongMetadataType(id, MinecraftTypes::readVarLong, MinecraftTypes::writeVarLong, LongEntityMetadata::new));
@@ -54,9 +55,9 @@ public class MetadataTypes {
     public static final IntMetadataType CAT_VARIANT = register(id -> new IntMetadataType(id, MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntEntityMetadata::new));
     public static final IntMetadataType CHICKEN_VARIANT = register(id -> new IntMetadataType(id, MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntEntityMetadata::new));
     public static final IntMetadataType COW_VARIANT = register(id -> new IntMetadataType(id, MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntEntityMetadata::new));
-    public static final MetadataType<Holder<WolfVariant>> WOLF_VARIANT = register(id -> new MetadataType<>(id, MinecraftTypes::readWolfVariant, MinecraftTypes::writeWolfVariant, ObjectEntityMetadata::new));
+    public static final IntMetadataType WOLF_VARIANT = register(id -> new IntMetadataType(id, MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntEntityMetadata::new));
     public static final IntMetadataType FROG_VARIANT = register(id -> new IntMetadataType(id, MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntEntityMetadata::new));
-    public static final MetadataType<Holder<PigVariant>> PIG_VARIANT = register(id -> new MetadataType<>(id, MinecraftTypes::readPigVariant, MinecraftTypes::writePigVariant, ObjectEntityMetadata::new));
+    public static final IntMetadataType PIG_VARIANT = register(id -> new IntMetadataType(id, MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntEntityMetadata::new));
     public static final MetadataType<Optional<GlobalPos>> OPTIONAL_GLOBAL_POS = register(id -> new MetadataType<>(id, optionalReader(MinecraftTypes::readGlobalPos), optionalWriter(MinecraftTypes::writeGlobalPos), ObjectEntityMetadata::new));
     public static final MetadataType<Holder<PaintingVariant>> PAINTING_VARIANT = register(id -> new MetadataType<>(id, MinecraftTypes::readPaintingVariant, MinecraftTypes::writePaintingVariant, ObjectEntityMetadata::new));
     public static final MetadataType<SnifferState> SNIFFER_STATE = register(id -> new MetadataType<>(id, MinecraftTypes::readSnifferState, MinecraftTypes::writeSnifferState, ObjectEntityMetadata::new));

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/PigVariant.java

@@ -11,8 +11,6 @@
 import org.geysermc.mcprotocollib.protocol.codec.MinecraftTypes;
 import org.geysermc.mcprotocollib.protocol.data.game.Holder;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.PaintingVariant;
-import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.PigVariant;
-import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.WolfVariant;
 import org.geysermc.mcprotocollib.protocol.data.game.item.ItemStack;
 import org.geysermc.mcprotocollib.protocol.data.game.item.component.type.BooleanDataComponent;
 import org.geysermc.mcprotocollib.protocol.data.game.item.component.type.IntDataComponent;
@@ -26,6 +24,7 @@
 public class DataComponentTypes {
     private static final List<DataComponentType<?>> VALUES = new ArrayList<>();
 
+    // TODO: check all types before release
     public static final DataComponentType<NbtMap> CUSTOM_DATA = register(id -> new DataComponentType<>(id, "custom_data", MinecraftTypes::readCompoundTag, MinecraftTypes::writeAnyTag, ObjectDataComponent::new));
     public static final IntComponentType MAX_STACK_SIZE = register(id -> new IntComponentType(id, "max_stack_size", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new));
     public static final IntComponentType MAX_DAMAGE = register(id -> new IntComponentType(id, "max_damage", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new));
@@ -99,7 +98,7 @@ public class DataComponentTypes {
     public static final DataComponentType<NbtMap> CONTAINER_LOOT = register(id -> new DataComponentType<>(id, "container_loot", MinecraftTypes::readCompoundTag, MinecraftTypes::writeAnyTag, ObjectDataComponent::new));
     public static final DataComponentType<Sound> BREAK_SOUND = register(id -> new DataComponentType<>(id, "break_sound", MinecraftTypes::readSound, MinecraftTypes::writeSound, ObjectDataComponent::new));
     public static final IntComponentType VILLAGER_VARIANT = register(id -> new IntComponentType(id, "villager/variant", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new));
-    public static final DataComponentType<Holder<WolfVariant>> WOLF_VARIANT = register(id -> new DataComponentType<>(id, "wolf/variant", MinecraftTypes::readWolfVariant, MinecraftTypes::writeWolfVariant, ObjectDataComponent::new));
+    public static final IntComponentType WOLF_VARIANT = register(id -> new IntComponentType(id, "wolf/variant", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new));
     public static final IntComponentType WOLF_COLLAR = register(id -> new IntComponentType(id, "wolf/collar", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new));
     public static final IntComponentType FOX_VARIANT = register(id -> new IntComponentType(id, "fox/variant", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new));
     public static final IntComponentType SALMON_SIZE = register(id -> new IntComponentType(id, "salmon/size", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new));
@@ -109,7 +108,7 @@ public class DataComponentTypes {
     public static final IntComponentType TROPICAL_FISH_PATTERN_COLOR = register(id -> new IntComponentType(id, "tropical_fish/pattern_color", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new));
     public static final IntComponentType MOOSHROOM_VARIANT = register(id -> new IntComponentType(id, "mooshroom/variant", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new));
     public static final IntComponentType RABBIT_VARIANT = register(id -> new IntComponentType(id, "rabbit/variant", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new));
-    public static final DataComponentType<Holder<PigVariant>> PIG_VARIANT = register(id -> new DataComponentType<>(id, "pig/variant", MinecraftTypes::readPigVariant, MinecraftTypes::writePigVariant, ObjectDataComponent::new));
+    public static final IntComponentType PIG_VARIANT = register(id -> new IntComponentType(id, "pig/variant", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new));
     public static final IntComponentType COW_VARIANT = register(id -> new IntComponentType(id, "cow/variant", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new));
     public static final DataComponentType<Holder<Key>> CHICKEN_VARIANT = register(id -> new DataComponentType<>(id, "chicken/variant", MinecraftTypes::readChickenVariant, MinecraftTypes::writeChickenVariant, ObjectDataComponent::new));
     public static final IntComponentType FROG_VARIANT = register(id -> new IntComponentType(id, "frog/variant", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new));