AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-14 01:48:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix 1.20.2 settings packet mapping

Browse Source
This commit is contained in:
Bixilon 2023-09-22 23:38:58 +02:00
parent 0789ffd95c
commit a66719ce70
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/bixilon/minosoft/config/profile/profiles/gui/chat/ChatC.kt
View File

@ -1,6 +1,6 @@
/* /*
* Minosoft * Minosoft
* Copyright (C) 2020-2022 Moritz Zwerger * Copyright (C) 2020-2023 Moritz Zwerger
* *
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
* *
@ -18,7 +18,7 @@ import de.bixilon.minosoft.config.profile.delegate.primitive.IntDelegate
import de.bixilon.minosoft.config.profile.delegate.types.EnumDelegate import de.bixilon.minosoft.config.profile.delegate.types.EnumDelegate
import de.bixilon.minosoft.config.profile.profiles.gui.GUIProfile import de.bixilon.minosoft.config.profile.profiles.gui.GUIProfile
import de.bixilon.minosoft.config.profile.profiles.gui.chat.internal.InternalC import de.bixilon.minosoft.config.profile.profiles.gui.chat.internal.InternalC
import de.bixilon.minosoft.protocol.packets.c2s.play.SettingsC2SP import de.bixilon.minosoft.protocol.packets.c2s.common.SettingsC2SP
class ChatC(profile: GUIProfile) { class ChatC(profile: GUIProfile) {
val internal = InternalC(profile) val internal = InternalC(profile)

2
src/main/java/de/bixilon/minosoft/protocol/network/connection/play/settings/ClientSettingsManager.kt
View File

@ -17,7 +17,7 @@ import de.bixilon.kutil.observer.DataObserver.Companion.observe
import de.bixilon.kutil.observer.set.SetObserver.Companion.observeSet import de.bixilon.kutil.observer.set.SetObserver.Companion.observeSet
import de.bixilon.minosoft.data.language.LanguageUtil import de.bixilon.minosoft.data.language.LanguageUtil
import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
import de.bixilon.minosoft.protocol.packets.c2s.play.SettingsC2SP import de.bixilon.minosoft.protocol.packets.c2s.common.SettingsC2SP
import de.bixilon.minosoft.protocol.protocol.ProtocolStates import de.bixilon.minosoft.protocol.protocol.ProtocolStates
import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_1_20_2_PRE1 import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_1_20_2_PRE1

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/SettingsC2SP.kt → src/main/java/de/bixilon/minosoft/protocol/packets/c2s/common/SettingsC2SP.kt
View File

@ -10,7 +10,7 @@
* *
* This software is not affiliated with Mojang AB, the original developer of Minecraft. * This software is not affiliated with Mojang AB, the original developer of Minecraft.
*/ */
package de.bixilon.minosoft.protocol.packets.c2s.play package de.bixilon.minosoft.protocol.packets.c2s.common
import de.bixilon.kutil.enums.EnumUtil import de.bixilon.kutil.enums.EnumUtil
import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.kutil.enums.ValuesEnum

10
src/main/java/de/bixilon/minosoft/protocol/packets/registry/DefaultPackets.kt
View File

