Skip to content

Commit

Permalink
Bump 1.21.50 protocol version to 766 (#268)
Browse files Browse the repository at this point in the history
* 1.21.50 is protocol version 766, not 765

* Reflect javadoc comments too

---------

Co-authored-by: Kazuk <[email protected]>
  • Loading branch information
onebeastchris and Kazzuk authored Dec 3, 2024
1 parent fd75c7f commit 2880d90
Show file tree
Hide file tree
Showing 17 changed files with 59 additions and 58 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ Check out [EXAMPLES.md](EXAMPLES.md) for examples on how to use this library.
| Bedrock_v712 | 1.21.20 |
| Bedrock_v729 | 1.21.30 |
| Bedrock_v748 | 1.21.40 |
| Bedrock_v766 | 1.21.50 |

##### Repository:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.cloudburstmc.protocol.bedrock.codec.v765;
package org.cloudburstmc.protocol.bedrock.codec.v766;

import io.netty.buffer.ByteBuf;
import org.cloudburstmc.protocol.bedrock.codec.EntityDataTypeMap;
Expand All @@ -15,9 +15,9 @@
import java.util.Set;
import java.util.concurrent.ThreadLocalRandom;

public class BedrockCodecHelper_v765 extends BedrockCodecHelper_v729 {
public class BedrockCodecHelper_v766 extends BedrockCodecHelper_v729 {

public BedrockCodecHelper_v765(EntityDataTypeMap entityData, TypeMap<Class<?>> gameRulesTypes, TypeMap<ItemStackRequestActionType> stackRequestActionTypes,
public BedrockCodecHelper_v766(EntityDataTypeMap entityData, TypeMap<Class<?>> gameRulesTypes, TypeMap<ItemStackRequestActionType> stackRequestActionTypes,
TypeMap<ContainerSlotType> containerSlotTypes, TypeMap<Ability> abilities, TypeMap<TextProcessingEventOrigin> textProcessingEventOrigins) {
super(entityData, gameRulesTypes, stackRequestActionTypes, containerSlotTypes, abilities, textProcessingEventOrigins);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.cloudburstmc.protocol.bedrock.codec.v765;
package org.cloudburstmc.protocol.bedrock.codec.v766;

import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec;
import org.cloudburstmc.protocol.bedrock.codec.v291.serializer.LevelEventSerializer_v291;
Expand All @@ -7,12 +7,12 @@
import org.cloudburstmc.protocol.bedrock.codec.v332.serializer.LevelSoundEventSerializer_v332;
import org.cloudburstmc.protocol.bedrock.codec.v361.serializer.LevelEventGenericSerializer_v361;
import org.cloudburstmc.protocol.bedrock.codec.v748.Bedrock_v748;
import org.cloudburstmc.protocol.bedrock.codec.v765.serializer.*;
import org.cloudburstmc.protocol.bedrock.codec.v766.serializer.*;
import org.cloudburstmc.protocol.bedrock.data.*;
import org.cloudburstmc.protocol.bedrock.packet.*;
import org.cloudburstmc.protocol.common.util.TypeMap;

public class Bedrock_v765 extends Bedrock_v748 {
public class Bedrock_v766 extends Bedrock_v748 {

protected static final TypeMap<SoundEvent> SOUND_EVENTS = Bedrock_v748.SOUND_EVENTS
.toBuilder()
Expand Down Expand Up @@ -45,18 +45,18 @@ public class Bedrock_v765 extends Bedrock_v748 {

public static final BedrockCodec CODEC = Bedrock_v748.CODEC.toBuilder()
.raknetProtocolVersion(11)
.protocolVersion(765)
.protocolVersion(766)
.minecraftVersion("1.21.50")
.helper(() -> new BedrockCodecHelper_v765(ENTITY_DATA, GAME_RULE_TYPES, ITEM_STACK_REQUEST_TYPES, CONTAINER_SLOT_TYPES, PLAYER_ABILITIES, TEXT_PROCESSING_ORIGINS))
.helper(() -> new BedrockCodecHelper_v766(ENTITY_DATA, GAME_RULE_TYPES, ITEM_STACK_REQUEST_TYPES, CONTAINER_SLOT_TYPES, PLAYER_ABILITIES, TEXT_PROCESSING_ORIGINS))
.updateSerializer(LevelEventPacket.class, new LevelEventSerializer_v291(LEVEL_EVENTS))
.updateSerializer(LevelEventGenericPacket.class, new LevelEventGenericSerializer_v361(LEVEL_EVENTS))
.updateSerializer(LevelSoundEvent1Packet.class, new LevelSoundEvent1Serializer_v291(SOUND_EVENTS))
.updateSerializer(LevelSoundEvent2Packet.class, new LevelSoundEvent2Serializer_v313(SOUND_EVENTS))
.updateSerializer(LevelSoundEventPacket.class, new LevelSoundEventSerializer_v332(SOUND_EVENTS))
.updateSerializer(CameraAimAssistPacket.class, CameraAimAssistSerializer_v765.INSTANCE)
.updateSerializer(ResourcePacksInfoPacket.class, ResourcePacksInfoSerializer_v765.INSTANCE)
.updateSerializer(PlayerAuthInputPacket.class, PlayerAuthInputSerializer_v765.INSTANCE)
.updateSerializer(CameraPresetsPacket.class, CameraPresetsSerializer_v765.INSTANCE)
.registerPacket(CameraAimAssistPresetsPacket::new, CameraAimAssistPresetsSerializer_v765.INSTANCE, 320, PacketRecipient.CLIENT)
.updateSerializer(CameraAimAssistPacket.class, CameraAimAssistSerializer_v766.INSTANCE)
.updateSerializer(ResourcePacksInfoPacket.class, ResourcePacksInfoSerializer_v766.INSTANCE)
.updateSerializer(PlayerAuthInputPacket.class, PlayerAuthInputSerializer_v766.INSTANCE)
.updateSerializer(CameraPresetsPacket.class, CameraPresetsSerializer_v766.INSTANCE)
.registerPacket(CameraAimAssistPresetsPacket::new, CameraAimAssistPresetsSerializer_v766.INSTANCE, 320, PacketRecipient.CLIENT)
.build();
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.cloudburstmc.protocol.bedrock.codec.v765.serializer;
package org.cloudburstmc.protocol.bedrock.codec.v766.serializer;

import io.netty.buffer.ByteBuf;
import org.cloudburstmc.protocol.bedrock.codec.BedrockCodecHelper;
import org.cloudburstmc.protocol.bedrock.codec.BedrockPacketSerializer;
import org.cloudburstmc.protocol.bedrock.data.camera.*;
import org.cloudburstmc.protocol.bedrock.packet.CameraAimAssistPresetsPacket;

public class CameraAimAssistPresetsSerializer_v765 implements BedrockPacketSerializer<CameraAimAssistPresetsPacket> {
public static final CameraAimAssistPresetsSerializer_v765 INSTANCE = new CameraAimAssistPresetsSerializer_v765();
public class CameraAimAssistPresetsSerializer_v766 implements BedrockPacketSerializer<CameraAimAssistPresetsPacket> {
public static final CameraAimAssistPresetsSerializer_v766 INSTANCE = new CameraAimAssistPresetsSerializer_v766();

@Override
public void serialize(ByteBuf buffer, BedrockCodecHelper helper, CameraAimAssistPresetsPacket packet) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package org.cloudburstmc.protocol.bedrock.codec.v765.serializer;
package org.cloudburstmc.protocol.bedrock.codec.v766.serializer;

import io.netty.buffer.ByteBuf;
import org.cloudburstmc.protocol.bedrock.codec.BedrockCodecHelper;
import org.cloudburstmc.protocol.bedrock.codec.v729.serializer.CameraAimAssistSerializer_v729;
import org.cloudburstmc.protocol.bedrock.packet.CameraAimAssistPacket;

public class CameraAimAssistSerializer_v765 extends CameraAimAssistSerializer_v729 {
public static final CameraAimAssistSerializer_v765 INSTANCE = new CameraAimAssistSerializer_v765();
public class CameraAimAssistSerializer_v766 extends CameraAimAssistSerializer_v729 {
public static final CameraAimAssistSerializer_v766 INSTANCE = new CameraAimAssistSerializer_v766();

@Override
public void serialize(ByteBuf buffer, BedrockCodecHelper helper, CameraAimAssistPacket packet) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.cloudburstmc.protocol.bedrock.codec.v765.serializer;
package org.cloudburstmc.protocol.bedrock.codec.v766.serializer;

import io.netty.buffer.ByteBuf;
import lombok.AccessLevel;
Expand All @@ -13,8 +13,8 @@
import org.cloudburstmc.protocol.common.util.OptionalBoolean;

@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
public class CameraPresetsSerializer_v765 extends CameraPresetsSerializer_v729 {
public static final CameraPresetsSerializer_v765 INSTANCE = new CameraPresetsSerializer_v765();
public class CameraPresetsSerializer_v766 extends CameraPresetsSerializer_v729 {
public static final CameraPresetsSerializer_v766 INSTANCE = new CameraPresetsSerializer_v766();

@Override
public void writePreset(ByteBuf buffer, BedrockCodecHelper helper, CameraPreset preset) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.cloudburstmc.protocol.bedrock.codec.v765.serializer;
package org.cloudburstmc.protocol.bedrock.codec.v766.serializer;

import io.netty.buffer.ByteBuf;
import lombok.AccessLevel;
Expand All @@ -13,9 +13,9 @@
import org.cloudburstmc.protocol.common.util.VarInts;

@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
public class PlayerAuthInputSerializer_v765 extends PlayerAuthInputSerializer_v748 {
public class PlayerAuthInputSerializer_v766 extends PlayerAuthInputSerializer_v748 {

public static final PlayerAuthInputSerializer_v765 INSTANCE = new PlayerAuthInputSerializer_v765();
public static final PlayerAuthInputSerializer_v766 INSTANCE = new PlayerAuthInputSerializer_v766();

@Override
public void serialize(ByteBuf buffer, BedrockCodecHelper helper, PlayerAuthInputPacket packet) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.cloudburstmc.protocol.bedrock.codec.v765.serializer;
package org.cloudburstmc.protocol.bedrock.codec.v766.serializer;

import io.netty.buffer.ByteBuf;
import org.cloudburstmc.protocol.bedrock.codec.BedrockCodecHelper;
Expand All @@ -8,8 +8,8 @@
import java.util.Objects;
import java.util.UUID;

public class ResourcePacksInfoSerializer_v765 extends ResourcePacksInfoSerializer_v748 {
public static final ResourcePacksInfoSerializer_v765 INSTANCE = new ResourcePacksInfoSerializer_v765();
public class ResourcePacksInfoSerializer_v766 extends ResourcePacksInfoSerializer_v748 {
public static final ResourcePacksInfoSerializer_v766 INSTANCE = new ResourcePacksInfoSerializer_v766();

@Override
public void serialize(ByteBuf buffer, BedrockCodecHelper helper, ResourcePacksInfoPacket packet) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public enum LevelEvent implements LevelEventType {
PARTICLE_TRIAL_SPAWNER_BECOME_CHARGED,
PARTICLE_SMASH_ATTACK_GROUND_DUST,
/**
* @since v765
* @since v766
*/
PARTICLE_CREAKING_HEART_TRIAL,

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,19 +123,19 @@ public enum ParticleType implements LevelEventType {
*/
OMINOUS_ITEM_SPAWNER,
/**
* @since 765
* @since 766
*/
CREAKING_CRUMBLE,
/**
* @since 765
* @since 766
*/
PALE_OAK_LEAVES,
/**
* @since 765
* @since 766
*/
EYEBLOSSOM_OPEN,
/**
* @since 765
* @since 766
*/
EYEBLOSSOM_CLOSE,
}
Original file line number Diff line number Diff line change
Expand Up @@ -126,27 +126,27 @@ public enum PlayerAuthInputData {
*/
STOP_SPIN_ATTACK,
/**
* @since v765
* @since v766
*/
JUMP_RELEASED_RAW,
/**
* @since v765
* @since v766
*/
JUMP_PRESSED_RAW,
/**
* @since v765
* @since v766
*/
JUMP_CURRENT_RAW,
/**
* @since v765
* @since v766
*/
SNEAK_RELEASED_RAW,
/**
* @since v765
* @since v766
*/
SNEAK_PRESSED_RAW,
/**
* @since v765
* @since v766
*/
SNEAK_CURRENT_RAW,
}
Original file line number Diff line number Diff line change
Expand Up @@ -751,51 +751,51 @@ public enum SoundEvent {
*/
BUNDLE_INSERT_FAILED,
/**
* @since v765
* @since v766
*/
IMITATE_CREAKING,
/**
* @since v765
* @since v766
*/
SPONGE_ABSORB,
/**
* @since v765
* @since v766
*/
BLOCK_CREAKING_HEART_TRAIL,
/**
* @since v765
* @since v766
*/
CREAKING_HEART_SPAWN,
/**
* @since v765
* @since v766
*/
ACTIVATE,
/**
* @since v765
* @since v766
*/
DEACTIVATE,
/**
* @since v765
* @since v766
*/
FREEZE,
/**
* @since v765
* @since v766
*/
UNFREEZE,
/**
* @since v765
* @since v766
*/
OPEN,
/**
* @since v765
* @since v766
*/
OPEN_LONG,
/**
* @since v765
* @since v766
*/
CLOSE,
/**
* @since v765
* @since v766
*/
CLOSE_LONG,

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ public class CameraPreset {
@Builder.Default
private OptionalBoolean alignTargetAndCameraForward = OptionalBoolean.empty();
/**
* @since v765
* @since v766
*/
private Float blockListeningRadius;
/**
* @since v765
* @since v766
*/
private CameraAimAssistPreset aimAssistPreset;
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class ItemStackResponseSlot {
*/
private int durabilityCorrection;
/**
* @since v765
* @since v766
*/
private String filteredCustomName = "";
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class CameraAimAssistPacket implements BedrockPacket {
private TargetMode targetMode;
private Action action;
/**
* @since v765
* @since v766
*/
private String presetId;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public class PlayerAuthInputPacket implements BedrockPacket {
*/
private Vector3f cameraOrientation;
/**
* @since v765
* @since v766
*/
private Vector2f rawMoveVector;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ public class ResourcePacksInfoPacket implements BedrockPacket {
*/
private boolean forcingServerPacksEnabled;
/**
* @since v765
* @since v766
*/
private UUID worldTemplateId;
/**
* @since v765
* @since v766
*/
private String worldTemplateVersion;

Expand Down

0 comments on commit 2880d90

Please sign in to comment.