1.21.11-pre1

Author: kennytv

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

@@ -37,6 +37,7 @@
 import com.viaversion.viaversion.api.minecraft.data.version.StructuredDataKeys1_21_5;
 import com.viaversion.viaversion.api.minecraft.item.data.AdventureModePredicate;
 import com.viaversion.viaversion.api.minecraft.item.data.ArmorTrim;
+import com.viaversion.viaversion.api.minecraft.item.data.AttackRange;
 import com.viaversion.viaversion.api.minecraft.item.data.AttributeModifiers1_20_5;
 import com.viaversion.viaversion.api.minecraft.item.data.AttributeModifiers1_21;
 import com.viaversion.viaversion.api.minecraft.item.data.BannerPatternLayer;
@@ -145,6 +146,7 @@ public record StructuredDataKey<T>(String identifier, Type<T> type) {
     public static final StructuredDataKey<ToolProperties> TOOL1_20_5 = new StructuredDataKey<>("tool", ToolProperties.TYPE1_20_5);
     public static final StructuredDataKey<ToolProperties> TOOL1_21_5 = new StructuredDataKey<>("tool", ToolProperties.TYPE1_21_5);
     public static final StructuredDataKey<Weapon> WEAPON = new StructuredDataKey<>("weapon", Weapon.TYPE);
+    public static final StructuredDataKey<AttackRange> ATTACK_RANGE = new StructuredDataKey<>("attack_range", AttackRange.TYPE);
     public static final StructuredDataKey<Enchantable> ENCHANTABLE = new StructuredDataKey<>("enchantable", Enchantable.TYPE);
     public static final StructuredDataKey<Equippable> EQUIPPABLE1_21_2 = new StructuredDataKey<>("equippable", Equippable.TYPE1_21_2);
     public static final StructuredDataKey<Equippable> EQUIPPABLE1_21_5 = new StructuredDataKey<>("equippable", Equippable.TYPE1_21_5);

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

@@ -0,0 +1,59 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 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.minecraft.codec.Ops;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.Types;
+import io.netty.buffer.ByteBuf;
+
+public record AttackRange(float minRange, float maxRange, float hitboxMargin, float mobFactor) {
+
+    public static final Type<AttackRange> TYPE = new Type<>(AttackRange.class) {
+        @Override
+        public AttackRange read(final ByteBuf buffer) {
+            final float minRange = Types.FLOAT.readPrimitive(buffer);
+            final float maxRange = Types.FLOAT.readPrimitive(buffer);
+            final float hitboxMargin = Types.FLOAT.readPrimitive(buffer);
+            final float mobFactor = Types.FLOAT.readPrimitive(buffer);
+            return new AttackRange(minRange, maxRange, hitboxMargin, mobFactor);
+        }
+
+        @Override
+        public void write(final ByteBuf buffer, final AttackRange value) {
+            Types.FLOAT.writePrimitive(buffer, value.minRange);
+            Types.FLOAT.writePrimitive(buffer, value.maxRange);
+            Types.FLOAT.writePrimitive(buffer, value.hitboxMargin);
+            Types.FLOAT.writePrimitive(buffer, value.mobFactor);
+        }
+
+        @Override
+        public void write(final Ops ops, final AttackRange AttackRange) {
+            ops.writeMap(map -> map
+                .writeOptional("min_range", Types.FLOAT, AttackRange.minRange, 0F)
+                .writeOptional("max_range", Types.FLOAT, AttackRange.maxRange, 3F)
+                .writeOptional("hitbox_margin", Types.FLOAT, AttackRange.hitboxMargin, 0.3F)
+                .writeOptional("mob_factor", Types.FLOAT, AttackRange.mobFactor, 1F));
+        }
+    };
+}

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

@@ -30,18 +30,14 @@
 import io.netty.buffer.ByteBuf;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public record KineticWeapon(float minReach, float maxReach, float hitboxMargin,
-                            int contactCooldownTicks, int delayTicks, @Nullable Condition dismountConditions,
+public record KineticWeapon(int contactCooldownTicks, int delayTicks, @Nullable Condition dismountConditions,
                             @Nullable Condition knockbackConditions, @Nullable Condition damageConditions,
                             float forwardMovement, float damageMultiplier,
                             @Nullable Holder<SoundEvent> sound, @Nullable Holder<SoundEvent> hitSound) {
 
     public static final Type<KineticWeapon> TYPE = new Type<>(KineticWeapon.class) {
         @Override
         public KineticWeapon read(final ByteBuf buffer) {
-            final float minReach = Types.FLOAT.readPrimitive(buffer);
-            final float maxReach = Types.FLOAT.readPrimitive(buffer);
-            final float hitboxMargin = Types.FLOAT.readPrimitive(buffer);
             final int contactCooldownTicks = Types.VAR_INT.readPrimitive(buffer);
             final int delayTicks = Types.VAR_INT.readPrimitive(buffer);
             final Condition dismountConditions = Condition.TYPE.read(buffer);
@@ -51,14 +47,11 @@ public KineticWeapon read(final ByteBuf buffer) {
             final float damageMultiplier = Types.FLOAT.readPrimitive(buffer);
             final Holder<SoundEvent> sound = Types.OPTIONAL_SOUND_EVENT.read(buffer);
             final Holder<SoundEvent> hitSound = Types.OPTIONAL_SOUND_EVENT.read(buffer);
-            return new KineticWeapon(minReach, maxReach, hitboxMargin, delayTicks, contactCooldownTicks, dismountConditions, knockbackConditions, damageConditions, forwardMovement, damageMultiplier, sound, hitSound);
+            return new KineticWeapon(contactCooldownTicks, delayTicks, dismountConditions, knockbackConditions, damageConditions, forwardMovement, damageMultiplier, sound, hitSound);
         }
 
         @Override
         public void write(final ByteBuf buffer, final KineticWeapon value) {
-            Types.FLOAT.writePrimitive(buffer, value.minReach);
-            Types.FLOAT.writePrimitive(buffer, value.maxReach);
-            Types.FLOAT.writePrimitive(buffer, value.hitboxMargin);
             Types.VAR_INT.writePrimitive(buffer, value.contactCooldownTicks);
             Types.VAR_INT.writePrimitive(buffer, value.delayTicks);
             Condition.TYPE.write(buffer, value.dismountConditions);
@@ -73,9 +66,6 @@ public void write(final ByteBuf buffer, final KineticWeapon value) {
         @Override
         public void write(final Ops ops, final KineticWeapon value) {
             ops.writeMap(map -> map
-                .writeOptional("min_reach", Types.FLOAT, value.minReach, 0F)
-                .writeOptional("max_reach", Types.FLOAT, value.maxReach, 3F)
-                .writeOptional("hitbox_margin", Types.FLOAT, value.hitboxMargin, 0.3F)
                 .writeOptional("contact_cooldown_ticks", Types.INT, value.contactCooldownTicks, 10)
                 .writeOptional("delay_ticks", Types.INT, value.delayTicks, 0)
                 .writeOptional("dismount_conditions", Condition.TYPE, value.dismountConditions)

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

@@ -30,28 +30,21 @@
 import io.netty.buffer.ByteBuf;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public record PiercingWeapon(float minReach, float maxReach, float hitboxMargin,
-                             boolean dealsKnockback, boolean dismounts,
+public record PiercingWeapon(boolean dealsKnockback, boolean dismounts,
                              @Nullable Holder<SoundEvent> sound, @Nullable Holder<SoundEvent> hitSound) {
 
     public static final Type<PiercingWeapon> TYPE = new Type<>(PiercingWeapon.class) {
         @Override
         public PiercingWeapon read(final ByteBuf buffer) {
-            final float minReach = Types.FLOAT.readPrimitive(buffer);
-            final float maxReach = Types.FLOAT.readPrimitive(buffer);
-            final float hitboxMargin = Types.FLOAT.readPrimitive(buffer);
             final boolean dealsKnockback = Types.BOOLEAN.read(buffer);
             final boolean dismounts = Types.BOOLEAN.read(buffer);
             final Holder<SoundEvent> sound = Types.OPTIONAL_SOUND_EVENT.read(buffer);
             final Holder<SoundEvent> hitSound = Types.OPTIONAL_SOUND_EVENT.read(buffer);
-            return new PiercingWeapon(minReach, maxReach, hitboxMargin, dealsKnockback, dismounts, sound, hitSound);
+            return new PiercingWeapon(dealsKnockback, dismounts, sound, hitSound);
         }
 
         @Override
         public void write(final ByteBuf buffer, final PiercingWeapon value) {
-            Types.FLOAT.writePrimitive(buffer, value.minReach);
-            Types.FLOAT.writePrimitive(buffer, value.maxReach);
-            Types.FLOAT.writePrimitive(buffer, value.hitboxMargin);
             Types.BOOLEAN.write(buffer, value.dealsKnockback);
             Types.BOOLEAN.write(buffer, value.dismounts);
             Types.OPTIONAL_SOUND_EVENT.write(buffer, value.sound);
@@ -61,9 +54,6 @@ public void write(final ByteBuf buffer, final PiercingWeapon value) {
         @Override
         public void write(final Ops ops, final PiercingWeapon value) {
             ops.writeMap(map -> map
-                .writeOptional("min_reach", Types.FLOAT, value.minReach, 0F)
-                .writeOptional("max_reach", Types.FLOAT, value.maxReach, 3F)
-                .writeOptional("hitbox_margin", Types.FLOAT, value.hitboxMargin, 0.3F)
                 .writeOptional("deals_knockback", Types.BOOLEAN, value.dealsKnockback, true)
                 .writeOptional("dismounts", Types.BOOLEAN, value.dismounts, false)
                 .writeOptional("sound", Types.SOUND_EVENT, value.sound)

api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java

@@ -92,7 +92,7 @@ public class ProtocolVersion implements Comparable<ProtocolVersion> {
     public static final ProtocolVersion v1_21_6 = register(771, "1.21.6");
     public static final ProtocolVersion v1_21_7 = register(772, "1.21.7-1.21.8", new SubVersionRange("1.21", 7, 8));
     public static final ProtocolVersion v1_21_9 = register(773, "1.21.9-1.21.10", new SubVersionRange("1.21", 9, 10));
-    public static final ProtocolVersion v1_21_11 = register(774, 278, "1.21.11");
+    public static final ProtocolVersion v1_21_11 = register(774, 279, "1.21.11");
     public static final ProtocolVersion unknown = new ProtocolVersion(VersionType.SPECIAL, -1, -1, "UNKNOWN", null);
 
     static {

common/src/main/java/com/viaversion/viaversion/protocols/v1_21_9to1_21_11/Protocol1_21_9To1_21_11.java

@@ -177,7 +177,7 @@ protected void onMappingDataLoaded() {
             StructuredDataKey.POT_DECORATIONS, 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_2, StructuredDataKey.ATTACK_RANGE,
             StructuredDataKey.USE_COOLDOWN, StructuredDataKey.DAMAGE, StructuredDataKey.EQUIPPABLE1_21_6, StructuredDataKey.ITEM_MODEL,
             StructuredDataKey.GLIDER, StructuredDataKey.TOOLTIP_STYLE, StructuredDataKey.DEATH_PROTECTION, 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_9to1_21_11/rewriter/BlockItemPacketRewriter1_21_11.java

@@ -98,5 +98,6 @@ public static void downgradeData(final Item item, final StructuredDataContainer
         container.remove(StructuredDataKey.MINIMUM_ATTACK_CHARGE);
         container.remove(StructuredDataKey.USE_EFFECTS);
         container.remove(StructuredDataKey.ZOMBIE_NAUTILUS_VARIANT);
+        container.remove(StructuredDataKey.ATTACK_RANGE);
     }
 }