Separate Fabric platform on modrinth

... or it'll fail when specifying versions below 1.14

.github/workflows/build.yml

@@ -15,12 +15,12 @@ jobs:
       with:
         persist-credentials: false
     - name: Set up Gradle
-      uses: gradle/actions/setup-gradle@v6.3.0
+      uses: gradle/actions/setup-gradle@v6.4.0
       with:
         cache-disabled: false
         cache-provider: basic
     - name: Set up JDK 17
-      uses: actions/setup-java@v5.7.0
+      uses: actions/setup-java@v6.0.1
       with:
         distribution: 'temurin'
         java-version: 17
@@ -30,7 +30,7 @@ jobs:
     - name: Upload Artifacts to GitHub
       # Only upload on the preview repository as there is no CI job for it.
       if: ${{ github.repository == 'ViaVersion/ViaVersionDev' && github.ref_name == 'preview' }}
-      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+      uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
       with:
         name: Artifacts
         path: build/libs/

.github/workflows/publish.yml

@@ -20,12 +20,12 @@ jobs:
         with:
           persist-credentials: false
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v6.3.0
+        uses: gradle/actions/setup-gradle@v6.4.0
         with:
           cache-disabled: false
           cache-provider: basic
       - name: Set up JDK 17
-        uses: actions/setup-java@v5.7.0
+        uses: actions/setup-java@v6.0.1
         with:
           distribution: 'temurin'
           java-version: 17

api/src/main/java/com/viaversion/viaversion/api/minecraft/PaintingVariant.java

@@ -79,8 +79,8 @@ public record PaintingVariant(int width, int height, String assetId, @Nullable T
                 .write("width", Types.INT, value.width())
                 .write("height", Types.INT, value.height())
                 .write("asset_id", Types.IDENTIFIER, Key.of(value.assetId()))
-                .writeOptional("title", Types.TRUSTED_TAG, value.title())
-                .writeOptional("author", Types.TRUSTED_TAG, value.author()));
+                .writeOptional("title", Types.TEXT_COMPONENT_TAG, value.title())
+                .writeOptional("author", Types.TEXT_COMPONENT_TAG, value.author()));
         }
 
         @Override

api/src/main/java/com/viaversion/viaversion/api/minecraft/data/StructuredDataKey.java

@@ -55,7 +55,6 @@ import com.viaversion.viaversion.api.minecraft.item.data.CookingFuel;
 import com.viaversion.viaversion.api.minecraft.item.data.CustomModelData1_21_4;
 import com.viaversion.viaversion.api.minecraft.item.data.DamageResistant1_21_2;
 import com.viaversion.viaversion.api.minecraft.item.data.DamageResistant26_1;
-import com.viaversion.viaversion.api.minecraft.item.data.DamageType;
 import com.viaversion.viaversion.api.minecraft.item.data.DeathProtection;
 import com.viaversion.viaversion.api.minecraft.item.data.DebugStickState;
 import com.viaversion.viaversion.api.minecraft.item.data.DyedColor;