@ -16,13 +16,17 @@ package de.bixilon.minosoft.protocol.packets.registry
import de.bixilon.minosoft.protocol.packets.c2s.common.HeartbeatC2SP import de.bixilon.minosoft.protocol.packets.c2s.common.HeartbeatC2SP
import de.bixilon.minosoft.protocol.packets.c2s.common.PongC2SP import de.bixilon.minosoft.protocol.packets.c2s.common.PongC2SP
import de.bixilon.minosoft.protocol.packets.c2s.common.ResourcepackC2SP import de.bixilon.minosoft.protocol.packets.c2s.common.ResourcepackC2SP
import de.bixilon.minosoft.protocol.packets.c2s.common.SettingsC2SP
import de.bixilon.minosoft.protocol.packets.c2s.configuration.ReadyC2SP import de.bixilon.minosoft.protocol.packets.c2s.configuration.ReadyC2SP
import de.bixilon.minosoft.protocol.packets.c2s.handshake.HandshakeC2SP import de.bixilon.minosoft.protocol.packets.c2s.handshake.HandshakeC2SP
import de.bixilon.minosoft.protocol.packets.c2s.login.ChannelC2SP import de.bixilon.minosoft.protocol.packets.c2s.login.ChannelC2SP
import de.bixilon.minosoft.protocol.packets.c2s.login.ConfigureC2SP import de.bixilon.minosoft.protocol.packets.c2s.login.ConfigureC2SP
import de.bixilon.minosoft.protocol.packets.c2s.login.EncryptionC2SP import de.bixilon.minosoft.protocol.packets.c2s.login.EncryptionC2SP
import de.bixilon.minosoft.protocol.packets.c2s.login.StartC2SP import de.bixilon.minosoft.protocol.packets.c2s.login.StartC2SP
import de.bixilon.minosoft.protocol.packets.c2s.play.* import de.bixilon.minosoft.protocol.packets.c2s.play.NextChunkBatchC2SP
import de.bixilon.minosoft.protocol.packets.c2s.play.ReconfigureC2SP
import de.bixilon.minosoft.protocol.packets.c2s.play.SessionDataC2SP
import de.bixilon.minosoft.protocol.packets.c2s.play.TradeC2SP
import de.bixilon.minosoft.protocol.packets.c2s.play.advancement.tab.AdvancementCloseTabC2SP import de.bixilon.minosoft.protocol.packets.c2s.play.advancement.tab.AdvancementCloseTabC2SP
import de.bixilon.minosoft.protocol.packets.c2s.play.advancement.tab.AdvancementOpenTabC2SP import de.bixilon.minosoft.protocol.packets.c2s.play.advancement.tab.AdvancementOpenTabC2SP
import de.bixilon.minosoft.protocol.packets.c2s.play.block.* import de.bixilon.minosoft.protocol.packets.c2s.play.block.*
@ -123,6 +127,7 @@ object DefaultPackets {
register("status_request", StatusRequestC2SP::class) register("status_request", StatusRequestC2SP::class)
}, },
ProtocolStates.LOGIN to PacketRegistry(threadSafe = false, extra = PacketExtraHandler.Disconnect).apply { ProtocolStates.LOGIN to PacketRegistry(threadSafe = false, extra = PacketExtraHandler.Disconnect).apply {
register("channel", ChannelC2SP::class)
register("channel", ChannelC2SP::class) register("channel", ChannelC2SP::class)
register("encryption", EncryptionC2SP::class) register("encryption", EncryptionC2SP::class)
register("enter_configuration", ConfigureC2SP::class) register("enter_configuration", ConfigureC2SP::class)
@ -134,6 +139,7 @@ object DefaultPackets {
register("heartbeat", HeartbeatC2SP::class) register("heartbeat", HeartbeatC2SP::class)
register("pong", PongC2SP::class) register("pong", PongC2SP::class)
register("resourcepack", ResourcepackC2SP::class) register("resourcepack", ResourcepackC2SP::class)
register("settings", SettingsC2SP::class)
register("ready", ReadyC2SP::class) register("ready", ReadyC2SP::class)
}, },
@ -142,6 +148,7 @@ object DefaultPackets {
register("heartbeat", HeartbeatC2SP::class) register("heartbeat", HeartbeatC2SP::class)
register("pong", PongC2SP::class) register("pong", PongC2SP::class)
register("resourcepack", ResourcepackC2SP::class) register("resourcepack", ResourcepackC2SP::class)
register("settings", SettingsC2SP::class)
register("advancement_tab", AdvancementCloseTabC2SP::class) register("advancement_tab", AdvancementCloseTabC2SP::class)
register("advancement_tab", AdvancementOpenTabC2SP::class) register("advancement_tab", AdvancementOpenTabC2SP::class)
@ -213,7 +220,6 @@ object DefaultPackets {
register("ping", de.bixilon.minosoft.protocol.packets.c2s.play.PingC2SP::class) register("ping", de.bixilon.minosoft.protocol.packets.c2s.play.PingC2SP::class)
register("reconfigure", ReconfigureC2SP::class) register("reconfigure", ReconfigureC2SP::class)
register("session_data", SessionDataC2SP::class) register("session_data", SessionDataC2SP::class)
register("settings", SettingsC2SP::class)
register("trade", TradeC2SP::class) register("trade", TradeC2SP::class)
}, },
) )