Skip to content

Commit e7e3a9c

Browse files
Kaoootsmartcmd
Kaooot
authored and
smartcmd
committed
Bump protocol version to v975
1 parent 1855be5 commit e7e3a9c

37 files changed

Lines changed: 106 additions & 106 deletions

bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v974/BedrockCodecHelper_v974.java renamed to bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v975/BedrockCodecHelper_v975.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.cloudburstmc.protocol.bedrock.codec.v974;
1+
package org.cloudburstmc.protocol.bedrock.codec.v975;
22

33
import io.netty.buffer.ByteBuf;
44
import io.netty.buffer.ByteBufAllocator;
@@ -24,9 +24,9 @@
2424
import static java.util.Objects.requireNonNull;
2525
import static org.cloudburstmc.protocol.bedrock.util.Preconditions.checkArgument;
2626

27-
public class BedrockCodecHelper_v974 extends BedrockCodecHelper_v944 {
27+
public class BedrockCodecHelper_v975 extends BedrockCodecHelper_v944 {
2828

29-
public BedrockCodecHelper_v974(EntityDataTypeMap entityData, TypeMap<Class<?>> gameRulesTypes,
29+
public BedrockCodecHelper_v975(EntityDataTypeMap entityData, TypeMap<Class<?>> gameRulesTypes,
3030
TypeMap<ItemStackRequestActionType> stackRequestActionTypes,
3131
TypeMap<ContainerSlotType> containerSlotTypes, TypeMap<Ability> abilities,
3232
TypeMap<TextProcessingEventOrigin> textProcessingEventOrigins) {

bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v974/Bedrock_v974.java renamed to bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v975/Bedrock_v975.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package org.cloudburstmc.protocol.bedrock.codec.v974;
1+
package org.cloudburstmc.protocol.bedrock.codec.v975;
22

33
import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec;
44
import org.cloudburstmc.protocol.bedrock.codec.EntityDataTypeMap;
55
import org.cloudburstmc.protocol.bedrock.codec.v944.Bedrock_v944;
6-
import org.cloudburstmc.protocol.bedrock.codec.v974.serializer.*;
6+
import org.cloudburstmc.protocol.bedrock.codec.v975.serializer.*;
77
import org.cloudburstmc.protocol.bedrock.data.PacketRecipient;
88
import org.cloudburstmc.protocol.bedrock.data.SoundEvent;
99
import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
@@ -14,7 +14,7 @@
1414
import org.cloudburstmc.protocol.bedrock.transformer.TypeMapTransformer;
1515
import org.cloudburstmc.protocol.bedrock.util.TypeMap;
1616

17-
public class Bedrock_v974 extends Bedrock_v944 {
17+
public class Bedrock_v975 extends Bedrock_v944 {
1818

1919
protected static final TypeMap<EntityFlag> ENTITY_FLAGS = Bedrock_v944.ENTITY_FLAGS
2020
.toBuilder()
@@ -42,25 +42,25 @@ public class Bedrock_v974 extends Bedrock_v944 {
4242

4343
public static final BedrockCodec CODEC = Bedrock_v944.CODEC.toBuilder()
4444
.raknetProtocolVersion(11)
45-
.protocolVersion(974)
45+
.protocolVersion(975)
4646
.minecraftVersion("1.26.20")
47-
.helper(() -> new BedrockCodecHelper_v974(ENTITY_DATA, GAME_RULE_TYPES, ITEM_STACK_REQUEST_TYPES, CONTAINER_SLOT_TYPES, PLAYER_ABILITIES, TEXT_PROCESSING_ORIGINS))
48-
.updateSerializer(BiomeDefinitionListPacket.class, BiomeDefinitionListSerializer_v974.INSTANCE)
49-
.updateSerializer(PrimitiveShapesPacket.class, PrimitiveShapesSerializer_v974.INSTANCE)
50-
.updateSerializer(DimensionDataPacket.class, DimensionDataSerializer_v974.INSTANCE)
51-
.updateSerializer(DisconnectPacket.class, DisconnectSerializer_v974.INSTANCE)
52-
.updateSerializer(EntityEventPacket.class, new EntityEventSerializer_v974(ENTITY_EVENTS))
53-
.updateSerializer(InventorySlotPacket.class, InventorySlotSerializer_v974.INSTANCE)
54-
.updateSerializer(LevelSoundEventPacket.class, new LevelSoundEventSerializer_v974(SOUND_EVENTS))
55-
.updateSerializer(LocatorBarPacket.class, LocatorBarSerializer_v974.INSTANCE)
56-
.updateSerializer(MobEquipmentPacket.class, MobEquipmentSerializer_v974.INSTANCE)
57-
.updateSerializer(MovementPredictionSyncPacket.class, MovementPredictionSyncSerializer_v974.INSTANCE)
58-
.updateSerializer(PartyChangedPacket.class, PartyChangedSerializer_v974.INSTANCE)
59-
.updateSerializer(PlayerEnchantOptionsPacket.class, PlayerEnchantOptionsSerializer_v974.INSTANCE)
60-
.updateSerializer(PlaySoundPacket.class, PlaySoundSerializer_v974.INSTANCE)
61-
.updateSerializer(ServerboundDiagnosticsPacket.class, new ServerboundDiagnosticsSerializer_v974(MEMORY_CATEGORY_TYPES))
62-
.updateSerializer(UpdateClientOptionsPacket.class, UpdateClientOptionsSerializer_v974.INSTANCE)
63-
.registerPacket(ServerStoreInfoPacket::new, ServerStoreInfoSerializer_v974.INSTANCE, 346, PacketRecipient.CLIENT)
64-
.registerPacket(ServerPresenceInfoPacket::new, ServerPresenceInfoSerializer_v974.INSTANCE, 347, PacketRecipient.CLIENT)
47+
.helper(() -> new BedrockCodecHelper_v975(ENTITY_DATA, GAME_RULE_TYPES, ITEM_STACK_REQUEST_TYPES, CONTAINER_SLOT_TYPES, PLAYER_ABILITIES, TEXT_PROCESSING_ORIGINS))
48+
.updateSerializer(BiomeDefinitionListPacket.class, BiomeDefinitionListSerializer_v975.INSTANCE)
49+
.updateSerializer(PrimitiveShapesPacket.class, PrimitiveShapesSerializer_v975.INSTANCE)
50+
.updateSerializer(DimensionDataPacket.class, DimensionDataSerializer_v975.INSTANCE)
51+
.updateSerializer(DisconnectPacket.class, DisconnectSerializer_v975.INSTANCE)
52+
.updateSerializer(EntityEventPacket.class, new EntityEventSerializer_v975(ENTITY_EVENTS))
53+
.updateSerializer(InventorySlotPacket.class, InventorySlotSerializer_v975.INSTANCE)
54+
.updateSerializer(LevelSoundEventPacket.class, new LevelSoundEventSerializer_v975(SOUND_EVENTS))
55+
.updateSerializer(LocatorBarPacket.class, LocatorBarSerializer_v975.INSTANCE)
56+
.updateSerializer(MobEquipmentPacket.class, MobEquipmentSerializer_v975.INSTANCE)
57+
.updateSerializer(MovementPredictionSyncPacket.class, MovementPredictionSyncSerializer_v975.INSTANCE)
58+
.updateSerializer(PartyChangedPacket.class, PartyChangedSerializer_v975.INSTANCE)
59+
.updateSerializer(PlayerEnchantOptionsPacket.class, PlayerEnchantOptionsSerializer_v975.INSTANCE)
60+
.updateSerializer(PlaySoundPacket.class, PlaySoundSerializer_v975.INSTANCE)
61+
.updateSerializer(ServerboundDiagnosticsPacket.class, new ServerboundDiagnosticsSerializer_v975(MEMORY_CATEGORY_TYPES))
62+
.updateSerializer(UpdateClientOptionsPacket.class, UpdateClientOptionsSerializer_v975.INSTANCE)
63+
.registerPacket(ServerStoreInfoPacket::new, ServerStoreInfoSerializer_v975.INSTANCE, 346, PacketRecipient.CLIENT)
64+
.registerPacket(ServerPresenceInfoPacket::new, ServerPresenceInfoSerializer_v975.INSTANCE, 347, PacketRecipient.CLIENT)
6565
.build();
6666
}

bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v974/serializer/BiomeDefinitionListSerializer_v974.java renamed to bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v975/serializer/BiomeDefinitionListSerializer_v975.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.cloudburstmc.protocol.bedrock.codec.v974.serializer;
1+
package org.cloudburstmc.protocol.bedrock.codec.v975.serializer;
22

33
import io.netty.buffer.ByteBuf;
44
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
@@ -13,8 +13,8 @@
1313
import java.util.List;
1414

1515
@NoArgsConstructor(access = AccessLevel.PROTECTED)
16-
public class BiomeDefinitionListSerializer_v974 extends BiomeDefinitionListSerializer_v924 {
17-
public static final BiomeDefinitionListSerializer_v974 INSTANCE = new BiomeDefinitionListSerializer_v974();
16+
public class BiomeDefinitionListSerializer_v975 extends BiomeDefinitionListSerializer_v924 {
17+
public static final BiomeDefinitionListSerializer_v975 INSTANCE = new BiomeDefinitionListSerializer_v975();
1818

1919
@Override
2020
protected void writeDefinitionChunkGen(ByteBuf buffer, BedrockCodecHelper helper, BiomeDefinitionChunkGenData definitionChunkGen,
@@ -140,7 +140,7 @@ protected BiomeNoiseGradientSurfaceData readBiomeNoiseGradientSurfaceData(ByteBu
140140
helper.readArray(buffer, nonReplaceableBlocks, this::readBlock);
141141
helper.readArray(buffer, gradientBlocks, this::readBlock);
142142
String noiseSeedString = helper.readString(buffer);
143-
int firstOctave = VarInts.readInt(buffer);
143+
int firstOctave = buffer.readIntLE();
144144
List<Float> amplitudes = new ObjectArrayList<>();
145145
helper.readArray(buffer, amplitudes, ByteBuf::readFloatLE);
146146
return new BiomeNoiseGradientSurfaceData(nonReplaceableBlocks, gradientBlocks, noiseSeedString, firstOctave, amplitudes);

bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v974/serializer/DimensionDataSerializer_v974.java renamed to bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v975/serializer/DimensionDataSerializer_v975.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.cloudburstmc.protocol.bedrock.codec.v974.serializer;
1+
package org.cloudburstmc.protocol.bedrock.codec.v975.serializer;
22

33
import io.netty.buffer.ByteBuf;
44
import lombok.AccessLevel;
@@ -9,8 +9,8 @@
99
import org.cloudburstmc.protocol.bedrock.util.VarInts;
1010

1111
@NoArgsConstructor(access = AccessLevel.PROTECTED)
12-
public class DimensionDataSerializer_v974 extends DimensionDataSerializer_v503 {
13-
public static final DimensionDataSerializer_v974 INSTANCE = new DimensionDataSerializer_v974();
12+
public class DimensionDataSerializer_v975 extends DimensionDataSerializer_v503 {
13+
public static final DimensionDataSerializer_v975 INSTANCE = new DimensionDataSerializer_v975();
1414

1515
@Override
1616
protected void writeDefinition(ByteBuf buffer, BedrockCodecHelper helper, DimensionDefinition definition) {

bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v974/serializer/DisconnectSerializer_v974.java renamed to bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v975/serializer/DisconnectSerializer_v975.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.cloudburstmc.protocol.bedrock.codec.v974.serializer;
1+
package org.cloudburstmc.protocol.bedrock.codec.v975.serializer;
22

33
import io.netty.buffer.ByteBuf;
44
import lombok.AccessLevel;
@@ -10,8 +10,8 @@
1010
import org.cloudburstmc.protocol.bedrock.util.VarInts;
1111

1212
@NoArgsConstructor(access = AccessLevel.PROTECTED)
13-
public class DisconnectSerializer_v974 implements BedrockPacketSerializer<DisconnectPacket> {
14-
public static final DisconnectSerializer_v974 INSTANCE = new DisconnectSerializer_v974();
13+
public class DisconnectSerializer_v975 implements BedrockPacketSerializer<DisconnectPacket> {
14+
public static final DisconnectSerializer_v975 INSTANCE = new DisconnectSerializer_v975();
1515

1616
@Override
1717
public void serialize(ByteBuf buffer, BedrockCodecHelper helper, DisconnectPacket packet) {

bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v974/serializer/EntityEventSerializer_v974.java renamed to bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v975/serializer/EntityEventSerializer_v975.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.cloudburstmc.protocol.bedrock.codec.v974.serializer;
1+
package org.cloudburstmc.protocol.bedrock.codec.v975.serializer;
22

33
import io.netty.buffer.ByteBuf;
44
import org.cloudburstmc.protocol.bedrock.codec.BedrockCodecHelper;
@@ -7,9 +7,9 @@
77
import org.cloudburstmc.protocol.bedrock.packet.EntityEventPacket;
88
import org.cloudburstmc.protocol.bedrock.util.TypeMap;
99

10-
public class EntityEventSerializer_v974 extends EntityEventSerializer_v291 {
10+
public class EntityEventSerializer_v975 extends EntityEventSerializer_v291 {
1111

12-
public EntityEventSerializer_v974(TypeMap<EntityEventType> typeMap) {
12+
public EntityEventSerializer_v975(TypeMap<EntityEventType> typeMap) {
1313
super(typeMap);
1414
}
1515

bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v974/serializer/InventorySlotSerializer_v974.java renamed to bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v975/serializer/InventorySlotSerializer_v975.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.cloudburstmc.protocol.bedrock.codec.v974.serializer;
1+
package org.cloudburstmc.protocol.bedrock.codec.v975.serializer;
22

33
import io.netty.buffer.ByteBuf;
44
import lombok.AccessLevel;
@@ -13,8 +13,8 @@
1313
import org.cloudburstmc.protocol.bedrock.util.VarInts;
1414

1515
@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
16-
public class InventorySlotSerializer_v974 implements BedrockPacketSerializer<InventorySlotPacket> {
17-
public static final InventorySlotSerializer_v974 INSTANCE = new InventorySlotSerializer_v974();
16+
public class InventorySlotSerializer_v975 implements BedrockPacketSerializer<InventorySlotPacket> {
17+
public static final InventorySlotSerializer_v975 INSTANCE = new InventorySlotSerializer_v975();
1818
private static final FullContainerName LEGACY_CONTAINER_NAME_DATA =
1919
new FullContainerName(ContainerSlotType.ANVIL_INPUT, null);
2020
private static final ItemData LEGACY_STORAGE_ITEM = ItemData.AIR;

bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v974/serializer/LevelSoundEventSerializer_v974.java renamed to bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v975/serializer/LevelSoundEventSerializer_v975.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.cloudburstmc.protocol.bedrock.codec.v974.serializer;
1+
package org.cloudburstmc.protocol.bedrock.codec.v975.serializer;
22

33
import io.netty.buffer.ByteBuf;
44
import org.cloudburstmc.protocol.bedrock.codec.BedrockCodecHelper;
@@ -7,9 +7,9 @@
77
import org.cloudburstmc.protocol.bedrock.packet.LevelSoundEventPacket;
88
import org.cloudburstmc.protocol.bedrock.util.TypeMap;
99

10-
public class LevelSoundEventSerializer_v974 extends LevelSoundEventSerializer_v786 {
10+
public class LevelSoundEventSerializer_v975 extends LevelSoundEventSerializer_v786 {
1111

12-
public LevelSoundEventSerializer_v974(TypeMap<SoundEvent> typeMap) {
12+
public LevelSoundEventSerializer_v975(TypeMap<SoundEvent> typeMap) {
1313
super(typeMap);
1414
}
1515

bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v974/serializer/LocatorBarSerializer_v974.java renamed to bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v975/serializer/LocatorBarSerializer_v975.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.cloudburstmc.protocol.bedrock.codec.v974.serializer;
1+
package org.cloudburstmc.protocol.bedrock.codec.v975.serializer;
22

33
import io.netty.buffer.ByteBuf;
44
import lombok.AccessLevel;
@@ -13,9 +13,9 @@
1313
import java.util.UUID;
1414

1515
@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
16-
public class LocatorBarSerializer_v974 implements BedrockPacketSerializer<LocatorBarPacket> {
16+
public class LocatorBarSerializer_v975 implements BedrockPacketSerializer<LocatorBarPacket> {
1717

18-
public static final LocatorBarSerializer_v974 INSTANCE = new LocatorBarSerializer_v974();
18+
public static final LocatorBarSerializer_v975 INSTANCE = new LocatorBarSerializer_v975();
1919

2020
@Override
2121
public void serialize(ByteBuf buffer, BedrockCodecHelper helper, LocatorBarPacket packet) {

bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v974/serializer/MobEquipmentSerializer_v974.java renamed to bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v975/serializer/MobEquipmentSerializer_v975.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.cloudburstmc.protocol.bedrock.codec.v974.serializer;
1+
package org.cloudburstmc.protocol.bedrock.codec.v975.serializer;
22

33
import io.netty.buffer.ByteBuf;
44
import lombok.AccessLevel;
@@ -9,8 +9,8 @@
99
import org.cloudburstmc.protocol.bedrock.util.VarInts;
1010

1111
@NoArgsConstructor(access = AccessLevel.PROTECTED)
12-
public class MobEquipmentSerializer_v974 implements BedrockPacketSerializer<MobEquipmentPacket> {
13-
public static final MobEquipmentSerializer_v974 INSTANCE = new MobEquipmentSerializer_v974();
12+
public class MobEquipmentSerializer_v975 implements BedrockPacketSerializer<MobEquipmentPacket> {
13+
public static final MobEquipmentSerializer_v975 INSTANCE = new MobEquipmentSerializer_v975();
1414

1515
@Override
1616
public void serialize(ByteBuf buffer, BedrockCodecHelper helper, MobEquipmentPacket packet) {

0 commit comments

Comments
 (0)