@@ -125,7 +124,7 @@ public record StructuredDataKey<T>(String identifier, Type<T> type) {
     public static final StructuredDataKey<Unit> UNBREAKABLE1_21_5 = new StructuredDataKey<>("unbreakable", Types.EMPTY);
     public static final StructuredDataKey<Tag> CUSTOM_NAME = new StructuredDataKey<>("custom_name", Types.TEXT_COMPONENT_TAG);
     public static final StructuredDataKey<Float> MINIMUM_ATTACK_CHARGE = new StructuredDataKey<>("minimum_attack_charge", Types.FLOAT);
-    public static final StructuredDataKey<DamageType> DAMAGE_TYPE1_21_11 = new StructuredDataKey<>("damage_type", DamageType.TYPE1_21_11);
+    public static final StructuredDataKey<Either<Integer, String>> DAMAGE_TYPE1_21_11 = new StructuredDataKey<>("damage_type", new SynchronizedRegistryEitherType(RegistryKey.of("damage_type")));
     public static final StructuredDataKey<Integer> DAMAGE_TYPE26_1 = new StructuredDataKey<>("damage_type", new SynchronizedRegistryValueType(RegistryKey.of("damage_type")));
     public static final StructuredDataKey<Tag> ITEM_NAME = new StructuredDataKey<>("item_name", Types.TEXT_COMPONENT_TAG);
     public static final StructuredDataKey<ItemModel> ITEM_MODEL = new StructuredDataKey<>("item_model", ItemModel.TYPE);
@@ -153,6 +152,8 @@ public record StructuredDataKey<T>(String identifier, Type<T> type) {
     public static final StructuredDataKey<FoodProperties1_20_5> FOOD1_21 = new StructuredDataKey<>("food", FoodProperties1_20_5.TYPE1_21);
     public static final StructuredDataKey<FoodProperties1_21_2> FOOD1_21_2 = new StructuredDataKey<>("food", FoodProperties1_21_2.TYPE);
     public static final StructuredDataKey<Consumable1_21_2> CONSUMABLE1_21_2 = new StructuredDataKey<>("consumable", Consumable1_21_2.TYPE1_21_2);
+    // 1.21.5-1.21.9 only, animation id 5 was still named spear
+    public static final StructuredDataKey<Consumable1_21_2> CONSUMABLE1_21_5 = new StructuredDataKey<>("consumable", Consumable1_21_2.TYPE1_21_5);
     public static final StructuredDataKey<Consumable1_21_2> CONSUMABLE26_3 = new StructuredDataKey<>("consumable", Consumable1_21_2.TYPE26_3);
     public static final StructuredDataKey<UseCooldown> USE_COOLDOWN = new StructuredDataKey<>("use_cooldown", UseCooldown.TYPE);
     public static final StructuredDataKey<Unit> FIRE_RESISTANT = new StructuredDataKey<>("fire_resistant", Types.EMPTY);

api/src/main/java/com/viaversion/viaversion/api/minecraft/data/version/StructuredDataKeys26_2.java

@@ -32,6 +32,6 @@ public class StructuredDataKeys26_2 extends StructuredDataKeys1_21_11 {
 
     public StructuredDataKeys26_2(final VersionedTypesHolder types) {
         super(types);
-        this.sulfurCubeContent = add("sulfur_cube_content", types.item());
+        this.sulfurCubeContent = add("sulfur_cube_content", types.itemTemplate());
     }
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/BlockTransformData.java

@@ -1,126 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.minecraft.item.data;
-
-import com.viaversion.nbt.tag.CompoundTag;
-import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.data.MappingData.MappingType;
-import com.viaversion.viaversion.api.minecraft.Holder;
-import com.viaversion.viaversion.api.minecraft.SoundEvent;
-import com.viaversion.viaversion.api.minecraft.codec.Ops;
-import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.Types;
-import com.viaversion.viaversion.api.type.types.ArrayType;
-import com.viaversion.viaversion.util.Copyable;
-import com.viaversion.viaversion.util.Rewritable;
-import io.netty.buffer.ByteBuf;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-// TODO move block state provider rewriting to registry data rewriter
-public record BlockTransformData(CompoundTag blockStateProvider, Holder<SoundEvent> sound, int transformParticle,
-                                 int[] disallowedFaces, @Nullable String loot, int dropStrategy,
-                                 boolean updateFromNeighbors, int transformType,
-                                 boolean consumeOnUse, int itemDamagePerUse) implements Rewritable, Copyable {
-
-    public static final Type<BlockTransformData> TYPE = new Type<>(BlockTransformData.class) {
-        @Override
-        public BlockTransformData read(final ByteBuf buffer) {
-            final CompoundTag blockStateProvider = Types.COMPOUND_TAG.read(buffer);
-            final Holder<SoundEvent> sound = Types.SOUND_EVENT.read(buffer);
-            final int transformParticle = Types.VAR_INT.readPrimitive(buffer);
-            final int[] disallowedFaces = Types.VAR_INT_ARRAY_PRIMITIVE.read(buffer);
-            final String loot = Types.OPTIONAL_STRING.read(buffer);
-            final int dropStrategy = Types.VAR_INT.readPrimitive(buffer);
-            final boolean updateFromNeighbors = Types.BOOLEAN.read(buffer);
-            final int transformType = Types.VAR_INT.readPrimitive(buffer);
-            final boolean consumeOnUse = Types.BOOLEAN.read(buffer);
-            final int itemDamagePerUse = Types.VAR_INT.readPrimitive(buffer);
-            return new BlockTransformData(blockStateProvider, sound, transformParticle, disallowedFaces, loot, dropStrategy, updateFromNeighbors, transformType, consumeOnUse, itemDamagePerUse);
-        }
-
-        @Override
-        public void write(final ByteBuf buffer, final BlockTransformData value) {
-            Types.COMPOUND_TAG.write(buffer, value.blockStateProvider);
-            Types.SOUND_EVENT.write(buffer, value.sound);
-            Types.VAR_INT.writePrimitive(buffer, value.transformParticle);
-            Types.VAR_INT_ARRAY_PRIMITIVE.write(buffer, value.disallowedFaces);
-            Types.OPTIONAL_STRING.write(buffer, value.loot);
-            Types.VAR_INT.writePrimitive(buffer, value.dropStrategy);
-            Types.BOOLEAN.write(buffer, value.updateFromNeighbors);
-            Types.VAR_INT.writePrimitive(buffer, value.transformType);
-            Types.BOOLEAN.write(buffer, value.consumeOnUse);
-            Types.VAR_INT.writePrimitive(buffer, value.itemDamagePerUse);
-        }
-
-        @Override
-        public void write(final Ops ops, final BlockTransformData data) {
-            final Holder<SoundEvent> defaultSound = Holder.of(ops.context().registryAccess().id(MappingType.SOUND, "intentionally_empty"));
-            ops.writeMap(map -> map
-                .write("block_state_provider", Types.COMPOUND_TAG, data.blockStateProvider)
-                .writeOptional("sound", Types.SOUND_EVENT, data.sound, defaultSound)
-                .writeOptional("particle", EnumTypes.TRANSFORM_PARTICLE, data.transformParticle, 0)
-                .writeOptional("disallowed_faces", EnumTypes.DIRECTION.new EnumArrayType(), data.disallowedFaces, new int[0])
-                .writeOptional("loot", Types.STRING, data.loot)
-                .writeOptional("drop_strategy", Types.VAR_INT, data.dropStrategy, 1)
-                .writeOptional("update_from_neighbors", Types.BOOLEAN, data.updateFromNeighbors, true)
-                .writeOptional("transform_type", Types.VAR_INT, data.transformType, 0)
-                .writeOptional("consume_on_use", Types.BOOLEAN, data.consumeOnUse, true)
-                .writeOptional("item_damage_per_use", Types.VAR_INT, data.itemDamagePerUse, 0)
-            );
-        }
-    };
-    public static final ArrayType<BlockTransformData> ARRAY_TYPE = new ArrayType<>(TYPE);
-
-    @Override
-    public BlockTransformData rewrite(final UserConnection connection, final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
-        CompoundTag updatedTag = blockStateProvider().copy();
-        if (protocol.getRegistryDataRewriter().updateBlockStateProvider(updatedTag)) {
-            // Back it up clientbound so server data doesn't disappear; remove it for newly spawned items serverbound.
-            // Given it's not even encoded properly over the network and would otherwise require keeping full block state mappings
-            // and is not needed on the client, we only do the bare minimum to guarantee compatibility.
-            if (clientbound) {
-                updatedTag.put("backup", this.blockStateProvider);
-            } else {
-                final CompoundTag backupTag = updatedTag.getCompoundTag("backup");
-                updatedTag = backupTag != null ? backupTag : dummyBlockStateProvider();
-            }
-        }
-        return new BlockTransformData(updatedTag, sound, transformParticle, disallowedFaces, loot, dropStrategy, updateFromNeighbors, transformType, consumeOnUse, itemDamagePerUse);
-    }
-
-    private CompoundTag dummyBlockStateProvider() {
-        final CompoundTag state = new CompoundTag();
-        state.putString("Name", "dirt");
-
-        final CompoundTag tag = new CompoundTag();
-        tag.putString("type", "simple");
-        tag.put("state", state);
-        return tag;
-    }
-
-    @Override
-    public BlockTransformData copy() {
-        return new BlockTransformData(blockStateProvider.copy(), sound, transformParticle, disallowedFaces, loot, dropStrategy, updateFromNeighbors, transformType, consumeOnUse, itemDamagePerUse);
-    }
-}

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/DamageType.java

@@ -1,39 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.minecraft.item.data;
-
-import com.viaversion.viaversion.api.type.TransformingType;
-import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.Types;
-import com.viaversion.viaversion.api.type.types.EitherType;
-import com.viaversion.viaversion.util.Either;
-
-/**
- * 1.21.11-only damage type.
- *
- * @param id registry int or string id
- */
-public record DamageType(Either<Integer, String> id) {
-
-    public static final Type<DamageType> TYPE1_21_11 = TransformingType.of(new EitherType<>(Types.VAR_INT, Types.STRING), DamageType.class, DamageType::new, DamageType::id);
-}

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/DeathProtection.java

@@ -33,13 +33,13 @@ public record DeathProtection(ConsumeEffect<?>[] deathEffects) implements Copyab
     public static final Type<DeathProtection> TYPE1_21_2 = new TransformingType<>(ConsumeEffect.ARRAY_TYPE1_21_2, DeathProtection.class, DeathProtection::new, DeathProtection::deathEffects) {
         @Override
         public void write(final Ops ops, final DeathProtection value) {
-            ops.writeMap(map -> map.write("death_effects", ConsumeEffect.ARRAY_TYPE1_21_2, value.deathEffects));
+            ops.writeMap(map -> map.writeOptional("death_effects", ConsumeEffect.ARRAY_TYPE1_21_2, value.deathEffects, new ConsumeEffect<?>[0]));
         }
     };
     public static final Type<DeathProtection> TYPE26_3 = new TransformingType<>(ConsumeEffect.ARRAY_TYPE26_3, DeathProtection.class, DeathProtection::new, DeathProtection::deathEffects) {
         @Override
         public void write(final Ops ops, final DeathProtection value) {
-            ops.writeMap(map -> map.write("death_effects", ConsumeEffect.ARRAY_TYPE26_3, value.deathEffects));
+            ops.writeMap(map -> map.writeOptional("death_effects", ConsumeEffect.ARRAY_TYPE26_3, value.deathEffects, new ConsumeEffect<?>[0]));
         }
     };
 

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/EnumTypes.java

@@ -47,11 +47,8 @@ public final class EnumTypes {
     public static final EnumType AXOLOTL_VARIANT = new EnumType("lucy", "wild", "gold", "cyan", "blue");
     public static final EnumType EQUIPMENT_SLOT = new EnumType("mainhand", "feet", "legs", "chest", "head", "offhand", "body", "saddle");
     public static final EnumType SWING_ANIMATION1_21_11 = new EnumType("none", "whack", "stab");
+    public static final EnumType ITEM_USE_ANIMATION1_21_5 = new EnumType("none", "eat", "drink", "block", "bow", "spear", "crossbow", "spyglass", "toot_horn", "brush", "bundle");
     public static final EnumType ITEM_USE_ANIMATION = new EnumType("none", "eat", "drink", "block", "bow", "trident", "crossbow", "spyglass", "toot_horn", "brush", "bundle", "spear");
-    public static final EnumType DIRECTION = new EnumType("down", "up", "north", "south", "west", "east");
-    public static final EnumType TRANSFORM_PARTICLE = new EnumType("none", "scrape", "wax_on", "wax_off");
-    public static final EnumType TRAMNSFORM_DROP_STRATEGY = new EnumType("clicked_face", "from_middle");
-    public static final EnumType TRAMNSFORM_TYPE = new EnumType("single_block", "copper_chest");
     // Enums with non-ordinal ids
     public static final FakeEnumType RABBIT_VARIANT = new FakeEnumType(List.of("brown", "white", "black", "white_splotched", "gold", "salt"), of(99, "evil"));
     // Hardcoded registries

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/FilterableComponent.java

@@ -34,7 +34,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class FilterableComponent extends Filterable<Tag> implements Copyable, Rewritable {
 
-    public static final Type<FilterableComponent> TYPE = new FilterableType<>(Types.TAG, Types.OPTIONAL_TAG, FilterableComponent.class) {
+    public static final Type<FilterableComponent> TYPE = new FilterableType<>(Types.TEXT_COMPONENT_TAG, Types.OPTIONAL_TAG, FilterableComponent.class) {
         @Override
         protected FilterableComponent create(final Tag raw, final Tag filtered) {
             return new FilterableComponent(raw, filtered);

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/Instrument1_21_2.java

@@ -67,7 +67,7 @@ public record Instrument1_21_2(Holder<SoundEvent> soundEvent, float useDuration,
                 .write("sound_event", Types.SOUND_EVENT, value.soundEvent())
                 .write("use_duration", Types.FLOAT, value.useDuration())
                 .write("range", Types.FLOAT, value.range())
-                .write("description", Types.TAG, value.description()));
+                .write("description", Types.TEXT_COMPONENT_TAG, value.description()));
         }
 
         @Override
@@ -103,8 +103,8 @@ public record Instrument1_21_2(Holder<SoundEvent> soundEvent, float useDuration,
                 .write("sound_event", Types.SOUND_EVENT, value.soundEvent())
                 .write("use_duration", Types.FLOAT, value.useDuration())
                 .write("range", Types.FLOAT, value.range())
-                .write("durability_damage", Types.VAR_INT, value.durabilityDamage())
-                .write("description", Types.TAG, value.description()));
+                .writeOptional("durability_damage", Types.VAR_INT, value.durabilityDamage(), 0)
+                .write("description", Types.TEXT_COMPONENT_TAG, value.description()));
         }
 
         @Override

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/PotDecorations1_20_5.java

@@ -29,16 +29,19 @@ import com.viaversion.viaversion.api.type.TransformingType;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.util.Copyable;
+import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.Rewritable;
 
 public record PotDecorations1_20_5(int[] itemIds) implements Copyable, Rewritable {
 
+    private static final Key BRICK = Key.ofPath("brick");
     public static final Type<PotDecorations1_20_5> TYPE = new TransformingType<>(Types.VAR_INT_ARRAY_PRIMITIVE, PotDecorations1_20_5.class, PotDecorations1_20_5::new, PotDecorations1_20_5::itemIds) {
         @Override
         public void write(final Ops ops, final PotDecorations1_20_5 value) {
+            // Vanilla always encodes all 4 sides, filling missing ones with bricks
             ops.writeList(list -> {
-                for (final int itemId : value.itemIds) {
-                    list.write(Types.IDENTIFIER, ops.context().registryAccess().item(itemId));
+                for (int i = 0; i < 4; i++) {
+                    list.write(Types.IDENTIFIER, i < value.itemIds.length ? ops.context().registryAccess().item(value.itemIds[i]) : BRICK);
                 }
             });
         }

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/SignText.java

@@ -52,10 +52,10 @@ public record SignText(Tag[] messages, Tag @Nullable [] filteredMessages, int co
         @Override
         public void write(final Ops ops, final SignText value) {
             ops.writeMap(map -> map
-                .write("messages", Types.SIGN_TEXT, value.messages)
-                .writeOptional("filtered_messages", Types.SIGN_TEXT, value.filteredMessages)
-                .write("color", Types.VAR_INT, value.color, 15)
-                .write("has_glowing_text", Types.BOOLEAN, value.hasGlowingText, false));
+                .write("messages", Types.TEXT_COMPONENT_TAG_ARRAY, value.messages)
+                .writeOptional("filtered_messages", Types.TEXT_COMPONENT_TAG_ARRAY, value.filteredMessages)
+                .write("color", EnumTypes.DYE_COLOR, value.color)
+                .write("has_glowing_text", Types.BOOLEAN, value.hasGlowingText));
         }
     };
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/consumable/Consumable1_21_2.java

@@ -31,6 +31,7 @@ import com.viaversion.viaversion.api.minecraft.item.data.EnumTypes;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.api.type.types.EnumType;
 import com.viaversion.viaversion.util.Copyable;
 import com.viaversion.viaversion.util.Rewritable;
 import io.netty.buffer.ByteBuf;
@@ -39,16 +40,19 @@ public record Consumable1_21_2(float consumeSeconds, int animationType, Holder<S
                                boolean hasConsumeParticles,
                                ConsumeEffect<?>[] consumeEffects) implements Copyable, Rewritable {
 
-    public static final Type<Consumable1_21_2> TYPE1_21_2 = new ConsumableType(ConsumeEffect.ARRAY_TYPE1_21_2);
-    public static final Type<Consumable1_21_2> TYPE26_3 = new ConsumableType(ConsumeEffect.ARRAY_TYPE26_3);
+    public static final Type<Consumable1_21_2> TYPE1_21_2 = new ConsumableType(ConsumeEffect.ARRAY_TYPE1_21_2, EnumTypes.ITEM_USE_ANIMATION);
+    public static final Type<Consumable1_21_2> TYPE1_21_5 = new ConsumableType(ConsumeEffect.ARRAY_TYPE1_21_2, EnumTypes.ITEM_USE_ANIMATION1_21_5);
+    public static final Type<Consumable1_21_2> TYPE26_3 = new ConsumableType(ConsumeEffect.ARRAY_TYPE26_3, EnumTypes.ITEM_USE_ANIMATION);
 
     private static final class ConsumableType extends Type<Consumable1_21_2> {
 
         private final Type<ConsumeEffect<?>[]> consumeEffectType;
+        private final EnumType animationType;
 
-        private ConsumableType(final Type<ConsumeEffect<?>[]> consumeEffectType) {
+        private ConsumableType(final Type<ConsumeEffect<?>[]> consumeEffectType, final EnumType animationType) {
             super(Consumable1_21_2.class);
             this.consumeEffectType = consumeEffectType;
+            this.animationType = animationType;
         }
 
         @Override
@@ -75,7 +79,7 @@ public record Consumable1_21_2(float consumeSeconds, int animationType, Holder<S
             final Holder<SoundEvent> defaultSound = Holder.of(ops.context().registryAccess().id(MappingData.MappingType.SOUND, "entity.generic.eat"));
             ops.writeMap(map -> map
                 .writeOptional("consume_seconds", Types.FLOAT, value.consumeSeconds, 1.6F)
-                .writeOptional("animation", EnumTypes.ITEM_USE_ANIMATION, value.animationType, 1)
+                .writeOptional("animation", animationType, value.animationType, 1)
                 .writeOptional("sound", Types.SOUND_EVENT, value.sound, defaultSound)
                 .writeOptional("has_consume_particles", Types.BOOLEAN, value.hasConsumeParticles, true)
                 .writeOptional("on_consume_effects", consumeEffectType, value.consumeEffects, new ConsumeEffect<?>[0]));

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/consumable/ConsumeEffect.java

@@ -56,7 +56,7 @@ public record ConsumeEffect<T>(int id, Type<T> type, T value) {
 
         @Override
         public void write(final Ops ops, final Float value) {
-            ops.writeMap(map -> map.write("diameter", Types.FLOAT, value, 16F));
+            ops.writeMap(map -> map.writeOptional("diameter", Types.FLOAT, value, 16F));
         }
     };
     public static final Type<TeleportRandomlyConsumeEffect> TELEPORT_RANDOMLY_TYPE26_3 = new Type<>(TeleportRandomlyConsumeEffect.class) {
@@ -76,8 +76,8 @@ public record ConsumeEffect<T>(int id, Type<T> type, T value) {
         @Override
         public void write(final Ops ops, final TeleportRandomlyConsumeEffect value) {
             ops.writeMap(map -> map
-                .write("diameter", Types.FLOAT, value.diameter(), 16F)
-                .write("directional_particles", Types.BOOLEAN, value.directionalParticles(), true)
+                .writeOptional("diameter", Types.FLOAT, value.diameter(), 16F)
+                .writeOptional("directional_particles", Types.BOOLEAN, value.directionalParticles(), true)
             );
         }
     };

api/src/main/java/com/viaversion/viaversion/api/type/Types.java

@@ -227,6 +227,7 @@ public final class Types {
     public static final Type<Tag[]> TAG_ARRAY = new ArrayType<>(TAG);
     public static final Type<Tag> OPTIONAL_TAG = TagType.OptionalTagType.type();
     public static final Type<Tag> TEXT_COMPONENT_TAG = new TextComponentTagType(); // only strictly needed for hashing
+    public static final Type<Tag[]> TEXT_COMPONENT_TAG_ARRAY = new ArrayType<>(Types.TEXT_COMPONENT_TAG);
 
     public static final Type<Tag> CUSTOM_CLICK_ACTION_TAG = new LengthPrefixedTagType(65536);
     public static final FixedLengthArrayType<Tag> SIGN_TEXT = new FixedLengthArrayType<>(TAG, 4);

api/src/main/java/com/viaversion/viaversion/api/type/types/ArrayType.java

@@ -111,4 +111,14 @@ public class ArrayType<T> extends Type<T[]> {
     public ArrayType<T> withMaxLength(final int maxLength) {
         return new ArrayType<>(this.getOutputClass(), this.elementType, maxLength);
     }
+
+    static int checkLength(final int length, final int elementBytes, final int readable) {
+        if (length < 0) {
+            throw new IllegalArgumentException("Length " + length + " is negative");
+        }
+        if ((long) length * elementBytes > readable) {
+            throw new IllegalArgumentException("Length " + length + " is larger than readable bytes");
+        }
+        return length;
+    }
 }

api/src/main/java/com/viaversion/viaversion/api/type/types/BooleanArrayType.java

@@ -57,7 +57,7 @@ public class BooleanArrayType extends Type<boolean[]> {
     @Override
     public boolean[] read(final ByteBuf buffer) {
         final int length = this.length == -1 ? Types.VAR_INT.readPrimitive(buffer) : this.length;
-        Preconditions.checkArgument(buffer.isReadable(length), "Length is fewer than readable bytes");
+        Preconditions.checkArgument(buffer.isReadable(length), "Length is larger than readable bytes");
         final boolean[] array = new boolean[length];
         for (int i = 0; i < length; i++) {
             array[i] = buffer.readBoolean();

api/src/main/java/com/viaversion/viaversion/api/type/types/ByteArrayType.java

@@ -56,7 +56,7 @@ public class ByteArrayType extends Type<byte[]> {
     @Override
     public byte[] read(final ByteBuf buffer) {
         final int length = this.length == -1 ? Types.VAR_INT.readPrimitive(buffer) : this.length;
-        Preconditions.checkArgument(buffer.isReadable(length), "Length is fewer than readable bytes");
+        Preconditions.checkArgument(buffer.isReadable(length), "Length is larger than readable bytes");
         final byte[] array = new byte[length];
         buffer.readBytes(array);
         return array;

api/src/main/java/com/viaversion/viaversion/api/type/types/FloatArrayType.java

@@ -27,6 +27,8 @@ import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import io.netty.buffer.ByteBuf;
 
+import static com.viaversion.viaversion.api.type.types.ArrayType.checkLength;
+
 public class FloatArrayType extends Type<float[]> {
 
     private final int length;
@@ -55,8 +57,7 @@ public class FloatArrayType extends Type<float[]> {
 
     @Override
     public float[] read(final ByteBuf buffer) {
-        final int length = this.length == -1 ? Types.VAR_INT.readPrimitive(buffer) : this.length;
-        Preconditions.checkArgument(buffer.isReadable(length), "Length is fewer than readable bytes");
+        final int length = checkLength(this.length == -1 ? Types.VAR_INT.readPrimitive(buffer) : this.length, Float.BYTES, buffer.readableBytes());
         final float[] array = new float[length];
         for (int i = 0; i < length; i++) {
             array[i] = buffer.readFloat();

api/src/main/java/com/viaversion/viaversion/api/type/types/IntArrayType.java

@@ -28,6 +28,8 @@ import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import io.netty.buffer.ByteBuf;
 
+import static com.viaversion.viaversion.api.type.types.ArrayType.checkLength;
+
 public class IntArrayType extends Type<int[]> {
 
     private final int length;
@@ -56,8 +58,7 @@ public class IntArrayType extends Type<int[]> {
 
     @Override
     public int[] read(final ByteBuf buffer) {
-        final int length = this.length == -1 ? Types.VAR_INT.readPrimitive(buffer) : this.length;
-        Preconditions.checkArgument(buffer.isReadable(length), "Length is fewer than readable bytes");
+        final int length = checkLength(this.length == -1 ? Types.VAR_INT.readPrimitive(buffer) : this.length, Integer.BYTES, buffer.readableBytes());
         final int[] array = new int[length];
         for (int i = 0; i < length; i++) {
             array[i] = buffer.readInt();

api/src/main/java/com/viaversion/viaversion/api/type/types/LongArrayType.java

@@ -28,6 +28,8 @@ import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import io.netty.buffer.ByteBuf;
 
+import static com.viaversion.viaversion.api.type.types.ArrayType.checkLength;
+
 public class LongArrayType extends Type<long[]> {
 
     private final int length;
@@ -43,8 +45,7 @@ public class LongArrayType extends Type<long[]> {
 
     @Override
     public long[] read(final ByteBuf buffer) {
-        final int length = this.length == -1 ? Types.VAR_INT.readPrimitive(buffer) : this.length;
-        Preconditions.checkArgument(buffer.isReadable(length), "Length is fewer than readable bytes");
+        final int length = checkLength(this.length == -1 ? Types.VAR_INT.readPrimitive(buffer) : this.length, Long.BYTES, buffer.readableBytes());
         return readFixedLength(buffer, length);
     }
 

api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemTemplateType26_1.java

@@ -22,6 +22,7 @@
  */
 package com.viaversion.viaversion.api.type.types.item;
 
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
 import com.viaversion.viaversion.api.minecraft.data.StructuredData;
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataContainer;
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataKey;
@@ -55,6 +56,16 @@ public class ItemTemplateType26_1 extends ItemType1_20_5 {
         writeData(buffer, object);
     }
 
+    @Override
+    public void write(final Ops ops, final Item item) {
+        // Unlike item stacks, templates omit the default count
+        ops.writeMap(map -> {
+            map.write("id", Types.IDENTIFIER, ops.context().registryAccess().item(item.identifier()))
+                .writeOptional("count", Types.VAR_INT, item.amount(), 1);
+            writeComponents(map, item);
+        });
+    }
+
     public static final class OptionalItemTemplateType extends OptionalType<Item> {
 
         public OptionalItemTemplateType(final Type<Item> type) {

api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_20_5.java

@@ -127,22 +127,25 @@ public class ItemType1_20_5 extends Type<Item> {
         ops.writeMap(map -> {
             map.write("id", Types.IDENTIFIER, ops.context().registryAccess().item(item.identifier()))
                 .write("count", Types.VAR_INT, item.amount());
+            writeComponents(map, item);
+        });
+    }
 
-            if (item.dataContainer().isEmpty()) {
-                return;
-            }
+    protected void writeComponents(final Ops.MapSerializer map, final Item item) {
+        if (item.dataContainer().isEmpty()) {
+            return;
+        }
 
-            map.writeMap("components", components -> {
-                for (final StructuredData<?> data : item.dataContainer().data().values()) {
-                    String key = Key.namespaced(data.key().identifier());
-                    if (data.isEmpty()) {
-                        key = "!" + key;
-                    }
-
-                    //noinspection unchecked
-                    components.write(key, (Type<StructuredData<?>>) dataType, data);
+        map.writeMap("components", components -> {
+            for (final StructuredData<?> data : item.dataContainer().data().values()) {
+                String key = Key.namespaced(data.key().identifier());
+                if (data.isEmpty()) {
+                    key = "!" + key;
                 }
-            });
+
+                //noinspection unchecked
+                components.write(key, (Type<StructuredData<?>>) dataType, data);
+            }
         });
     }
 

common/src/main/java/com/viaversion/viaversion/codec/CodecRegistryContext.java

@@ -31,7 +31,6 @@ public record CodecRegistryContext(Protocol<?, ?, ?, ?> protocol, RegistryAccess
 
     // Generally from hardcoded, but highly variable client data
     private static final Set<StructuredDataKey<?>> NOT_IMPLEMENTED = new ReferenceOpenHashSet<>(List.of(
-        StructuredDataKey.DAMAGE_TYPE1_21_11
     ));
 
     public CodecRegistryContext(final Protocol<?, ?, ?, ?> protocol, final RegistryAccess registryAccess, final boolean mapped) {

common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/rewriter/ItemPacketRewriter1_17.java

@@ -125,6 +125,7 @@ public final class ItemPacketRewriter1_17 extends ItemRewriter<ClientboundPacket
             }
             if (tag.getNumberTag("map") == null) {
                 tag.put("map", new IntTag(0));
+                tag.putBoolean(nbtTagName("map"), true);
             }
         }
 
@@ -132,4 +133,20 @@ public final class ItemPacketRewriter1_17 extends ItemRewriter<ClientboundPacket
         return item;
     }
 
+    @Override
+    public Item handleItemToServer(UserConnection connection, Item item) {
+        if (item == null) return null;
+
+        super.handleItemToServer(connection, item);
+
+        CompoundTag tag = item.tag();
+        if (item.identifier() == 733 && tag != null && tag.remove(nbtTagName("map")) != null) {
+            tag.remove("map");
+            if (tag.isEmpty()) {
+                item.setTag(null);
+            }
+        }
+        return item;
+    }
+
 }

common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/rewriter/BlockItemPacketRewriter1_20_3.java

@@ -137,7 +137,10 @@ public final class BlockItemPacketRewriter1_20_3 extends ItemRewriter<Clientboun
             final CompoundTag filteredPages = tag.getCompoundTag("filtered_pages");
             if (filteredPages != null) {
                 for (final String string : filteredPages.keySet()) {
-                    updatePageTag(filteredPages.getStringTag(string));
+                    final StringTag pageTag = filteredPages.getStringTag(string);
+                    if (pageTag != null) {
+                        updatePageTag(pageTag);
+                    }
                 }
             }
         }

common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java

@@ -692,6 +692,11 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
         if (bannerPatterns != null) {
             restoreBannerPatternsFromBackup(bannerPatterns, data);
         }
+
+        final CompoundTag trim = backupTag.getCompoundTag("trim");
+        if (trim != null) {
+            restoreArmorTrimFromBackup(trim, data);
+        }
     }
 
     private void restoreInstrumentFromBackup(final CompoundTag instrument, final StructuredDataContainer data) {
@@ -799,6 +804,25 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
         data.set(StructuredDataKey.BANNER_PATTERNS, patternLayer.toArray(new BannerPatternLayer[0]));
     }
 
+    private void restoreArmorTrimFromBackup(final CompoundTag trim, final StructuredDataContainer data) {
+        final Tag materialTag = trim.get("material");
+        final Holder<ArmorTrimMaterial1_20_5> materialHolder;
+        if (materialTag instanceof IntTag materialIntTag) {
+            materialHolder = Holder.of(materialIntTag.asInt());
+        } else if (materialTag instanceof CompoundTag materialCompoundTag) {
+            ArmorTrimMaterial1_20_5 material = readTrimMaterial(materialCompoundTag);
+            if (material == null) {
+                return;
+            }
+            materialHolder = Holder.of(material);
+        } else return;
+
+        final Holder<ArmorTrimPattern> patternHolder = Holder.of(trim.getInt("pattern"));
+        final boolean showInTooltip = trim.getBoolean("show_in_tooltip");
+
+        data.set(StructuredDataKey.TRIM1_20_5, new ArmorTrim1_20_5(materialHolder, patternHolder, showInTooltip));
+    }
+
     private AdventureModePredicate updateBlockPredicates(final UserConnection connection, final ListTag<StringTag> tag, final boolean showInTooltip) {
         final BlockPredicate[] predicates = tag.stream()
             .map(StringTag::getValue)
@@ -969,8 +993,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
     private void updateArmorTrim(final UserConnection connection, final StructuredDataContainer data, final CompoundTag trimTag, final boolean showInTooltip) {
         final Tag materialTag = trimTag.get("material");
         final Holder<ArmorTrimMaterial1_20_5> materialHolder;
-        final ProtocolStorables1_20_5 storables = connection.storables(protocol);
-        final ArmorTrimStorage trimStorage = storables.armorTrims();
+        final ArmorTrimStorage trimStorage = connection.get(ArmorTrimStorage.class);
         if (materialTag instanceof StringTag materialStringTag) {
             final int id = trimStorage.trimMaterials().keyToId(materialStringTag.getValue());
             if (id == -1) {
@@ -979,39 +1002,11 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
 
             materialHolder = Holder.of(id);
         } else if (materialTag instanceof CompoundTag materialCompoundTag) {
-            final StringTag assetNameTag = materialCompoundTag.getStringTag("asset_name");
-            final StringTag ingredientTag = materialCompoundTag.getStringTag("ingredient");
-            if (assetNameTag == null || ingredientTag == null) {
+            ArmorTrimMaterial1_20_5 material = readTrimMaterial(materialCompoundTag);
+            if (material == null) {
                 return;
             }
-
-            final int ingredientId = StructuredDataConverter.removeItemBackupTag(materialCompoundTag, toMappedItemId(ingredientTag.getValue()));
-            if (ingredientId == -1) {
-                return;
-            }
-
-            final NumberTag itemModelIndexTag = materialCompoundTag.getNumberTag("item_model_index");
-            final CompoundTag overrideArmorMaterialsTag = materialCompoundTag.getCompoundTag("override_armor_materials");
-            final Tag descriptionTag = materialCompoundTag.get("description");
-
-            final Map<String, String> overrideArmorMaterials = new Object2ObjectArrayMap<>();
-            if (overrideArmorMaterialsTag != null) {
-                for (final Map.Entry<String, Tag> entry : overrideArmorMaterialsTag.entrySet()) {
-                    if (!(entry.getValue() instanceof StringTag valueTag)) {
-                        continue;
-                    }
-
-                    overrideArmorMaterials.put(entry.getKey(), valueTag.getValue());
-                }
-            }
-
-            materialHolder = Holder.of(new ArmorTrimMaterial1_20_5(
-                assetNameTag.getValue(),
-                ingredientId,
-                itemModelIndexTag != null ? itemModelIndexTag.asFloat() : 0,
-                overrideArmorMaterials,
-                descriptionTag
-            ));
+            materialHolder = Holder.of(material);
         } else return;
 
         final Tag patternTag = trimTag.get("pattern");
@@ -1048,6 +1043,42 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
         data.set(StructuredDataKey.TRIM1_20_5, new ArmorTrim1_20_5(materialHolder, patternHolder, showInTooltip));
     }
 
+    private ArmorTrimMaterial1_20_5 readTrimMaterial(final CompoundTag tag) {
+        final StringTag assetNameTag = tag.getStringTag("asset_name");
+        final StringTag ingredientTag = tag.getStringTag("ingredient");
+        if (assetNameTag == null || ingredientTag == null) {
+            return null;
+        }
+
+        final int ingredientId = StructuredDataConverter.removeItemBackupTag(tag, toMappedItemId(ingredientTag.getValue()));
+        if (ingredientId == -1) {
+            return null;
+        }
+
+        final NumberTag itemModelIndexTag = tag.getNumberTag("item_model_index");
+        final CompoundTag overrideArmorMaterialsTag = tag.getCompoundTag("override_armor_materials");
+        final Tag descriptionTag = tag.get("description");
+
+        final Map<String, String> overrideArmorMaterials = new Object2ObjectArrayMap<>();
+        if (overrideArmorMaterialsTag != null) {
+            for (final Map.Entry<String, Tag> entry : overrideArmorMaterialsTag.entrySet()) {
+                if (!(entry.getValue() instanceof StringTag valueTag)) {
+                    continue;
+                }
+
+                overrideArmorMaterials.put(entry.getKey(), valueTag.getValue());
+            }
+        }
+
+        return new ArmorTrimMaterial1_20_5(
+                assetNameTag.getValue(),
+                ingredientId,
+                itemModelIndexTag != null ? itemModelIndexTag.asFloat() : 0,
+                overrideArmorMaterials,
+                descriptionTag
+        );
+    }
+
     private void updateMobTags(final StructuredDataContainer data, final CompoundTag tag) {
         final CompoundTag bucketEntityData = new CompoundTag();
         for (final String mobTagKey : MOB_TAGS) {
@@ -1235,7 +1266,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
         if (itemsTag != null) {
             final Item[] items = itemsTag.stream()
                 .limit(256)
-                .map(item -> itemFromTag(connection, item))
+                .map(item -> itemFromTag(connection, item.copy()))
                 .filter(item -> !item.isEmpty())
                 .toArray(Item[]::new);
             data.set(dataKey, items);

common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/StructuredDataConverter.java

@@ -551,10 +551,22 @@ public final class StructuredDataConverter {
             } else {
                 final String oldKey = trimStorage.trimPatterns().idToKey(data.pattern().id());
                 if (oldKey != null) {
-                    trimTag.putString("pattern", oldKey);
+                    if (!"flow".equals(oldKey) && !"bolt".equals(oldKey)) {
+                        trimTag.putString("pattern", oldKey);
+                    } else if (backupInconvertibleData) {
+                        final CompoundTag backupTrim = trimTag.copy();
+                        if (!data.material().isDirect()) {
+                            backupTrim.putInt("material", data.material().id());
+                        }
+                        backupTrim.putInt("pattern", data.pattern().id());
+                        backupTrim.putBoolean("show_in_tooltip", data.showInTooltip());
+                        getBackupTag(tag).put("trim", backupTrim);
+                    }
                 }
             }
-            tag.put("Trim", trimTag);
+            if (trimTag.contains("material") && trimTag.contains("pattern")) {
+                tag.put("Trim", trimTag);
+            }
             if (!data.showInTooltip()) {
                 putHideFlag(tag, HIDE_ARMOR_TRIM);
             }

common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/Protocol1_20_5To1_21.java

@@ -55,6 +55,7 @@ import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.rewriter.text.JsonNBTComponentRewriter;
 import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.UUIDUtil;
+import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 import java.util.UUID;
 
@@ -183,7 +184,7 @@ public final class Protocol1_20_5To1_21 extends AbstractProtocol<ClientboundPack
         }
 
         uuid = UUIDUtil.parseUUID(Key.stripNamespace(id).toUpperCase(Locale.ROOT));
-        return uuid != null ? uuid : UUIDUtil.randomUUID();
+        return uuid != null ? uuid : UUID.nameUUIDFromBytes(id.getBytes(StandardCharsets.UTF_8));
     }
 
     @Override

common/src/main/java/com/viaversion/viaversion/protocols/v1_21_11to26_1/rewriter/BlockItemPacketRewriter26_1.java

@@ -33,7 +33,6 @@ import com.viaversion.viaversion.api.minecraft.item.StructuredItem;
 import com.viaversion.viaversion.api.minecraft.item.data.BlocksAttacks;
 import com.viaversion.viaversion.api.minecraft.item.data.DamageResistant1_21_2;
 import com.viaversion.viaversion.api.minecraft.item.data.DamageResistant26_1;
-import com.viaversion.viaversion.api.minecraft.item.data.DamageType;
 import com.viaversion.viaversion.api.minecraft.item.data.JukeboxPlayable;
 import com.viaversion.viaversion.api.minecraft.item.data.ProvidesBannerPatterns;
 import com.viaversion.viaversion.api.minecraft.item.data.trim.ProvidesTrimMaterial1_20_5;
@@ -86,7 +85,7 @@ public final class BlockItemPacketRewriter26_1 extends StructuredItemRewriter<Cl
         container.replace(StructuredDataKey.PROVIDES_TRIM_MATERIAL1_21_5, StructuredDataKey.PROVIDES_TRIM_MATERIAL26_1, providesTrimMaterial -> upgradeHolder(protocol, connection, providesTrimMaterial.material(), "trim_material"));
         container.replace(StructuredDataKey.CHICKEN_VARIANT1_21_5, StructuredDataKey.CHICKEN_VARIANT26_1, chickenVariant -> upgradeEitherVariant(protocol, connection, chickenVariant, "chicken_variant"));
         container.replace(StructuredDataKey.ZOMBIE_NAUTILUS_VARIANT1_21_11, StructuredDataKey.ZOMBIE_NAUTILUS_VARIANT26_1, nautilusVariant -> upgradeEitherVariant(protocol, connection, nautilusVariant, "zombie_nautilus_variant"));
-        container.replace(StructuredDataKey.DAMAGE_TYPE1_21_11, StructuredDataKey.DAMAGE_TYPE26_1, damageType -> upgradeEitherVariant(protocol, connection, damageType.id(), "damage_type"));
+        container.replace(StructuredDataKey.DAMAGE_TYPE1_21_11, StructuredDataKey.DAMAGE_TYPE26_1, damageType -> upgradeEitherVariant(protocol, connection, damageType, "damage_type"));
         container.replace(StructuredDataKey.PROVIDES_BANNER_PATTERNS1_21_5, StructuredDataKey.PROVIDES_BANNER_PATTERNS26_1, key -> new ProvidesBannerPatterns(tagKeyToHolderSet(protocol, connection, "banner_pattern", key.original())));
         container.replace(StructuredDataKey.DAMAGE_RESISTANT1_21_2, StructuredDataKey.DAMAGE_RESISTANT26_1, damageResistant -> new DamageResistant26_1(tagKeyToHolderSet(protocol, connection, "damage_type", damageResistant.typesTagKey().original())));
         container.replaceKey(StructuredDataKey.BLOCKS_ATTACKS1_21_5, StructuredDataKey.BLOCKS_ATTACKS26_1);
@@ -137,14 +136,14 @@ public final class BlockItemPacketRewriter26_1 extends StructuredItemRewriter<Cl
         container.replace(StructuredDataKey.PROVIDES_TRIM_MATERIAL26_1, StructuredDataKey.PROVIDES_TRIM_MATERIAL1_21_5, providesTrimMaterial -> new ProvidesTrimMaterial1_20_5(EitherHolder.of(providesTrimMaterial)));
         container.replace(StructuredDataKey.CHICKEN_VARIANT26_1, StructuredDataKey.CHICKEN_VARIANT1_21_5, Either::left);
         container.replace(StructuredDataKey.ZOMBIE_NAUTILUS_VARIANT26_1, StructuredDataKey.ZOMBIE_NAUTILUS_VARIANT1_21_11, Either::left);
-        container.replace(StructuredDataKey.DAMAGE_TYPE26_1, StructuredDataKey.DAMAGE_TYPE1_21_11, damageType -> new DamageType(Either.left(damageType)));
+        container.replace(StructuredDataKey.DAMAGE_TYPE26_1, StructuredDataKey.DAMAGE_TYPE1_21_11, Either::left);
         container.replace(StructuredDataKey.PROVIDES_BANNER_PATTERNS26_1, StructuredDataKey.PROVIDES_BANNER_PATTERNS1_21_5, patterns -> tagOrNull(patterns.patterns()));
         container.replace(StructuredDataKey.DAMAGE_RESISTANT26_1, StructuredDataKey.DAMAGE_RESISTANT1_21_2, damageResistant -> {
             final Key key = tagOrNull(damageResistant.types());
             return key != null ? new DamageResistant1_21_2(key) : null;
         });
         container.replace(StructuredDataKey.BLOCKS_ATTACKS26_1, StructuredDataKey.BLOCKS_ATTACKS1_21_5, blocksAttacks -> {
-            if (blocksAttacks.bypassedBy() == null) {
+            if (blocksAttacks.bypassedBy() == null || blocksAttacks.bypassedBy().hasTagKey()) {
                 return blocksAttacks;
             }
             // Remove bypassed by ids

common/src/main/java/com/viaversion/viaversion/protocols/v1_21_4to1_21_5/Protocol1_21_4To1_21_5.java

@@ -182,7 +182,7 @@ public final class Protocol1_21_4To1_21_5 extends AbstractProtocol<ClientboundPa
             StructuredDataKey.POT_DECORATIONS1_20_5, StructuredDataKey.BLOCK_STATE, StructuredDataKey.BEES1_20_5, StructuredDataKey.LOCK1_21_2,
             StructuredDataKey.CONTAINER_LOOT, StructuredDataKey.TOOL1_21_5, StructuredDataKey.ITEM_NAME, StructuredDataKey.OMINOUS_BOTTLE_AMPLIFIER,
             StructuredDataKey.FOOD1_21_2, StructuredDataKey.JUKEBOX_PLAYABLE1_21_5, StructuredDataKey.ATTRIBUTE_MODIFIERS1_21_5,
-            StructuredDataKey.REPAIRABLE, StructuredDataKey.ENCHANTABLE, StructuredDataKey.CONSUMABLE1_21_2,
+            StructuredDataKey.REPAIRABLE, StructuredDataKey.ENCHANTABLE, StructuredDataKey.CONSUMABLE1_21_5,
             StructuredDataKey.USE_COOLDOWN, StructuredDataKey.DAMAGE, StructuredDataKey.EQUIPPABLE1_21_5, StructuredDataKey.ITEM_MODEL,
             StructuredDataKey.GLIDER, StructuredDataKey.TOOLTIP_STYLE, StructuredDataKey.DEATH_PROTECTION1_21_2, StructuredDataKey.WEAPON,
             StructuredDataKey.POTION_DURATION_SCALE, StructuredDataKey.VILLAGER_VARIANT, StructuredDataKey.WOLF_VARIANT, StructuredDataKey.WOLF_COLLAR,

common/src/main/java/com/viaversion/viaversion/protocols/v1_21_4to1_21_5/rewriter/BlockItemPacketRewriter1_21_5.java

@@ -302,6 +302,7 @@ public final class BlockItemPacketRewriter1_21_5 extends StructuredItemRewriter<
         final StructuredDataContainer dataContainer = item.dataContainer();
         dataContainer.replaceKey(StructuredDataKey.TOOL1_20_5, StructuredDataKey.TOOL1_21_5);
         dataContainer.replaceKey(StructuredDataKey.EQUIPPABLE1_21_2, StructuredDataKey.EQUIPPABLE1_21_5);
+        dataContainer.replaceKey(StructuredDataKey.CONSUMABLE1_21_2, StructuredDataKey.CONSUMABLE1_21_5);
         dataContainer.replace(StructuredDataKey.INSTRUMENT1_21_2, StructuredDataKey.INSTRUMENT1_21_5, EitherHolder::of);
 
         // Collect hidden tooltips
@@ -408,6 +409,7 @@ public final class BlockItemPacketRewriter1_21_5 extends StructuredItemRewriter<
         final StructuredDataContainer dataContainer = item.dataContainer();
         dataContainer.replaceKey(StructuredDataKey.TOOL1_21_5, StructuredDataKey.TOOL1_20_5);
         dataContainer.replaceKey(StructuredDataKey.EQUIPPABLE1_21_5, StructuredDataKey.EQUIPPABLE1_21_2);
+        dataContainer.replaceKey(StructuredDataKey.CONSUMABLE1_21_5, StructuredDataKey.CONSUMABLE1_21_2);
         dataContainer.replace(StructuredDataKey.INSTRUMENT1_21_5, StructuredDataKey.INSTRUMENT1_21_2, instrument -> instrument.hasHolder() ? instrument.holder() : null);
 
         final TooltipDisplay tooltipDisplay = dataContainer.get(StructuredDataKey.TOOLTIP_DISPLAY);
@@ -417,7 +419,8 @@ public final class BlockItemPacketRewriter1_21_5 extends StructuredItemRewriter<
             }
 
             final FullMappings mappings = Protocol1_21_4To1_21_5.MAPPINGS.getDataComponentSerializerMappings();
-            if (tooltipDisplay.hiddenComponents().containsAll(HIDE_ADDITIONAL_KEYS.stream().map(key -> mappings.id(key.identifier())).toList())) {
+            // Components added in 1.21.5 don't have an id here and have already been dropped from the hidden set
+            if (tooltipDisplay.hiddenComponents().containsAll(HIDE_ADDITIONAL_KEYS.stream().map(key -> mappings.id(key.identifier())).filter(id -> id != -1).toList())) {
                 dataContainer.set(StructuredDataKey.HIDE_ADDITIONAL_TOOLTIP);
             }
         }
@@ -478,7 +481,7 @@ public final class BlockItemPacketRewriter1_21_5 extends StructuredItemRewriter<
         final ProtocolVersion serverVersion = connection.getProtocolInfo().serverProtocolVersion();
         if (serverVersion.olderThanOrEqualTo(ProtocolVersion.v1_8)) {
             if (item.identifier() == 858 || item.identifier() == 863 || item.identifier() == 873 || item.identifier() == 868 || item.identifier() == 878) { // swords
-                item.dataContainer().remove(StructuredDataKey.CONSUMABLE1_21_2);
+                item.dataContainer().remove(StructuredDataKey.CONSUMABLE1_21_5);
                 item.dataContainer().set(StructuredDataKey.BLOCKS_ATTACKS1_21_5,
                     new BlocksAttacks(
                         0F,

common/src/main/java/com/viaversion/viaversion/protocols/v1_21_5to1_21_6/Protocol1_21_5To1_21_6.java

@@ -132,7 +132,7 @@ public final class Protocol1_21_5To1_21_6 extends AbstractProtocol<ClientboundPa
             StructuredDataKey.POT_DECORATIONS1_20_5, StructuredDataKey.BLOCK_STATE, StructuredDataKey.BEES1_20_5, StructuredDataKey.LOCK1_21_2,
             StructuredDataKey.CONTAINER_LOOT, StructuredDataKey.TOOL1_21_5, StructuredDataKey.ITEM_NAME, StructuredDataKey.OMINOUS_BOTTLE_AMPLIFIER,
             StructuredDataKey.FOOD1_21_2, StructuredDataKey.JUKEBOX_PLAYABLE1_21_5, StructuredDataKey.ATTRIBUTE_MODIFIERS1_21_6,
-            StructuredDataKey.REPAIRABLE, StructuredDataKey.ENCHANTABLE, StructuredDataKey.CONSUMABLE1_21_2,
+            StructuredDataKey.REPAIRABLE, StructuredDataKey.ENCHANTABLE, StructuredDataKey.CONSUMABLE1_21_5,
             StructuredDataKey.USE_COOLDOWN, StructuredDataKey.DAMAGE, StructuredDataKey.EQUIPPABLE1_21_6, StructuredDataKey.ITEM_MODEL,
             StructuredDataKey.GLIDER, StructuredDataKey.TOOLTIP_STYLE, StructuredDataKey.DEATH_PROTECTION1_21_2, StructuredDataKey.WEAPON,
             StructuredDataKey.POTION_DURATION_SCALE, StructuredDataKey.VILLAGER_VARIANT, StructuredDataKey.WOLF_VARIANT, StructuredDataKey.WOLF_COLLAR,

common/src/main/java/com/viaversion/viaversion/protocols/v1_21_7to1_21_9/Protocol1_21_7To1_21_9.java

@@ -155,7 +155,7 @@ public final class Protocol1_21_7To1_21_9 extends AbstractProtocol<ClientboundPa
             StructuredDataKey.POT_DECORATIONS1_20_5, StructuredDataKey.BLOCK_STATE, StructuredDataKey.BEES1_21_9, StructuredDataKey.LOCK1_21_2,
             StructuredDataKey.CONTAINER_LOOT, StructuredDataKey.TOOL1_21_5, StructuredDataKey.ITEM_NAME, StructuredDataKey.OMINOUS_BOTTLE_AMPLIFIER,
             StructuredDataKey.FOOD1_21_2, StructuredDataKey.JUKEBOX_PLAYABLE1_21_5, StructuredDataKey.ATTRIBUTE_MODIFIERS1_21_6,
-            StructuredDataKey.REPAIRABLE, StructuredDataKey.ENCHANTABLE, StructuredDataKey.CONSUMABLE1_21_2,
+            StructuredDataKey.REPAIRABLE, StructuredDataKey.ENCHANTABLE, StructuredDataKey.CONSUMABLE1_21_5,
             StructuredDataKey.USE_COOLDOWN, StructuredDataKey.DAMAGE, StructuredDataKey.EQUIPPABLE1_21_6, StructuredDataKey.ITEM_MODEL,
             StructuredDataKey.GLIDER, StructuredDataKey.TOOLTIP_STYLE, StructuredDataKey.DEATH_PROTECTION1_21_2, StructuredDataKey.WEAPON,
             StructuredDataKey.POTION_DURATION_SCALE, StructuredDataKey.VILLAGER_VARIANT, StructuredDataKey.WOLF_VARIANT, StructuredDataKey.WOLF_COLLAR,

common/src/main/java/com/viaversion/viaversion/protocols/v1_21_7to1_21_9/rewriter/BlockItemPacketRewriter1_21_9.java

@@ -81,7 +81,13 @@ public final class BlockItemPacketRewriter1_21_9 extends StructuredItemRewriter<
     }
 
     public static void downgradeData(final Item item, final StructuredDataContainer container) {
-        container.replaceKey(StructuredDataKey.BEES1_21_9, StructuredDataKey.BEES1_20_5);
+        container.replace(StructuredDataKey.BEES1_21_9, StructuredDataKey.BEES1_20_5, bees -> {
+            for (final Bee bee : bees) {
+                // Stripped from the tag since 1.21.9 but required to load the entity before
+                bee.entityData().tag().putString("id", "minecraft:bee");
+            }
+            return bees;
+        });
         container.replace(StructuredDataKey.ENTITY_DATA1_21_9, StructuredDataKey.ENTITY_DATA1_20_5, entityData -> {
             final String id = Protocol1_21_7To1_21_9.MAPPINGS.getEntityMappings().identifier(entityData.type());
             entityData.tag().putString("id", id);

common/src/main/java/com/viaversion/viaversion/protocols/v1_21_9to1_21_11/rewriter/BlockItemPacketRewriter1_21_11.java

@@ -89,9 +89,11 @@ public final class BlockItemPacketRewriter1_21_11 extends StructuredItemRewriter
     }
 
     public static void upgradeData(final Item item, final StructuredDataContainer container) {
+        container.replaceKey(StructuredDataKey.CONSUMABLE1_21_5, StructuredDataKey.CONSUMABLE1_21_2);
     }
 
     public static void downgradeData(final Item item, final StructuredDataContainer container) {
+        container.replaceKey(StructuredDataKey.CONSUMABLE1_21_2, StructuredDataKey.CONSUMABLE1_21_5);
         container.remove(StructuredDataKey.SWING_ANIMATION);
         container.remove(StructuredDataKey.KINETIC_WEAPON);
         container.remove(StructuredDataKey.PIERCING_WEAPON);

common/src/main/java/com/viaversion/viaversion/protocols/v26_2to26_3/rewriter/BlockItemPacketRewriter26_3.java

@@ -18,6 +18,7 @@
 package com.viaversion.viaversion.protocols.v26_2to26_3.rewriter;
 
 import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.IntTag;
 import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.api.connection.UserConnection;
@@ -235,6 +236,11 @@ public final class BlockItemPacketRewriter26_3 extends StructuredItemRewriter<Cl
         container.remove(StructuredDataKey.MAP_COLOR);
 
         container.replaceKey(StructuredDataKey.INSTRUMENT26_1, StructuredDataKey.INSTRUMENT26_3);
+        if (container.hasEmpty(StructuredDataKey.SWING_ANIMATION)) {
+            container.remove(StructuredDataKey.SWING_ANIMATION);
+            container.setEmpty(StructuredDataKey.ATTACK_ANIMATION);
+            container.setEmpty(StructuredDataKey.INTERACT_ANIMATION);
+        }
         container.replace(StructuredDataKey.SWING_ANIMATION, animation -> {
             container.set(StructuredDataKey.ATTACK_ANIMATION, animation);
             container.set(StructuredDataKey.INTERACT_ANIMATION, animation);
@@ -373,6 +379,11 @@ public final class BlockItemPacketRewriter26_3 extends StructuredItemRewriter<Cl
         }
 
         backupTrimMaterial(backupTag, "provides_trim_material", container.get(StructuredDataKey.PROVIDES_TRIM_MATERIAL26_1));
+
+        final Integer mapColor = container.get(StructuredDataKey.MAP_COLOR);
+        if (mapColor != null) {
+            backupTag.putInt("map_color", mapColor);
+        }
     }
 
     private void backupTrimMaterial(final CompoundTag tag, final String key, @Nullable final Holder<ArmorTrimMaterial1_20_5> materialHolder) {
@@ -407,6 +418,11 @@ public final class BlockItemPacketRewriter26_3 extends StructuredItemRewriter<Cl
         if (providesTrimMaterialTag != null) {
             container.replace(StructuredDataKey.PROVIDES_TRIM_MATERIAL26_3, StructuredDataKey.PROVIDES_TRIM_MATERIAL26_1, material -> restoreTrimMaterial(material, providesTrimMaterialTag));
         }
+
+        final IntTag mapColorTag = backupTag.getIntTag("map_color");
+        if (mapColorTag != null) {
+            container.set(StructuredDataKey.MAP_COLOR, mapColorTag.asInt());
+        }
     }
 
     private Holder<ArmorTrimMaterial1_20_5> restoreTrimMaterial(final Holder<ArmorTrimMaterial26_3> holder, final CompoundTag tag) {

common/src/main/java/com/viaversion/viaversion/protocols/v26_2to26_3/rewriter/RegistryDataRewriter26_3.java

@@ -18,12 +18,15 @@
 package com.viaversion.viaversion.protocols.v26_2to26_3.rewriter;
 
 import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.IntTag;
 import com.viaversion.nbt.tag.ListTag;
+import com.viaversion.nbt.tag.NumberTag;
 import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.protocols.v26_2to26_3.Protocol26_2To26_3;
 import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
 import com.viaversion.viaversion.util.Key;
+import java.util.function.UnaryOperator;
 
 public final class RegistryDataRewriter26_3 extends RegistryDataRewriter {
 
@@ -36,9 +39,10 @@ public final class RegistryDataRewriter26_3 extends RegistryDataRewriter {
         final StringTag condition = term.removeUnchecked("condition");
         if (condition != null) {
             term.put("type", condition);
+            updateNumberProviders(term, condition);
         }
 
-        if (Key.equals(condition.getValue(), "damage_source_properties")) {
+        if (condition != null && Key.equals(condition.getValue(), "damage_source_properties")) {
             final CompoundTag predicate = term.getCompoundTag("predicate");
             if (predicate != null) {
                 final ListTag<CompoundTag> tags = predicate.getListTag("tags", CompoundTag.class);
@@ -51,7 +55,7 @@ public final class RegistryDataRewriter26_3 extends RegistryDataRewriter {
         super.updateEnchantmentTerm(term);
 
         // has to run after super, which maps the block id under the old key
-        if (Key.equals(condition.getValue(), "block_state_property")) {
+        if (condition != null && Key.equals(condition.getValue(), "block_state_property")) {
             condition.setValue("minecraft:match_block");
             term.put("blocks", term.remove("block"));
 
@@ -62,6 +66,117 @@ public final class RegistryDataRewriter26_3 extends RegistryDataRewriter {
         }
     }
 
+    // Number providers have been split into int and float providers
+    private static void updateNumberProviders(final CompoundTag term, final StringTag condition) {
+        if (Key.equals(condition.getValue(), "value_check")) {
+            condition.setValue("int_value_check");
+            convert(term, "value", "value", RegistryDataRewriter26_3::toIntProvider);
+            convert(term, "range", "test", RegistryDataRewriter26_3::updateIntRange);
+        } else if (Key.equals(condition.getValue(), "time_check")) {
+            convert(term, "value", "value", RegistryDataRewriter26_3::updateIntRange);
+        } else if (Key.equals(condition.getValue(), "random_chance")) {
+            convert(term, "chance", "chance", RegistryDataRewriter26_3::toFloatProvider);
+        }
+    }
+
+    private static Tag updateIntRange(final Tag range) {
+        if (range instanceof CompoundTag rangeTag) {
+            convert(rangeTag, "min", "min", RegistryDataRewriter26_3::toIntProvider);
+            convert(rangeTag, "max", "max", RegistryDataRewriter26_3::toIntProvider);
+        }
+        return range;
+    }
+
+    // Old providers were floats, with getInt rounding the value
+    private static Tag toIntProvider(final Tag tag) {
+        if (tag instanceof NumberTag numberTag) {
+            return new IntTag(Math.round(numberTag.asFloat()));
+        } else if (tag instanceof CompoundTag provider) {
+            final String type = provider.getString("type");
+            if (Key.equals(type, "binomial")) {
+                convert(provider, "n", "n", RegistryDataRewriter26_3::toIntProvider);
+                convert(provider, "p", "p", RegistryDataRewriter26_3::toFloatProvider);
+                return provider;
+            } else if (Key.equals(type, "score") && provider.getFloat("scale", 1) == 1) {
+                provider.remove("scale");
+                return provider;
+            }
+        }
+        return unary("from_float", unary("round", toFloatProvider(tag)));
+    }
+
+    private static Tag toFloatProvider(final Tag tag) {
+        if (!(tag instanceof CompoundTag provider)) {
+            return tag;
+        }
+
+        // Untyped providers used to fall back to uniform
+        switch (Key.stripMinecraftNamespace(provider.getString("type", "uniform"))) {
+            case "uniform" -> {
+                provider.putString("type", "minecraft:uniform");
+                convert(provider, "min", "min", RegistryDataRewriter26_3::toFloatProvider);
+                convert(provider, "max", "max", RegistryDataRewriter26_3::toFloatProvider);
+            }
+            case "sum" -> {
+                provider.putString("type", "minecraft:add");
+                convert(provider, "summands", "inputs", summands -> {
+                    final ListTag<CompoundTag> inputs = new ListTag<>(CompoundTag.class);
+                    if (summands instanceof ListTag<?> summandsList) {
+                        for (final Tag summand : summandsList) {
+                            inputs.add(toFloatProviderCompound(summand));
+                        }
+                    }
+                    return inputs;
+                });
+            }
+            case "binomial" -> {
+                return unary("from_int", toIntProvider(provider));
+            }
+            case "score" -> {
+                final Tag scale = provider.remove("scale");
+                final CompoundTag score = unary("from_int", provider);
+                if (scale == null) {
+                    return score;
+                }
+
+                final ListTag<CompoundTag> inputs = new ListTag<>(CompoundTag.class);
+                inputs.add(score);
+                inputs.add(toFloatProviderCompound(scale));
+                final CompoundTag product = new CompoundTag();
+                product.putString("type", "minecraft:mul");
+                product.put("inputs", inputs);
+                return product;
+            }
+        }
+        return provider;
+    }
+
+    private static CompoundTag toFloatProviderCompound(final Tag tag) {
+        final Tag provider = toFloatProvider(tag);
+        if (provider instanceof CompoundTag compoundTag) {
+            return compoundTag;
+        }
+
+        final CompoundTag constant = new CompoundTag();
+        constant.putString("type", "minecraft:constant");
+        constant.put("value", provider);
+        return constant;
+    }
+
+    private static CompoundTag unary(final String type, final Tag input) {
+        final CompoundTag provider = new CompoundTag();
+        provider.putString("type", "minecraft:" + type);
+        provider.put("input", input);
+        return provider;
+    }
+
+    private static void convert(final CompoundTag tag, final String key, final String newKey, final UnaryOperator<Tag> converter) {
+        final Tag value = tag.remove(key);
+        if (value != null) {
+            tag.put(newKey, converter.apply(value));
+        }
+    }
+
     @Override
     public boolean updateBlockStateProvider(final CompoundTag tag) {
         final StringTag typeTag = tag.getStringTag("type");

gradle.properties

@@ -1,10 +1,10 @@
 # Project properties - we put these here so they can be modified without causing a recompile of the build scripts
-projectVersion=5.12.1-SNAPSHOT
+projectVersion=5.12.1
 
 # Smile emoji (note that modrinth may not have added the version on release yet)
 mcVersions=26.3, 26.2, 26.1.2, 26.1.1, 26.1, 1.21.11, 1.21.10, 1.21.9, 1.21.8, 1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10, 1.9.4, 1.9.3, 1.9.2, 1.9.1, 1.9, 1.8.9
 mcVersionRange=1.8-26.3
-velocityVersion=3.4-4.2.0
+velocityVersion=3.4-4.2.1
 
 # Gradle properties
 org.gradle.daemon=true

gradle/libs.versions.toml

@@ -5,7 +5,7 @@ metadata.format.version = "1.1"
 gson = "2.14.0"
 snakeYaml = "2.6"
 fastutil = "8.5.15"
-vianbt = "5.3.0"
+vianbt = "5.4.0"
 mcstructs = "5-3.3.2-SNAPSHOT"
 
 # Common provided
@@ -14,7 +14,7 @@ guava = "17.0"
 
 junit = "6.1.3"
 platformLauncher = "6.1.3"
-checkerQual = "4.2.2"
+checkerQual = "4.3.0"
 
 # Platforms
 paper = "1.20.4-R0.1-SNAPSHOT"

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=acd53f1edaf02f1a8ff99879f8a34b302661a057d9b063ae9e35b552f804d20a
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
+distributionSha256Sum=dce76f55f8e251a3a1f130eb120f30b3d271de2b76c9b0729d316b5a1b6dc01f
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500

gradlew.bat

@@ -26,6 +26,33 @@
 @rem Set local scope for the variables, and ensure extensions are enabled
 setlocal EnableExtensions
 
+@rem Catch executions from older scripts and ensure they exit cleanly.
+@rem This can be removed once we can be reasonably confident that few people
+@rem will be migrating directly to this new wrapper.
+goto afterSafetyNet
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+goto exitWithErrorLevel
+:afterSafetyNet
+
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
 @rem This is normally unused
@@ -45,13 +72,14 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+1>&2 echo.
+1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+1>&2 echo.
+1>&2 echo Please set the JAVA_HOME variable in your environment to match the
+1>&2 echo location of your Java installation.
 
 "%COMSPEC%" /c exit 1
+goto exitWithErrorLevel
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -59,13 +87,14 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+1>&2 echo.
+1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+1>&2 echo.
+1>&2 echo Please set the JAVA_HOME variable in your environment to match the
+1>&2 echo location of your Java installation.
 
 "%COMSPEC%" /c exit 1
+goto exitWithErrorLevel
 
 :execute
 @rem Setup the command line
@@ -75,8 +104,9 @@ echo location of your Java installation. 1>&2
 @rem Execute gradlew
 @rem endlocal doesn't take effect until after the line is parsed and variables are expanded
 @rem which allows us to clear the local environment before executing the java command
-endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel & goto exitWithErrorLevel
 
+@rem This label must not be changed. We rely on old scripts being able to jump to this point.
 :exitWithErrorLevel
 @rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
 "%COMSPEC%" /c exit %ERRORLEVEL%

universal/build.gradle.kts

@@ -1,3 +1,5 @@
+import com.modrinth.minotaur.TaskModrinthUpload
+
 plugins {
     id("io.papermc.hangar-publish-plugin") version "0.1.4"
     id("com.modrinth.minotaur") version "2.+"
@@ -44,10 +46,10 @@ if (runNumber != null && (!isRelease || isMainBranch)) { // Only publish release
         "[$commitHash](https://github.com/ViaVersion/ViaVersion/commit/$commitHash) ${rootProject.latestCommitMessage()}"
     }
 
+    val mcVersions: List<String> = (property("mcVersions") as String)
+        .split(",")
+        .map { it.trim() }
     modrinth {
-        val mcVersions: List<String> = (property("mcVersions") as String)
-            .split(",")
-            .map { it.trim() }
         token.set(System.getenv("MODRINTH_TOKEN"))
         projectId.set("viaversion")
         versionType.set(if (isRelease) "release" else if (isMainBranch) "beta" else "alpha")
@@ -56,7 +58,6 @@ if (runNumber != null && (!isRelease || isMainBranch)) { // Only publish release
         changelog.set(changelogContent)
         uploadFile.set(tasks.shadowJar.flatMap { it.archiveFile })
         gameVersions.set(mcVersions)
-        loaders.add("fabric")
         loaders.add("paper")
         loaders.add("folia")
         loaders.add("velocity")
@@ -70,6 +71,21 @@ if (runNumber != null && (!isRelease || isMainBranch)) { // Only publish release
     }
     tasks.modrinth {
         notCompatibleWithConfigurationCache("")
+        finalizedBy("modrinthFabric")
+    }
+    // Fabric requires 1.14+ (18w43b), so it is uploaded separately with only the supported versions
+    val modrinthExtension = modrinth
+    tasks.register<TaskModrinthUpload>("modrinthFabric") {
+        group = "publishing"
+        dependsOn(tasks.assemble)
+        notCompatibleWithConfigurationCache("")
+        doFirst {
+            modrinthExtension.loaders.set(listOf("fabric"))
+            modrinthExtension.gameVersions.set(mcVersions.filter { version ->
+                val (major, minor) = version.split(".").map(String::toInt)
+                major > 1 || minor >= 14
+            })
+        }
     }
 
     hangarPublish {