Skip to content

Commit 04e5dfd

Browse files
committed
1.21.11-pre4
1 parent cba704f commit 04e5dfd

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,28 @@
2727
import com.viaversion.viaversion.api.type.Types;
2828
import io.netty.buffer.ByteBuf;
2929

30-
public record AttackRange(float minRange, float maxRange, float hitboxMargin, float mobFactor) {
30+
public record AttackRange(float minRange, float maxRange,
31+
float minCreativeRange, float maxCreativeRange,
32+
float hitboxMargin, float mobFactor) {
3133

3234
public static final Type<AttackRange> TYPE = new Type<>(AttackRange.class) {
3335
@Override
3436
public AttackRange read(final ByteBuf buffer) {
3537
final float minRange = Types.FLOAT.readPrimitive(buffer);
3638
final float maxRange = Types.FLOAT.readPrimitive(buffer);
39+
final float minCreativeRange = Types.FLOAT.readPrimitive(buffer);
40+
final float maxCreativeRange = Types.FLOAT.readPrimitive(buffer);
3741
final float hitboxMargin = Types.FLOAT.readPrimitive(buffer);
3842
final float mobFactor = Types.FLOAT.readPrimitive(buffer);
39-
return new AttackRange(minRange, maxRange, hitboxMargin, mobFactor);
43+
return new AttackRange(minRange, maxRange, minCreativeRange, maxCreativeRange, hitboxMargin, mobFactor);
4044
}
4145

4246
@Override
4347
public void write(final ByteBuf buffer, final AttackRange value) {
4448
Types.FLOAT.writePrimitive(buffer, value.minRange);
4549
Types.FLOAT.writePrimitive(buffer, value.maxRange);
50+
Types.FLOAT.writePrimitive(buffer, value.minCreativeRange);
51+
Types.FLOAT.writePrimitive(buffer, value.maxCreativeRange);
4652
Types.FLOAT.writePrimitive(buffer, value.hitboxMargin);
4753
Types.FLOAT.writePrimitive(buffer, value.mobFactor);
4854
}
@@ -52,6 +58,8 @@ public void write(final Ops ops, final AttackRange AttackRange) {
5258
ops.writeMap(map -> map
5359
.writeOptional("min_range", Types.FLOAT, AttackRange.minRange, 0F)
5460
.writeOptional("max_range", Types.FLOAT, AttackRange.maxRange, 3F)
61+
.writeOptional("min_creative_reach", Types.FLOAT, AttackRange.minCreativeRange, 0F)
62+
.writeOptional("max_creative_reach", Types.FLOAT, AttackRange.maxCreativeRange, 5F)
5563
.writeOptional("hitbox_margin", Types.FLOAT, AttackRange.hitboxMargin, 0.3F)
5664
.writeOptional("mob_factor", Types.FLOAT, AttackRange.mobFactor, 1F));
5765
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public class ProtocolVersion implements Comparable<ProtocolVersion> {
9292
public static final ProtocolVersion v1_21_6 = register(771, "1.21.6");
9393
public static final ProtocolVersion v1_21_7 = register(772, "1.21.7-1.21.8", new SubVersionRange("1.21", 7, 8));
9494
public static final ProtocolVersion v1_21_9 = register(773, "1.21.9-1.21.10", new SubVersionRange("1.21", 9, 10));
95-
public static final ProtocolVersion v1_21_11 = register(774, 281, "1.21.11");
95+
public static final ProtocolVersion v1_21_11 = register(774, 282, "1.21.11");
9696
public static final ProtocolVersion unknown = new ProtocolVersion(VersionType.SPECIAL, -1, -1, "UNKNOWN", null);
9797

9898
static {

0 commit comments

Comments
 (0)