Skip to content

Commit b366437

Browse files
hax0r31337hax0r31337
committed
better
1 parent d03a44e commit b366437

20 files changed

+27
-38
lines changed

‎bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/BedrockCodecHelper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ default Object readTagLE(ByteBuf buffer) {
198198

199199
void readPlayerAbilities(ByteBuf buffer, PlayerAbilityHolder abilityHolder);
200200

201-
PlayerPermission readPlayerPermission(ByteBuf buffer);
201+
PlayerPermission readPlayerPermission(int ordinal);
202202

203-
void writePlayerPermission(ByteBuf buffer, PlayerPermission permission);
203+
int writePlayerPermission(PlayerPermission permission);
204204
}

‎bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/compat/NoopBedrockCodecHelper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,12 @@ public void readPlayerAbilities(ByteBuf buffer, PlayerAbilityHolder abilityHolde
148148
}
149149

150150
@Override
151-
public PlayerPermission readPlayerPermission(ByteBuf buffer) {
151+
public PlayerPermission readPlayerPermission(final int ordinal) {
152152
throw new UnsupportedOperationException();
153153
}
154154

155155
@Override
156-
public void writePlayerPermission(ByteBuf buffer, PlayerPermission permission) {
156+
public int writePlayerPermission(PlayerPermission permission) {
157157
throw new UnsupportedOperationException();
158158
}
159159
}

‎bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v291/BedrockCodecHelper_v291.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -388,8 +388,7 @@ public <T> void writeOptional(ByteBuf buffer, Predicate<T> isPresent, T object,
388388
}
389389

390390
@Override
391-
public PlayerPermission readPlayerPermission(ByteBuf buffer) {
392-
final int ordinal = VarInts.readInt(buffer);
391+
public PlayerPermission readPlayerPermission(final int ordinal) {
393392
if (ordinal < 0 || ordinal >= PLAYER_PERMISSIONS.length) {
394393
return null;
395394
} else {
@@ -398,7 +397,7 @@ public PlayerPermission readPlayerPermission(ByteBuf buffer) {
398397
}
399398

400399
@Override
401-
public void writePlayerPermission(ByteBuf buffer, PlayerPermission permission) {
402-
VarInts.writeInt(buffer, permission == null ? -1 : permission.ordinal());
400+
public int writePlayerPermission(PlayerPermission permission) {
401+
return permission == null ? -1 : permission.ordinal();
403402
}
404403
}

‎bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v291/serializer/StartGameSerializer_v291.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ protected void writeLevelSettings(ByteBuf buffer, BedrockCodecHelper helper, Sta
102102
buffer.writeBoolean(packet.isBonusChestEnabled());
103103
buffer.writeBoolean(packet.isStartingWithMap());
104104
buffer.writeBoolean(packet.isTrustingPlayers());
105-
helper.writePlayerPermission(buffer, packet.getDefaultPlayerPermission());
105+
VarInts.writeInt(buffer, helper.writePlayerPermission(packet.getDefaultPlayerPermission()));
106106
VarInts.writeInt(buffer, packet.getXblBroadcastMode().ordinal());
107107
buffer.writeIntLE(packet.getServerChunkTickRange());
108108
buffer.writeBoolean(packet.getPlatformBroadcastMode() != GamePublishSetting.NO_MULTI_PLAY);
@@ -136,7 +136,7 @@ protected void readLevelSettings(ByteBuf buffer, BedrockCodecHelper helper, Star
136136
packet.setBonusChestEnabled(buffer.readBoolean());
137137
packet.setStartingWithMap(buffer.readBoolean());
138138
packet.setTrustingPlayers(buffer.readBoolean());
139-
packet.setDefaultPlayerPermission(helper.readPlayerPermission(buffer));
139+
packet.setDefaultPlayerPermission(helper.readPlayerPermission(VarInts.readInt(buffer)));
140140
packet.setXblBroadcastMode(GamePublishSetting.byId(VarInts.readInt(buffer)));
141141
packet.setServerChunkTickRange(buffer.readIntLE());
142142
buffer.readBoolean(); // Broadcasting to Platform

‎bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v332/serializer/StartGameSerializer_v332.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ protected void writeLevelSettings(ByteBuf buffer, BedrockCodecHelper helper, Sta
3838
helper.writeArray(buffer, packet.getGamerules(), helper::writeGameRule);
3939
buffer.writeBoolean(packet.isBonusChestEnabled());
4040
buffer.writeBoolean(packet.isStartingWithMap());
41-
helper.writePlayerPermission(buffer, packet.getDefaultPlayerPermission());
41+
VarInts.writeInt(buffer, helper.writePlayerPermission(packet.getDefaultPlayerPermission()));
4242
buffer.writeIntLE(packet.getServerChunkTickRange());
4343
buffer.writeBoolean(packet.isBehaviorPackLocked());
4444
buffer.writeBoolean(packet.isResourcePackLocked());
@@ -72,7 +72,7 @@ protected void readLevelSettings(ByteBuf buffer, BedrockCodecHelper helper, Star
7272
helper.readArray(buffer, packet.getGamerules(), helper::readGameRule);
7373
packet.setBonusChestEnabled(buffer.readBoolean());
7474
packet.setStartingWithMap(buffer.readBoolean());
75-
packet.setDefaultPlayerPermission(helper.readPlayerPermission(buffer));
75+
packet.setDefaultPlayerPermission(helper.readPlayerPermission(VarInts.readInt(buffer)));
7676
packet.setServerChunkTickRange(buffer.readIntLE());
7777
packet.setBehaviorPackLocked(buffer.readBoolean());
7878
packet.setResourcePackLocked(buffer.readBoolean());

‎bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v407/serializer/StartGameSerializer_v407.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ protected void writeLevelSettings(ByteBuf buffer, BedrockCodecHelper helper, Sta
6161
helper.writeArray(buffer, packet.getGamerules(), helper::writeGameRule);
6262
buffer.writeBoolean(packet.isBonusChestEnabled());
6363
buffer.writeBoolean(packet.isStartingWithMap());
64-
helper.writePlayerPermission(buffer, packet.getDefaultPlayerPermission());
64+
VarInts.writeInt(buffer, helper.writePlayerPermission(packet.getDefaultPlayerPermission()));
6565
buffer.writeIntLE(packet.getServerChunkTickRange());
6666
buffer.writeBoolean(packet.isBehaviorPackLocked());
6767
buffer.writeBoolean(packet.isResourcePackLocked());
@@ -105,7 +105,7 @@ protected void readLevelSettings(ByteBuf buffer, BedrockCodecHelper helper, Star
105105
helper.readArray(buffer, packet.getGamerules(), helper::readGameRule);
106106
packet.setBonusChestEnabled(buffer.readBoolean());
107107
packet.setStartingWithMap(buffer.readBoolean());
108-
packet.setDefaultPlayerPermission(helper.readPlayerPermission(buffer));
108+
packet.setDefaultPlayerPermission(helper.readPlayerPermission(VarInts.readInt(buffer)));
109109
packet.setServerChunkTickRange(buffer.readIntLE());
110110
packet.setBehaviorPackLocked(buffer.readBoolean());
111111
packet.setResourcePackLocked(buffer.readBoolean());

‎bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v419/serializer/StartGameSerializer_v419.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ protected void writeLevelSettings(ByteBuf buffer, BedrockCodecHelper helper, Sta
116116
buffer.writeBoolean(packet.isExperimentsPreviouslyToggled());
117117
buffer.writeBoolean(packet.isBonusChestEnabled());
118118
buffer.writeBoolean(packet.isStartingWithMap());
119-
helper.writePlayerPermission(buffer, packet.getDefaultPlayerPermission());
119+
VarInts.writeInt(buffer, helper.writePlayerPermission(packet.getDefaultPlayerPermission()));
120120
buffer.writeIntLE(packet.getServerChunkTickRange());
121121
buffer.writeBoolean(packet.isBehaviorPackLocked());
122122
buffer.writeBoolean(packet.isResourcePackLocked());
@@ -161,7 +161,7 @@ protected void readLevelSettings(ByteBuf buffer, BedrockCodecHelper helper, Star
161161
packet.setExperimentsPreviouslyToggled(buffer.readBoolean());
162162
packet.setBonusChestEnabled(buffer.readBoolean());
163163
packet.setStartingWithMap(buffer.readBoolean());
164-
packet.setDefaultPlayerPermission(helper.readPlayerPermission(buffer));
164+
packet.setDefaultPlayerPermission(helper.readPlayerPermission(VarInts.readInt(buffer)));
165165
packet.setServerChunkTickRange(buffer.readIntLE());
166166
packet.setBehaviorPackLocked(buffer.readBoolean());
167167
packet.setResourcePackLocked(buffer.readBoolean());

‎bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v465/serializer/StartGameSerializer_v465.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ protected void writeLevelSettings(ByteBuf buffer, BedrockCodecHelper helper, Sta
4646
buffer.writeBoolean(packet.isExperimentsPreviouslyToggled());
4747
buffer.writeBoolean(packet.isBonusChestEnabled());
4848
buffer.writeBoolean(packet.isStartingWithMap());
49-
helper.writePlayerPermission(buffer, packet.getDefaultPlayerPermission());
49+
VarInts.writeInt(buffer, helper.writePlayerPermission(packet.getDefaultPlayerPermission()));
5050
buffer.writeIntLE(packet.getServerChunkTickRange());
5151
buffer.writeBoolean(packet.isBehaviorPackLocked());
5252
buffer.writeBoolean(packet.isResourcePackLocked());
@@ -94,7 +94,7 @@ protected void readLevelSettings(ByteBuf buffer, BedrockCodecHelper helper, Star
9494
packet.setExperimentsPreviouslyToggled(buffer.readBoolean());
9595
packet.setBonusChestEnabled(buffer.readBoolean());
9696
packet.setStartingWithMap(buffer.readBoolean());
97-
packet.setDefaultPlayerPermission(helper.readPlayerPermission(buffer));
97+
packet.setDefaultPlayerPermission(helper.readPlayerPermission(VarInts.readInt(buffer)));
9898
packet.setServerChunkTickRange(buffer.readIntLE());
9999
packet.setBehaviorPackLocked(buffer.readBoolean());
100100
packet.setResourcePackLocked(buffer.readBoolean());

‎bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v503/Bedrock_v503.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import lombok.NoArgsConstructor;
55
import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec;
66
import org.cloudburstmc.protocol.bedrock.codec.EntityDataTypeMap;
7-
import org.cloudburstmc.protocol.bedrock.codec.v291.serializer.AvailableCommandsSerializer_v291;
87
import org.cloudburstmc.protocol.bedrock.codec.v291.serializer.EntityEventSerializer_v291;
98
import org.cloudburstmc.protocol.bedrock.codec.v291.serializer.LevelEventSerializer_v291;
109
import org.cloudburstmc.protocol.bedrock.codec.v291.serializer.LevelSoundEvent1Serializer_v291;

‎bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v534/BedrockCodecHelper_v534.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.cloudburstmc.protocol.bedrock.data.Ability;
1010
import org.cloudburstmc.protocol.bedrock.data.AbilityLayer;
1111
import org.cloudburstmc.protocol.bedrock.data.PlayerAbilityHolder;
12-
import org.cloudburstmc.protocol.bedrock.data.PlayerPermission;
1312
import org.cloudburstmc.protocol.bedrock.data.command.CommandPermission;
1413
import org.cloudburstmc.protocol.bedrock.data.inventory.ContainerSlotType;
1514
import org.cloudburstmc.protocol.bedrock.data.inventory.itemstack.request.action.ItemStackRequestActionType;
@@ -35,7 +34,7 @@ public BedrockCodecHelper_v534(EntityDataTypeMap entityData, TypeMap<Class<?>> g
3534
@Override
3635
public void readPlayerAbilities(ByteBuf buffer, PlayerAbilityHolder abilityHolder) {
3736
abilityHolder.setUniqueEntityId(buffer.readLongLE());
38-
abilityHolder.setPlayerPermission(PLAYER_PERMISSIONS[buffer.readUnsignedByte()]);
37+
abilityHolder.setPlayerPermission(readPlayerPermission(buffer.readUnsignedByte()));
3938
abilityHolder.setCommandPermission(CommandPermission.values()[buffer.readUnsignedByte()]);
4039
this.readArray(buffer, abilityHolder.getAbilityLayers(), this::readAbilityLayer);
4140
}
@@ -53,7 +52,7 @@ protected AbilityLayer readAbilityLayer(ByteBuf buffer) {
5352
@Override
5453
public void writePlayerAbilities(ByteBuf buffer, PlayerAbilityHolder abilityHolder) {
5554
buffer.writeLongLE(abilityHolder.getUniqueEntityId());
56-
buffer.writeByte(abilityHolder.getPlayerPermission().ordinal());
55+
buffer.writeByte(writePlayerPermission(abilityHolder.getPlayerPermission()));
5756
buffer.writeByte(abilityHolder.getCommandPermission().ordinal());
5857
this.writeArray(buffer, abilityHolder.getAbilityLayers(), this::writeAbilityLayer);
5958
}

0 commit comments

Comments
 (0)