Skip to content

Commit c24169c

Browse files
[ci skip] Use login/status packet enums in older protocols (ViaVersion#3835)
1 parent 31211c2 commit c24169c

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
import com.viaversion.viaversion.api.type.types.misc.ParticleType;
4040
import com.viaversion.viaversion.api.type.types.version.Types1_13;
4141
import com.viaversion.viaversion.data.entity.EntityTrackerBase;
42+
import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
43+
import com.viaversion.viaversion.protocols.base.ClientboundStatusPackets;
4244
import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets;
4345
import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1;
4446
import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1;
@@ -170,9 +172,11 @@ protected void registerPackets() {
170172
EntityPackets.register(this);
171173
WorldPackets.register(this);
172174

173-
registerClientbound(State.LOGIN, 0x00, 0x00, wrapper -> componentRewriter.processText(wrapper.user(), wrapper.passthrough(Type.COMPONENT)));
175+
registerClientbound(State.LOGIN, ClientboundLoginPackets.LOGIN_DISCONNECT.getId(), ClientboundLoginPackets.LOGIN_DISCONNECT.getId(), wrapper -> {
176+
componentRewriter.processText(wrapper.user(), wrapper.passthrough(Type.COMPONENT));
177+
});
174178

175-
registerClientbound(State.STATUS, 0x00, 0x00, new PacketHandlers() {
179+
registerClientbound(State.STATUS, ClientboundStatusPackets.STATUS_RESPONSE.getId(), ClientboundStatusPackets.STATUS_RESPONSE.getId(), new PacketHandlers() {
176180
@Override
177181
public void register() {
178182
map(Type.STRING);

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
import com.viaversion.viaversion.api.type.types.misc.ParticleType;
3636
import com.viaversion.viaversion.api.type.types.version.Types1_16;
3737
import com.viaversion.viaversion.data.entity.EntityTrackerBase;
38+
import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
39+
import com.viaversion.viaversion.protocols.base.ClientboundStatusPackets;
3840
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14;
3941
import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15;
4042
import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.data.TranslationMappings;
@@ -79,14 +81,14 @@ protected void registerPackets() {
7981
new StatisticsRewriter<>(this).register(ClientboundPackets1_15.STATISTICS);
8082

8183
// Login Success
82-
registerClientbound(State.LOGIN, 0x02, 0x02, wrapper -> {
84+
registerClientbound(State.LOGIN, ClientboundLoginPackets.GAME_PROFILE.getId(), ClientboundLoginPackets.GAME_PROFILE.getId(), wrapper -> {
8385
// Transform string to a uuid
8486
UUID uuid = UUID.fromString(wrapper.read(Type.STRING));
8587
wrapper.write(Type.UUID, uuid);
8688
});
8789

8890
// Motd Status - line breaks are no longer allowed for player samples
89-
registerClientbound(State.STATUS, 0x00, 0x00, wrapper -> {
91+
registerClientbound(State.STATUS, ClientboundStatusPackets.STATUS_RESPONSE.getId(), ClientboundStatusPackets.STATUS_RESPONSE.getId(), wrapper -> {
9092
String original = wrapper.passthrough(Type.STRING);
9193
JsonObject object = GsonUtil.getGson().fromJson(original, JsonObject.class);
9294
JsonObject players = object.getAsJsonObject("players");

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/Protocol1_9To1_8.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import com.viaversion.viaversion.api.protocol.packet.State;
2929
import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
3030
import com.viaversion.viaversion.api.type.Type;
31+
import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
3132
import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
3233
import com.viaversion.viaversion.protocols.protocol1_8.ServerboundPackets1_8;
3334
import com.viaversion.viaversion.protocols.protocol1_9to1_8.metadata.MetadataRewriter1_9To1_8;
@@ -86,7 +87,7 @@ public static boolean isSword(int id) {
8687
protected void registerPackets() {
8788
super.registerPackets();
8889

89-
registerClientbound(State.LOGIN, 0x00, 0x00, wrapper -> {
90+
registerClientbound(State.LOGIN, ClientboundLoginPackets.LOGIN_DISCONNECT.getId(), ClientboundLoginPackets.LOGIN_DISCONNECT.getId(), wrapper -> {
9091
if (wrapper.isReadable(Type.COMPONENT, 0)) {
9192
// Already written as component in the base protocol
9293
return;

0 commit comments

Comments
 (0)