Skip to content

Commit d90a147

Browse files
basaighbasaigh
committed
1.21.11-pre1
1 parent e1f8b84 commit d90a147

File tree

8 files changed

+45
-22
lines changed

8 files changed

+45
-22
lines changed

‎protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftCodec.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@
231231

232232
public class MinecraftCodec {
233233
public static final PacketCodec CODEC = PacketCodec.builder()
234-
.protocolVersion((1 << 30) | 278)
235-
.minecraftVersion("25w46a")
234+
.protocolVersion((1 << 30) | 279)
235+
.minecraftVersion("1.21.11-pre1")
236236
.state(ProtocolState.HANDSHAKE, MinecraftPacketRegistry.builder()
237237
.registerServerboundPacket(ClientIntentionPacket.class, ClientIntentionPacket::new)
238238
)

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package org.geysermc.mcprotocollib.protocol.data.game.item.component;
2+
3+
import lombok.Builder;
4+
5+
@Builder(toBuilder = true)
6+
public record AttackRange(float minRange, float maxRange, float hitboxMargin, float mobFactor) {
7+
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public class DataComponentTypes {
5656
public static final DataComponentType<Key> DAMAGE_RESISTANT = register(id -> new DataComponentType<>(id, "damage_resistant", MinecraftTypes::readResourceLocation, MinecraftTypes::writeResourceLocation, ObjectDataComponent::new));
5757
public static final DataComponentType<ToolData> TOOL = register(id -> new DataComponentType<>(id, "tool", ItemTypes::readToolData, ItemTypes::writeToolData, ObjectDataComponent::new));
5858
public static final DataComponentType<Weapon> WEAPON = register(id -> new DataComponentType<>(id, "weapon", ItemTypes::readWeapon, ItemTypes::writeWeapon, ObjectDataComponent::new));
59+
public static final DataComponentType<AttackRange> ATTACK_RANGE = register(id -> new DataComponentType<>(id, "attack_range", ItemTypes::readAttackRange, ItemTypes::writeAttackRange, ObjectDataComponent::new));
5960
public static final IntComponentType ENCHANTABLE = register(id -> new IntComponentType(id, "enchantable", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new));
6061
public static final DataComponentType<Equippable> EQUIPPABLE = register(id -> new DataComponentType<>(id, "equippable", ItemTypes::readEquippable, ItemTypes::writeEquippable, ObjectDataComponent::new));
6162
public static final DataComponentType<HolderSet> REPAIRABLE = register(id -> new DataComponentType<>(id, "repairable", MinecraftTypes::readHolderSet, MinecraftTypes::writeHolderSet, ObjectDataComponent::new));

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

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,22 @@ public static void writeWeapon(ByteBuf buf, Weapon weapon) {
207207
buf.writeFloat(weapon.disableBlockingForSeconds());
208208
}
209209

210+
public static AttackRange readAttackRange(ByteBuf buf) {
211+
float minRange = buf.readFloat();
212+
float maxRange = buf.readFloat();
213+
float hitboxMargin = buf.readFloat();
214+
float mobFactor = buf.readFloat();
215+
216+
return new AttackRange(minRange, maxRange, hitboxMargin, mobFactor);
217+
}
218+
219+
public static void writeAttackRange(ByteBuf buf, AttackRange attackRange) {
220+
buf.writeFloat(attackRange.minRange());
221+
buf.writeFloat(attackRange.maxRange());
222+
buf.writeFloat(attackRange.hitboxMargin());
223+
buf.writeFloat(attackRange.mobFactor());
224+
}
225+
210226
public static Equippable readEquippable(ByteBuf buf) {
211227
EquipmentSlot slot = EquipmentSlot.fromId(MinecraftTypes.readVarInt(buf));
212228
Sound equipSound = MinecraftTypes.readSound(buf);
@@ -275,31 +291,22 @@ public static void writeBlocksAttacks(ByteBuf buf, BlocksAttacks blocksAttacks)
275291
}
276292

277293
public static PiercingWeapon readPiercingWeapon(ByteBuf buf) {
278-
float minReach = buf.readFloat();
279-
float maxReach = buf.readFloat();
280-
float hitboxMargin = buf.readFloat();
281294
boolean dealsKnockback = buf.readBoolean();
282295
boolean dismounts = buf.readBoolean();
283296
Sound sound = MinecraftTypes.readNullable(buf, MinecraftTypes::readSound);
284297
Sound hitSound = MinecraftTypes.readNullable(buf, MinecraftTypes::readSound);
285298

286-
return new PiercingWeapon(minReach, maxReach, hitboxMargin, dealsKnockback, dismounts, sound, hitSound);
299+
return new PiercingWeapon(dealsKnockback, dismounts, sound, hitSound);
287300
}
288301

289302
public static void writePiercingWeapon(ByteBuf buf, PiercingWeapon piercingWeapon) {
290-
buf.writeFloat(piercingWeapon.minReach());
291-
buf.writeFloat(piercingWeapon.maxReach());
292-
buf.writeFloat(piercingWeapon.hitboxMargin());
293303
buf.writeBoolean(piercingWeapon.dealsKnockback());
294304
buf.writeBoolean(piercingWeapon.dismounts());
295305
MinecraftTypes.writeNullable(buf, piercingWeapon.sound(), MinecraftTypes::writeSound);
296306
MinecraftTypes.writeNullable(buf, piercingWeapon.hitSound(), MinecraftTypes::writeSound);
297307
}
298308

299309
public static KineticWeapon readKineticWeapon(ByteBuf buf) {
300-
float minReach = buf.readFloat();
301-
float maxReach = buf.readFloat();
302-
float hitboxMargin = buf.readFloat();
303310
int contactCooldownTicks = MinecraftTypes.readVarInt(buf);
304311
int delayTicks = MinecraftTypes.readVarInt(buf);
305312
KineticWeapon.Condition dismountConditions = MinecraftTypes.readNullable(buf, ItemTypes::readKineticCondition);
@@ -310,14 +317,11 @@ public static KineticWeapon readKineticWeapon(ByteBuf buf) {
310317
Sound sound = MinecraftTypes.readNullable(buf, MinecraftTypes::readSound);
311318
Sound hitSound = MinecraftTypes.readNullable(buf, MinecraftTypes::readSound);
312319

313-
return new KineticWeapon(minReach, maxReach, hitboxMargin, contactCooldownTicks, delayTicks, dismountConditions,
320+
return new KineticWeapon(contactCooldownTicks, delayTicks, dismountConditions,
314321
knockbackConditions, damageConditions, forwardMovement, damageMultiplier, sound, hitSound);
315322
}
316323

317324
public static void writeKineticWeapon(ByteBuf buf, KineticWeapon kineticWeapon) {
318-
buf.writeFloat(kineticWeapon.minReach());
319-
buf.writeFloat(kineticWeapon.maxReach());
320-
buf.writeFloat(kineticWeapon.hitboxMargin());
321325
MinecraftTypes.writeVarInt(buf, kineticWeapon.contactCooldownTicks());
322326
MinecraftTypes.writeVarInt(buf, kineticWeapon.delayTicks());
323327
MinecraftTypes.writeNullable(buf, kineticWeapon.dismountConditions(), ItemTypes::writeKineticCondition);

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
import org.jetbrains.annotations.Nullable;
66

77
@Builder(toBuilder = true)
8-
public record KineticWeapon(float minReach, float maxReach, float hitboxMargin, int contactCooldownTicks,
9-
int delayTicks, @Nullable Condition dismountConditions, @Nullable Condition knockbackConditions,
10-
@Nullable Condition damageConditions, float forwardMovement, float damageMultiplier,
11-
@Nullable Sound sound, @Nullable Sound hitSound) {
8+
public record KineticWeapon(int contactCooldownTicks, int delayTicks, @Nullable Condition dismountConditions,
9+
@Nullable Condition knockbackConditions, @Nullable Condition damageConditions,
10+
float forwardMovement, float damageMultiplier, @Nullable Sound sound, @Nullable Sound hitSound) {
1211

1312
@Builder(toBuilder = true)
1413
public record Condition(int maxDurationTicks, float minSpeed, float minRelativeSpeed) {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@
55
import org.jetbrains.annotations.Nullable;
66

77
@Builder(toBuilder = true)
8-
public record PiercingWeapon(float minReach, float maxReach, float hitboxMargin, boolean dealsKnockback,
9-
boolean dismounts, @Nullable Sound sound, @Nullable Sound hitSound) {
8+
public record PiercingWeapon(boolean dealsKnockback, boolean dismounts, @Nullable Sound sound, @Nullable Sound hitSound) {
109
}

‎protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/sound/BuiltinSound.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,12 @@ public enum BuiltinSound implements Sound {
116116
BLOCK_AZALEA_LEAVES_PLACE("block.azalea_leaves.place"),
117117
BLOCK_AZALEA_LEAVES_STEP("block.azalea_leaves.step"),
118118
ENTITY_BABY_NAUTILUS_AMBIENT("entity.baby_nautilus.ambient"),
119+
ENTITY_BABY_NAUTILUS_AMBIENT_LAND("entity.baby_nautilus.ambient_land"),
119120
ENTITY_BABY_NAUTILUS_DEATH("entity.baby_nautilus.death"),
121+
ENTITY_BABY_NAUTILUS_DEATH_LAND("entity.baby_nautilus.death_land"),
120122
ENTITY_BABY_NAUTILUS_EAT("entity.baby_nautilus.eat"),
121123
ENTITY_BABY_NAUTILUS_HURT("entity.baby_nautilus.hurt"),
124+
ENTITY_BABY_NAUTILUS_HURT_LAND("entity.baby_nautilus.hurt_land"),
122125
ENTITY_NAUTILUS_RIDING("entity.nautilus.riding"),
123126
ENTITY_BABY_NAUTILUS_SWIM("entity.baby_nautilus.swim"),
124127
BLOCK_BAMBOO_BREAK("block.bamboo.break"),
@@ -1043,11 +1046,16 @@ public enum BuiltinSound implements Sound {
10431046
MUSIC_OVERWORLD_BAMBOO_JUNGLE("music.overworld.bamboo_jungle"),
10441047
MUSIC_UNDER_WATER("music.under_water"),
10451048
ENTITY_NAUTILUS_AMBIENT("entity.nautilus.ambient"),
1049+
ENTITY_NAUTILUS_AMBIENT_LAND("entity.nautilus.ambient_land"),
10461050
ENTITY_NAUTILUS_DASH("entity.nautilus.dash"),
1051+
ENTITY_NAUTILUS_DASH_LAND("entity.nautilus.dash_land"),
10471052
ENTITY_NAUTILUS_DASH_READY("entity.nautilus.dash_ready"),
1053+
ENTITY_NAUTILUS_DASH_READY_LAND("entity.nautilus.dash_ready_land"),
10481054
ENTITY_NAUTILUS_DEATH("entity.nautilus.death"),
1055+
ENTITY_NAUTILUS_DEATH_LAND("entity.nautilus.death_land"),
10491056
ENTITY_NAUTILUS_EAT("entity.nautilus.eat"),
10501057
ENTITY_NAUTILUS_HURT("entity.nautilus.hurt"),
1058+
ENTITY_NAUTILUS_HURT_LAND("entity.nautilus.hurt_land"),
10511059
ENTITY_NAUTILUS_SWIM("entity.nautilus.swim"),
10521060
BLOCK_NETHER_BRICKS_BREAK("block.nether_bricks.break"),
10531061
BLOCK_NETHER_BRICKS_STEP("block.nether_bricks.step"),
@@ -1809,11 +1817,16 @@ public enum BuiltinSound implements Sound {
18091817
ENTITY_ZOMBIE_HURT("entity.zombie.hurt"),
18101818
ENTITY_ZOMBIE_INFECT("entity.zombie.infect"),
18111819
ENTITY_ZOMBIE_NAUTILUS_AMBIENT("entity.zombie_nautilus.ambient"),
1820+
ENTITY_ZOMBIE_NAUTILUS_AMBIENT_LAND("entity.zombie_nautilus.ambient_land"),
18121821
ENTITY_ZOMBIE_NAUTILUS_DASH("entity.zombie_nautilus.dash"),
1822+
ENTITY_ZOMBIE_NAUTILUS_DASH_LAND("entity.zombie_nautilus.dash_land"),
18131823
ENTITY_ZOMBIE_NAUTILUS_DASH_READY("entity.zombie_nautilus.dash_ready"),
1824+
ENTITY_ZOMBIE_NAUTILUS_DASH_READY_LAND("entity.zombie_nautilus.dash_ready_land"),
18141825
ENTITY_ZOMBIE_NAUTILUS_DEATH("entity.zombie_nautilus.death"),
1826+
ENTITY_ZOMBIE_NAUTILUS_DEATH_LAND("entity.zombie_nautilus.death_land"),
18151827
ENTITY_ZOMBIE_NAUTILUS_EAT("entity.zombie_nautilus.eat"),
18161828
ENTITY_ZOMBIE_NAUTILUS_HURT("entity.zombie_nautilus.hurt"),
1829+
ENTITY_ZOMBIE_NAUTILUS_HURT_LAND("entity.zombie_nautilus.hurt_land"),
18171830
ENTITY_ZOMBIE_NAUTILUS_SWIM("entity.zombie_nautilus.swim"),
18181831
ENTITY_ZOMBIFIED_PIGLIN_AMBIENT("entity.zombified_piglin.ambient"),
18191832
ENTITY_ZOMBIFIED_PIGLIN_ANGRY("entity.zombified_piglin.angry"),

‎protocol/src/main/resources/networkCodec.nbt‎

2 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)