Skip to content

Commit

Permalink
update to mc 1.21.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@creeper123123321
creeper123123321 committed Nov 23, 2024
1 parent 181f4b6 commit 55eed19
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
8 changes: 5 additions & 3 deletions src/main/kotlin/com/viaversion/aas/codec/packet/PacketRegistry.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ClientboundConfi
import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ClientboundPackets1_20_2
import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundConfigurationPackets1_20_2
import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundPackets1_20_2
import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ServerboundPackets1_21_2
import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_8
import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_9
import io.netty.buffer.ByteBuf
Expand Down Expand Up @@ -146,7 +147,7 @@ object PacketRegistry {
ProtocolVersion.v1_19_3.singleton to ClientboundPackets1_19_3.DISCONNECT.id,
ProtocolVersion.v1_19_4..ProtocolVersion.v1_20 to ClientboundPackets1_19_4.DISCONNECT.id,
ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to ClientboundPackets1_20_2.DISCONNECT.id,
ProtocolVersion.v1_20_5..ProtocolVersion.v1_21 to ClientboundPackets1_20_5.DISCONNECT.id
ProtocolVersion.v1_20_5..ProtocolVersion.v1_21_2 to ClientboundPackets1_20_5.DISCONNECT.id
)
)
register(
Expand All @@ -165,7 +166,7 @@ object PacketRegistry {
ProtocolVersion.v1_19_3.singleton to ClientboundPackets1_19_3.CUSTOM_PAYLOAD.id,
ProtocolVersion.v1_19_4..ProtocolVersion.v1_20 to ClientboundPackets1_19_4.CUSTOM_PAYLOAD.id,
ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to ClientboundPackets1_20_2.CUSTOM_PAYLOAD.id,
ProtocolVersion.v1_20_5..ProtocolVersion.v1_21 to ClientboundPackets1_20_5.CUSTOM_PAYLOAD.id
ProtocolVersion.v1_20_5..ProtocolVersion.v1_21_2 to ClientboundPackets1_20_5.CUSTOM_PAYLOAD.id
)
)
register(
Expand All @@ -175,7 +176,8 @@ object PacketRegistry {
register(
State.PLAY, Direction.SERVERBOUND, ::ConfigurationAck, mapOf(
ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to ServerboundPackets1_20_2.CONFIGURATION_ACKNOWLEDGED.id,
ProtocolVersion.v1_20_5..ProtocolVersion.v1_21 to ServerboundPackets1_20_5.CONFIGURATION_ACKNOWLEDGED.id
ProtocolVersion.v1_20_5..ProtocolVersion.v1_21 to ServerboundPackets1_20_5.CONFIGURATION_ACKNOWLEDGED.id,
ProtocolVersion.v1_21_2.singleton to ServerboundPackets1_21_2.CONFIGURATION_ACKNOWLEDGED.id
)
)
// todo update chat to latest version
Expand Down
18 changes: 10 additions & 8 deletions src/main/kotlin/com/viaversion/aas/codec/packet/login/LoginSuccess.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ class LoginSuccess : Packet {

override fun decode(byteBuf: ByteBuf, protocolVersion: ProtocolVersion) {
id = when {
protocolVersion.newerThanOrEqualTo(ProtocolVersion.v1_16) -> {
protocolVersion >= ProtocolVersion.v1_16 -> {
Types.UUID.read(byteBuf)
}
protocolVersion.newerThanOrEqualTo(ProtocolVersion.v1_7_6) || protocolVersion.equalTo(sharewareVersion) -> {
protocolVersion >= ProtocolVersion.v1_7_6 || protocolVersion == sharewareVersion -> {
UUID.fromString(Types.STRING.read(byteBuf))
}
else -> parseUndashedId(Types.STRING.read(byteBuf))
}
username = Types.STRING.read(byteBuf)
if (protocolVersion.newerThanOrEqualTo(ProtocolVersion.v1_19)) {
if (protocolVersion >= ProtocolVersion.v1_19) {
val properties = Types.VAR_INT.readPrimitive(byteBuf)
for (i in 0 until properties) {
val name = Types.STRING.read(byteBuf)
Expand All @@ -35,31 +35,33 @@ class LoginSuccess : Packet {
this.properties.add(SignableProperty(name, value, signature))
}
}
if (protocolVersion.newerThanOrEqualTo(ProtocolVersion.v1_20_5)) {
if (protocolVersion >= ProtocolVersion.v1_20_5
&& protocolVersion <= ProtocolVersion.v1_21) {
strictErrorHandling = byteBuf.readBoolean()
}
}

override fun encode(byteBuf: ByteBuf, protocolVersion: ProtocolVersion) {
when {
protocolVersion.newerThanOrEqualTo(ProtocolVersion.v1_16) -> {
protocolVersion >= ProtocolVersion.v1_16 -> {
Types.UUID.write(byteBuf, id)
}
protocolVersion.newerThanOrEqualTo(ProtocolVersion.v1_7_6) || protocolVersion.equalTo(sharewareVersion) -> {
protocolVersion >= ProtocolVersion.v1_7_6 || protocolVersion == sharewareVersion -> {
Types.STRING.write(byteBuf, id.toString())
}
else -> Types.STRING.write(byteBuf, id.toString().replace("-", ""))
}
Types.STRING.write(byteBuf, username)
if (protocolVersion.newerThanOrEqualTo(ProtocolVersion.v1_19)) {
if (protocolVersion >= ProtocolVersion.v1_19) {
Types.VAR_INT.writePrimitive(byteBuf, properties.size)
for (property in properties) {
Types.STRING.write(byteBuf, property.key)
Types.STRING.write(byteBuf, property.value)
Types.OPTIONAL_STRING.write(byteBuf, property.signature)
}
}
if (protocolVersion.newerThanOrEqualTo(ProtocolVersion.v1_20_5)) {
if (protocolVersion >= ProtocolVersion.v1_20_5
&& protocolVersion <= ProtocolVersion.v1_21) {
byteBuf.writeBoolean(strictErrorHandling)
}
}
Expand Down

0 comments on commit 55eed19

Please sign in to comment.