-
Notifications
You must be signed in to change notification settings - Fork 97
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Start working on 1.21.0 support (#226)
- Loading branch information
Showing
33 changed files
with
730 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v685/Bedrock_v685.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| package org.cloudburstmc.protocol.bedrock.codec.v685; | ||
|
|
||
| import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec; | ||
| import org.cloudburstmc.protocol.bedrock.codec.EntityDataTypeMap; | ||
| import org.cloudburstmc.protocol.bedrock.codec.v291.serializer.LevelEventSerializer_v291; | ||
| import org.cloudburstmc.protocol.bedrock.codec.v291.serializer.LevelSoundEvent1Serializer_v291; | ||
| import org.cloudburstmc.protocol.bedrock.codec.v313.serializer.LevelSoundEvent2Serializer_v313; | ||
| 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.v575.BedrockCodecHelper_v575; | ||
| import org.cloudburstmc.protocol.bedrock.codec.v594.serializer.AvailableCommandsSerializer_v594; | ||
| import org.cloudburstmc.protocol.bedrock.codec.v671.Bedrock_v671; | ||
| import org.cloudburstmc.protocol.bedrock.codec.v685.serializer.*; | ||
| import org.cloudburstmc.protocol.bedrock.data.*; | ||
| import org.cloudburstmc.protocol.bedrock.data.command.CommandParam; | ||
| import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataFormat; | ||
| import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes; | ||
| import org.cloudburstmc.protocol.bedrock.packet.*; | ||
| import org.cloudburstmc.protocol.common.util.TypeMap; | ||
|
|
||
| public class Bedrock_v685 extends Bedrock_v671 { | ||
|
|
||
| protected static final TypeMap<ParticleType> PARTICLE_TYPES = Bedrock_v671.PARTICLE_TYPES.toBuilder() | ||
| .insert(93, ParticleType.OMINOUS_ITEM_SPAWNER) | ||
| .build(); | ||
|
|
||
| protected static final TypeMap<SoundEvent> SOUND_EVENTS = Bedrock_v671.SOUND_EVENTS | ||
| .toBuilder() | ||
| .insert(516, SoundEvent.TRAIL_SPAWNER_CHARGE_ACTIVATE) | ||
| .insert(517, SoundEvent.TRAIL_SPAWNER_AMBIENT_OMINOUS) | ||
| .insert(518, SoundEvent.OMINOUS_ITEM_SPAWNER_SPAWN_ITEM) | ||
| .insert(519, SoundEvent.OMINOUS_BOTTLE_END_USE) | ||
| .replace(521, SoundEvent.OMINOUS_ITEM_SPAWNER_SPAWN_ITEM_BEGIN) | ||
| .insert(523, SoundEvent.APPLY_EFFECT_BAD_OMEN) | ||
| .insert(524, SoundEvent.APPLY_EFFECT_RAID_OMEN) | ||
| .insert(525, SoundEvent.APPLY_EFFECT_TRIAL_OMEN) | ||
| .insert(526, SoundEvent.OMINOUS_ITEM_SPAWNER_ABOUT_TO_SPAWN_ITEM) | ||
| .insert(527, SoundEvent.RECORD_CREATOR) | ||
| .insert(528, SoundEvent.RECORD_CREATOR_MUSIC_BOX) | ||
| .insert(529, SoundEvent.RECORD_PRECIPICE) | ||
| .insert(530, SoundEvent.UNDEFINED) | ||
| .build(); | ||
|
|
||
| protected static final TypeMap<CommandParam> COMMAND_PARAMS = Bedrock_v671.COMMAND_PARAMS.toBuilder() | ||
| .shift(86, 4) | ||
| .insert(86, CommandParam.CODE_BUILDER_ARG) | ||
| .insert(87, CommandParam.CODE_BUILDER_ARGS) | ||
| .insert(88, CommandParam.CODE_BUILDER_SELECT_PARAM) | ||
| .insert(89, CommandParam.CODE_BUILDER_SELECTOR) | ||
| .build(); | ||
|
|
||
| protected static final EntityDataTypeMap ENTITY_DATA = Bedrock_v671.ENTITY_DATA | ||
| .toBuilder() | ||
| .insert(EntityDataTypes.VISIBLE_MOB_EFFECTS, 131, EntityDataFormat.NBT) // TODO check data format | ||
| .build(); | ||
|
|
||
| protected static final TypeMap<LevelEventType> LEVEL_EVENTS = Bedrock_v671.LEVEL_EVENTS.toBuilder() | ||
| .insert(LEVEL_EVENT_PARTICLE_TYPE, PARTICLE_TYPES) | ||
| .replace(LEVEL_EVENT_BLOCK + 115, LevelEvent.PARTICLE_TRIAL_SPAWNER_DETECTION_CHARGED) | ||
| .insert(LEVEL_EVENT_BLOCK + 116, LevelEvent.PARTICLE_TRIAL_SPAWNER_BECOME_CHARGED) | ||
| .insert(LEVEL_EVENT_BLOCK + 117, LevelEvent.ALL_PLAYERS_SLEEPING) | ||
| .insert(9814, LevelEvent.ANIMATION_SPAWN_COBWEB) | ||
| .insert(9815, LevelEvent.PARTICLE_SMASH_ATTACK_GROUND_DUST) | ||
| .build(); | ||
|
|
||
| public static final BedrockCodec CODEC = Bedrock_v671.CODEC.toBuilder() | ||
| .raknetProtocolVersion(11) | ||
| .protocolVersion(685) | ||
| .minecraftVersion("1.21.0") | ||
| .helper(() -> new BedrockCodecHelper_v575(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(AvailableCommandsPacket.class, new AvailableCommandsSerializer_v594(COMMAND_PARAMS)) | ||
| .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(ContainerClosePacket.class, ContainerCloseSerializer_v685.INSTANCE) | ||
| .updateSerializer(CraftingDataPacket.class, CraftingDataSerializer_v685.INSTANCE) | ||
| .updateSerializer(CodeBuilderSourcePacket.class, CodeBuilderSourceSerializer_v685.INSTANCE) | ||
| .updateSerializer(EventPacket.class, EventSerializer_v685.INSTANCE) | ||
| .updateSerializer(StartGamePacket.class, StartGameSerializer_v685.INSTANCE) | ||
| .updateSerializer(TextPacket.class, TextSerializer_v685.INSTANCE) | ||
| .registerPacket(AwardAchievementPacket::new, AwardAchievementSerializer_v685.INSTANCE, 309, PacketRecipient.CLIENT) | ||
| .deregisterPacket(TickSyncPacket.class) // this packet is now deprecated | ||
| .build(); | ||
| } |
23 changes: 23 additions & 0 deletions
23
.../cloudburstmc/protocol/bedrock/codec/v685/serializer/AwardAchievementSerializer_v685.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package org.cloudburstmc.protocol.bedrock.codec.v685.serializer; | ||
|
|
||
| import io.netty.buffer.ByteBuf; | ||
| import lombok.AccessLevel; | ||
| import lombok.NoArgsConstructor; | ||
| import org.cloudburstmc.protocol.bedrock.codec.BedrockCodecHelper; | ||
| import org.cloudburstmc.protocol.bedrock.codec.BedrockPacketSerializer; | ||
| import org.cloudburstmc.protocol.bedrock.packet.AwardAchievementPacket; | ||
|
|
||
| @NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
| public class AwardAchievementSerializer_v685 implements BedrockPacketSerializer<AwardAchievementPacket> { | ||
| public static final AwardAchievementSerializer_v685 INSTANCE = new AwardAchievementSerializer_v685(); | ||
|
|
||
| @Override | ||
| public void serialize(ByteBuf buffer, BedrockCodecHelper helper, AwardAchievementPacket packet) { | ||
| buffer.writeIntLE(packet.getAchievementId()); | ||
| } | ||
|
|
||
| @Override | ||
| public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, AwardAchievementPacket packet) { | ||
| packet.setAchievementId(buffer.readIntLE()); | ||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
...cloudburstmc/protocol/bedrock/codec/v685/serializer/CodeBuilderSourceSerializer_v685.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package org.cloudburstmc.protocol.bedrock.codec.v685.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.CodeBuilderCategoryType; | ||
| import org.cloudburstmc.protocol.bedrock.data.CodeBuilderCodeStatus; | ||
| import org.cloudburstmc.protocol.bedrock.data.CodeBuilderOperationType; | ||
| import org.cloudburstmc.protocol.bedrock.packet.CodeBuilderSourcePacket; | ||
|
|
||
| public class CodeBuilderSourceSerializer_v685 implements BedrockPacketSerializer<CodeBuilderSourcePacket> { | ||
| public static final CodeBuilderSourceSerializer_v685 INSTANCE = new CodeBuilderSourceSerializer_v685(); | ||
|
|
||
| @Override | ||
| public void serialize(ByteBuf buffer, BedrockCodecHelper helper, CodeBuilderSourcePacket packet) { | ||
| buffer.writeByte(packet.getOperation().ordinal()); | ||
| buffer.writeByte(packet.getCategory().ordinal()); | ||
| buffer.writeByte(packet.getCodeStatus().ordinal()); | ||
| } | ||
|
|
||
| @Override | ||
| public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, CodeBuilderSourcePacket packet) { | ||
| packet.setOperation(CodeBuilderOperationType.values()[buffer.readByte()]); | ||
| packet.setCategory(CodeBuilderCategoryType.values()[buffer.readByte()]); | ||
| packet.setCodeStatus(CodeBuilderCodeStatus.values()[buffer.readByte()]); | ||
| } | ||
| } |
25 changes: 25 additions & 0 deletions
25
...rg/cloudburstmc/protocol/bedrock/codec/v685/serializer/ContainerCloseSerializer_v685.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package org.cloudburstmc.protocol.bedrock.codec.v685.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.inventory.ContainerType; | ||
| import org.cloudburstmc.protocol.bedrock.packet.ContainerClosePacket; | ||
|
|
||
| public class ContainerCloseSerializer_v685 implements BedrockPacketSerializer<ContainerClosePacket> { | ||
| public static final ContainerCloseSerializer_v685 INSTANCE = new ContainerCloseSerializer_v685(); | ||
|
|
||
| @Override | ||
| public void serialize(ByteBuf buffer, BedrockCodecHelper helper, ContainerClosePacket packet) { | ||
| buffer.writeByte(packet.getId()); | ||
| buffer.writeByte(packet.getType().ordinal()); | ||
| buffer.writeBoolean(packet.isServerInitiated()); | ||
| } | ||
|
|
||
| @Override | ||
| public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, ContainerClosePacket packet) { | ||
| packet.setId(buffer.readByte()); | ||
| packet.setType(ContainerType.from(buffer.readByte())); | ||
| packet.setServerInitiated(buffer.readBoolean()); | ||
| } | ||
| } |
Oops, something went wrong.