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

rename some log types

Browse Source
This commit is contained in:
Bixilon 2023-06-30 00:47:37 +02:00
parent 0f65b97607
commit ec92744baa
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
234 changed files with 292 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/de/bixilon/minosoft/config/profile/profiles/other/OtherProfileManager.kt
View File

@ -1,6 +1,6 @@
/*
* 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.
*
@ -29,7 +29,7 @@ import java.util.concurrent.locks.ReentrantLock
object OtherProfileManager : ProfileManager<OtherProfile> {
override val mapper = Jackson.MAPPER.copy()
override val namespace = "minosoft:other".toResourceLocation()
override val latestVersion get() = 2
override val latestVersion get() = 3
override val saveLock = ReentrantLock()
override val profileClass = OtherProfile::class.java
override val jacksonProfileType: JavaType = Jackson.MAPPER.typeFactory.constructType(profileClass)
@ -49,6 +49,7 @@ object OtherProfileManager : ProfileManager<OtherProfile> {
override fun migrate(from: Int, data: MutableMap<String, Any?>) {
when (from) {
1 -> OtherProfileMigration.migrate1(data)
2 -> OtherProfileMigration.migrate2(data)
}
}
}

16
src/main/java/de/bixilon/minosoft/config/profile/profiles/other/OtherProfileMigration.kt
View File

@ -1,6 +1,6 @@
/*
* 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.
*
@ -23,4 +23,18 @@ object OtherProfileMigration {
fun migrate1(data: MutableMap<String, Any?>) {
data["log"]?.asMutableJsonObject()?.get("levels")?.asMutableJsonObject()?.let { it.remove("AUDIO_LOADING")?.let { audio -> it["AUDIO"] = audio } }
}
/**
* Some log levels got renamed
*/
fun migrate2(data: MutableMap<String, Any?>) {
data["log"]?.asMutableJsonObject()?.get("levels")?.asMutableJsonObject()?.let {
it.remove("NETWORK_RESOLVING")?.let { level -> it["NETWORK"] = level }
it -= "NETWORK_STATUS"
it.remove("NETWORK_PACKETS_IN")?.let { level -> it["NETWORK_IN"] = level }
it.remove("NETWORK_PACKETS_OUT")?.let { level -> it["NETWORK_OUT"] = level }
it.remove("RENDERING_GENERAL")?.let { level -> it["RENDERING"] = level }
it -= "RENDERING_LOADING"
}
}
}

2
src/main/java/de/bixilon/minosoft/data/registries/registries/Registries.kt
View File

@ -264,7 +264,7 @@ class Registries(
registry.update(values, this)
} catch (error: Throwable) {
error.printStackTrace()
Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.WARN) { "Can not update $fixedKey registry: $error" }
Log.log(LogMessageType.NETWORK_IN, LogLevels.WARN) { "Can not update $fixedKey registry: $error" }
}
}
}

6
src/main/java/de/bixilon/minosoft/gui/RenderLoop.kt
View File

@ -51,7 +51,7 @@ class RenderLoop(
fun startLoop() {
Log.log(LogMessageType.RENDERING_LOADING) { "Starting loop" }
Log.log(LogMessageType.RENDERING) { "Starting loop" }
context.connection.events.listen<WindowCloseEvent> { context.state = RenderingStates.QUITTING }
while (true) {
if (context.state == RenderingStates.PAUSED) {
@ -123,11 +123,11 @@ class RenderLoop(
context.renderStats.endFrame()
}
Log.log(LogMessageType.RENDERING_LOADING) { "Destroying render window..." }
Log.log(LogMessageType.RENDERING) { "Destroying render window..." }
context.state = RenderingStates.STOPPED
context.system.destroy()
context.window.destroy()
Log.log(LogMessageType.RENDERING_LOADING) { "Render window destroyed!" }
Log.log(LogMessageType.RENDERING) { "Render window destroyed!" }
// disconnect
context.connection.network.disconnect()
}

24
src/main/java/de/bixilon/minosoft/gui/rendering/RenderLoader.kt
View File

@ -54,7 +54,7 @@ object RenderLoader {
fun RenderContext.load(latch: AbstractLatch) {
val renderLatch = ParentLatch(1, latch)
setThread()
Log.log(LogMessageType.RENDERING_LOADING, LogLevels.VERBOSE) { "Creating window..." }
Log.log(LogMessageType.RENDERING, LogLevels.VERBOSE) { "Creating window..." }
val stopwatch = Stopwatch()
registerRenderer()
@ -66,17 +66,17 @@ object RenderLoader {
tints.init(connection.assetsManager)
Log.log(LogMessageType.RENDERING_LOADING, LogLevels.VERBOSE) { "Creating context (after ${stopwatch.labTime()})..." }
Log.log(LogMessageType.RENDERING, LogLevels.VERBOSE) { "Creating context (after ${stopwatch.labTime()})..." }
system.init()
Log.log(LogMessageType.RENDERING_LOADING, LogLevels.VERBOSE) { "Enabling all open gl features (after ${stopwatch.labTime()})..." }
Log.log(LogMessageType.RENDERING, LogLevels.VERBOSE) { "Enabling all open gl features (after ${stopwatch.labTime()})..." }
system.reset()
// Init stage
val initLatch = ParentLatch(1, renderLatch)
Log.log(LogMessageType.RENDERING_LOADING, LogLevels.VERBOSE) { "Generating font and gathering textures (after ${stopwatch.labTime()})..." }
Log.log(LogMessageType.RENDERING, LogLevels.VERBOSE) { "Generating font and gathering textures (after ${stopwatch.labTime()})..." }
textures.dynamicTextures.load(initLatch)
textures.initializeSkins(connection)
textures.loadDefaultTextures()
@ -86,7 +86,7 @@ object RenderLoader {
framebuffer.init()
Log.log(LogMessageType.RENDERING_LOADING, LogLevels.VERBOSE) { "Initializing renderer (after ${stopwatch.labTime()})..." }
Log.log(LogMessageType.RENDERING, LogLevels.VERBOSE) { "Initializing renderer (after ${stopwatch.labTime()})..." }
light.init()
skeletal.init()
renderer.init(initLatch)
@ -96,24 +96,24 @@ object RenderLoader {
initLatch.await()
// Post init stage
Log.log(LogMessageType.RENDERING_LOADING, LogLevels.VERBOSE) { "Preloading textures (after ${stopwatch.labTime()})..." }
Log.log(LogMessageType.RENDERING, LogLevels.VERBOSE) { "Preloading textures (after ${stopwatch.labTime()})..." }
textures.staticTextures.preLoad(renderLatch)
Log.log(LogMessageType.RENDERING_LOADING, LogLevels.VERBOSE) { "Loading textures (after ${stopwatch.labTime()})..." }
Log.log(LogMessageType.RENDERING, LogLevels.VERBOSE) { "Loading textures (after ${stopwatch.labTime()})..." }
textures.staticTextures.load(renderLatch)
font.postInit(renderLatch)
Log.log(LogMessageType.RENDERING_LOADING, LogLevels.VERBOSE) { "Post loading renderer (after ${stopwatch.labTime()})..." }
Log.log(LogMessageType.RENDERING, LogLevels.VERBOSE) { "Post loading renderer (after ${stopwatch.labTime()})..." }
shaders.postInit()
skeletal.postInit()
renderer.postInit(renderLatch)
framebuffer.postInit()
Log.log(LogMessageType.RENDERING_LOADING, LogLevels.VERBOSE) { "Loading skeletal meshes (after ${stopwatch.labTime()})" }
Log.log(LogMessageType.RENDERING, LogLevels.VERBOSE) { "Loading skeletal meshes (after ${stopwatch.labTime()})" }
models.entities.loadSkeletal()
Log.log(LogMessageType.RENDERING_LOADING, LogLevels.VERBOSE) { "Registering callbacks (after ${stopwatch.labTime()})..." }
Log.log(LogMessageType.RENDERING, LogLevels.VERBOSE) { "Registering callbacks (after ${stopwatch.labTime()})..." }
window::focused.observeRendering(this) { state = it.decide(RenderingStates.RUNNING, RenderingStates.SLOW) }
@ -141,7 +141,7 @@ object RenderLoader {
renderLatch.dec() // initial count from rendering
renderLatch.await()
Log.log(LogMessageType.RENDERING_LOADING) { "Rendering is fully prepared in ${stopwatch.totalTime()}" }
Log.log(LogMessageType.RENDERING) { "Rendering is fully prepared in ${stopwatch.totalTime()}" }
}
fun RenderContext.awaitPlaying() {
@ -160,6 +160,6 @@ object RenderLoader {
state = RenderingStates.RUNNING
window.visible = true
}
Log.log(LogMessageType.RENDERING_GENERAL) { "Showing window after ${time.formatNanos()}" }
Log.log(LogMessageType.RENDERING) { "Showing window after ${time.formatNanos()}" }
}
}

2
src/main/java/de/bixilon/minosoft/gui/rendering/Rendering.kt
View File

@ -31,7 +31,7 @@ class Rendering(private val connection: PlayConnection) {
val audioPlayer: AudioPlayer = AudioPlayer(connection, this)
fun start(latch: AbstractLatch, render: Boolean = true, audio: Boolean = true) {
Log.log(LogMessageType.RENDERING_GENERAL, LogLevels.INFO) { "Hello LWJGL ${Version.getVersion()}!" }
Log.log(LogMessageType.RENDERING, LogLevels.INFO) { "Hello LWJGL ${Version.getVersion()}!" }
val loading = ParentLatch(2, latch)
if (audio) startAudioPlayerThread(loading)
if (render) startRenderWindowThread(loading)

2
src/main/java/de/bixilon/minosoft/gui/rendering/font/loader/FontLoader.kt
View File

@ -44,7 +44,7 @@ object FontLoader {
worker += add@{
val factory = FontTypes[type]
if (factory == null) {
Log.log(LogMessageType.RENDERING_LOADING, LogLevels.WARN) { "Unknown font provider: $type" }
Log.log(LogMessageType.RENDERING, LogLevels.WARN) { "Unknown font provider: $type" }
return@add
}
providers[index] = factory.build(context, manager, provider)

2
src/main/java/de/bixilon/minosoft/gui/rendering/renderer/renderer/RendererManager.kt
View File

@ -49,7 +49,7 @@ class RendererManager(
val renderer = builder.build(connection, context) ?: return null
val previous = renderers.put(resourceLocation, renderer)
if (previous != null) {
Log.log(LogMessageType.RENDERING_LOADING, LogLevels.WARN) { "Renderer $previous(${builder.identifier}) got replaced by $renderer!" }
Log.log(LogMessageType.RENDERING, LogLevels.WARN) { "Renderer $previous(${builder.identifier}) got replaced by $renderer!" }
}
return renderer
}

4
src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/file/PNGTexture.kt
View File

@ -60,9 +60,9 @@ class PNGTexture(
assetsManager[resourceLocation].readTexture()
} catch (error: Throwable) {
state = TextureStates.ERRORED
Log.log(LogMessageType.RENDERING_LOADING, LogLevels.WARN) { "Can not load texture $resourceLocation: $error" }
Log.log(LogMessageType.RENDERING, LogLevels.WARN) { "Can not load texture $resourceLocation: $error" }
if (error !is FileNotFoundException) {
Log.log(LogMessageType.RENDERING_LOADING, LogLevels.VERBOSE) { error }
Log.log(LogMessageType.RENDERING, LogLevels.VERBOSE) { error }
}
assetsManager[RenderConstants.DEBUG_TEXTURE_RESOURCE_LOCATION].readTexture()
}

2
src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt
View File

@ -141,7 +141,7 @@ class OpenGLRenderSystem(
if (RenderConstants.OPENGL_DEBUG_MODE) {
glEnable(GL_DEBUG_OUTPUT)
glDebugMessageCallback({ source, type, id, severity, length, message, userParameter ->
Log.log(LogMessageType.RENDERING_GENERAL, LogLevels.VERBOSE) { "OpenGL error: source=$source, type=$type, id=$id, severity=$severity, length=$length, message=$message, userParameter=$userParameter" }
Log.log(LogMessageType.RENDERING, LogLevels.VERBOSE) { "OpenGL error: source=$source, type=$type, id=$id, severity=$severity, length=$length, message=$message, userParameter=$userParameter" }
}, 0)
}
active = true

2
src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLTextureArray.kt
View File

@ -209,7 +209,7 @@ class OpenGLTextureArray(
textureIds[index] = loadSingleArray(TEXTURE_RESOLUTION_ID_MAP[index], textures)
totalLayers += textures.size
}
Log.log(LogMessageType.RENDERING_LOADING, LogLevels.VERBOSE) { "Loaded ${namedTextures.size} textures containing ${animator.animations.size} animated ones, split into $totalLayers layers!" }
Log.log(LogMessageType.RENDERING, LogLevels.VERBOSE) { "Loaded ${namedTextures.size} textures containing ${animator.animations.size} animated ones, split into $totalLayers layers!" }
animator.init()
state = TextureArrayStates.LOADED

2
src/main/java/de/bixilon/minosoft/gui/rendering/system/window/glfw/GLFWWindow.kt
View File

@ -369,7 +369,7 @@ class GLFWWindow(
GLFW_RELEASE -> KeyChangeTypes.RELEASE
GLFW_REPEAT -> KeyChangeTypes.REPEAT
else -> {
Log.log(LogMessageType.RENDERING_GENERAL, LogLevels.WARN) { "Unknown glfw action $action" }
Log.log(LogMessageType.RENDERING, LogLevels.WARN) { "Unknown glfw action $action" }
return
}
}

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

@ -238,7 +238,7 @@ class PlayConnection(
private fun establish(latch: AbstractLatch?) {
latch?.dec() // remove initial value
Log.log(LogMessageType.NETWORK_STATUS, level = LogLevels.INFO) { "Connecting to server: $address" }
Log.log(LogMessageType.NETWORK, level = LogLevels.INFO) { "Connecting to server: $address" }
network.connect(address, profiles.other.nativeNetwork)
state = PlayConnectionStates.ESTABLISHING
}

6
src/main/java/de/bixilon/minosoft/protocol/network/connection/status/StatusConnection.kt
View File

@ -91,7 +91,7 @@ class StatusConnection(
val nextIndex = ++addressIndex
if (addresses.size > nextIndex) {
val nextAddress = addresses[nextIndex]
Log.log(LogMessageType.NETWORK_RESOLVING) { "Could not connect to $address, trying next hostname: $nextAddress" }
Log.log(LogMessageType.NETWORK) { "Could not connect to $address, trying next hostname: $nextAddress" }
realAddress = nextAddress
ping(nextAddress)
}
@ -128,7 +128,7 @@ class StatusConnection(
error("Already connecting!")
}
timeout.register()
Log.log(LogMessageType.NETWORK_RESOLVING) { "Pinging $address (from ${this.address})" }
Log.log(LogMessageType.NETWORK) { "Pinging $address (from ${this.address})" }
state = StatusConnectionStates.ESTABLISHING
network.connect(address, false)
@ -144,7 +144,7 @@ class StatusConnection(
try {
addresses = resolve()
} catch (exception: Exception) {
Log.log(LogMessageType.NETWORK_RESOLVING) { "Can not resolve ${this.address}" }
Log.log(LogMessageType.NETWORK) { "Can not resolve ${this.address}" }
return
}
ping(addresses.first())

4
src/main/java/de/bixilon/minosoft/protocol/network/network/client/netty/NettyClient.kt
View File

@ -1,6 +1,6 @@
/*
* 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.
*
@ -170,7 +170,7 @@ class NettyClient(
cause = error.cause ?: cause
}
if (RunConfiguration.DISABLE_EROS || connection !is StatusConnection) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.WARN) { cause }
Log.log(LogMessageType.NETWORK_IN, LogLevels.WARN) { cause }
}
if (cause !is NetworkException || cause is CriticalNetworkException || state == ProtocolStates.LOGIN) {
connection.error = cause

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/ItemPickC2SP.kt
View File

@ -29,6 +29,6 @@ class ItemPickC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Pick item (slot=$slot)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Pick item (slot=$slot)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/handshaking/HandshakeC2SP.kt
View File

@ -37,6 +37,6 @@ class HandshakeC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Handshake (protocolId=$protocolId, hostname=${address.hostname}, port=${address.port}, nextState=$nextState)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Handshake (protocolId=$protocolId, hostname=${address.hostname}, port=${address.port}, nextState=$nextState)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/login/ChannelC2SP.kt
View File

@ -32,6 +32,6 @@ class ChannelC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Login channel (messageId=$messageId, data=$data)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Login channel (messageId=$messageId, data=$data)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/login/EncryptionC2SP.kt
View File

@ -51,6 +51,6 @@ class EncryptionC2SP private constructor(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Encryption response (secret=${secret.toBase64()}, nonce=$nonce)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Encryption response (secret=${secret.toBase64()}, nonce=$nonce)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/login/StartC2SP.kt
View File

@ -50,6 +50,6 @@ class StartC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Login start (username=$username, publicKey=$publicKey)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Login start (username=$username, publicKey=$publicKey)" }
}
}

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

@ -41,6 +41,6 @@ class BookC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Book (hand=$hand, pages=$pages, title=$title)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Book (hand=$hand, pages=$pages, title=$title)" }
}
}

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

@ -41,6 +41,6 @@ class ChannelC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Channel (channel=$channel, data=${data.contentToString()})" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Channel (channel=$channel, data=${data.contentToString()})" }
}
}

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

@ -31,7 +31,7 @@ class ChatPreviewC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Chat preview (id=$id, query=$query)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Chat preview (id=$id, query=$query)" }
}
}

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

@ -36,7 +36,7 @@ class ClientActionC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Client action (action=$action)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Client action (action=$action)" }
}
enum class ClientActions {

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

@ -40,6 +40,6 @@ class HeartbeatC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Heartbeat (id=$id)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Heartbeat (id=$id)" }
}
}

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

@ -27,6 +27,6 @@ class HotbarSlotC2SP(val slot: Int) : PlayC2SPacket {
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Hotbar slot (slot=$slot)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Hotbar slot (slot=$slot)" }
}
}

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

@ -51,7 +51,7 @@ class PlayerActionC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Player action (action=$action, position=$position, direction=$direction, sequence=$sequence)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Player action (action=$action, position=$position, direction=$direction, sequence=$sequence)" }
}
enum class Actions {

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

@ -31,6 +31,6 @@ class PongC2SP(val payload: Int) : PlayC2SPacket {
if (reducedLog) {
return
}
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Pong (payload=$payload)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Pong (payload=$payload)" }
}
}

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

@ -34,7 +34,7 @@ class ResourcepackC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Resourcepack (hash=$hash, status=$status)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Resourcepack (hash=$hash, status=$status)" }
}
enum class ResourcePackStates {

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

@ -33,6 +33,6 @@ class SessionDataC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Session data (sessionId=$sessionId, publicKey=$publicKey)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Session data (sessionId=$sessionId, publicKey=$publicKey)" }
}
}

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

@ -64,7 +64,7 @@ class SettingsC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Settings (locale=$locale, viewDistance=$viewDistance, chatMode=$chatMode, chatColors=$chatColors, skinParts=${skinParts.contentToString()}, mainHand=$mainArm, disableTextFiltering=$disableTextFiltering, allowListing=$allowListing)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Settings (locale=$locale, viewDistance=$viewDistance, chatMode=$chatMode, chatColors=$chatColors, skinParts=${skinParts.contentToString()}, mainHand=$mainArm, disableTextFiltering=$disableTextFiltering, allowListing=$allowListing)" }
}
enum class ChatModes {

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

@ -29,6 +29,6 @@ class TradeC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Trade (id=$id)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Trade (id=$id)" }
}
}

4
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/advancement/tab/AdvancementCloseTabC2SP.kt
View File

@ -1,6 +1,6 @@
/*
* 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.
*
@ -22,6 +22,6 @@ import de.bixilon.minosoft.util.logging.LogMessageType
class AdvancementCloseTabC2SP : AdvancementTabC2SP(Action.CLOSE_TAB) {
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Advancement close tab" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Advancement close tab" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/advancement/tab/AdvancementOpenTabC2SP.kt
View File

@ -31,6 +31,6 @@ class AdvancementOpenTabC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Advancement open tab (tab=$tabName)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Advancement open tab (tab=$tabName)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/AnvilItemNameC2SP.kt
View File

@ -29,6 +29,6 @@ class AnvilItemNameC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Anvil item name (name=$name)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Anvil item name (name=$name)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/BeaconEffectC2SP.kt
View File

@ -45,6 +45,6 @@ class BeaconEffectC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Beacon effect (primary=$primaryEffect, secondary=$secondaryEffect)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Beacon effect (primary=$primaryEffect, secondary=$secondaryEffect)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/BlockInteractC2SP.kt
View File

@ -80,6 +80,6 @@ data class BlockInteractC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Block interact (position=$position, direction=$direction, cursor=$cursorPosition, hand=$hand, insideBlock=$insideBlock, sequence=$sequence)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Block interact (position=$position, direction=$direction, cursor=$cursorPosition, hand=$hand, insideBlock=$insideBlock, sequence=$sequence)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/BlockNbtC2SP.kt
View File

@ -33,6 +33,6 @@ class BlockNbtC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Block nbt (transactionId=$transactionId, blockPosition=$blockPosition)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Block nbt (transactionId=$transactionId, blockPosition=$blockPosition)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/CommandBlockC2SP.kt
View File

@ -50,7 +50,7 @@ class CommandBlockC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Command block (position=$position, command=\"$command\", type=$type, trackOutput=$trackOutput, isConditional=$isConditional, isAutomatic=$isAutomatic)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Command block (position=$position, command=\"$command\", type=$type, trackOutput=$trackOutput, isConditional=$isConditional, isAutomatic=$isAutomatic)" }
}
enum class CommandBlockTypes {

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/GenerateStructureC2SP.kt
View File

@ -37,6 +37,6 @@ class GenerateStructureC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Generate structure (position=$position, levels=$levels, keepJigsaw=$keepJigsaw)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Generate structure (position=$position, levels=$levels, keepJigsaw=$keepJigsaw)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/JigsawBlockC2SP.kt
View File

@ -48,6 +48,6 @@ class JigsawBlockC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Jigsaw block (position=$position, targetPool=$targetPool, finalState=$finalState, attachmentType=$attachmentType, name=$name, target=$target, jointType=$jointType)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Jigsaw block (position=$position, targetPool=$targetPool, finalState=$finalState, attachmentType=$attachmentType, name=$name, target=$target, jointType=$jointType)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/MinecartCommandBlockC2SP.kt
View File

@ -33,6 +33,6 @@ class MinecartCommandBlockC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Minecart command block (entityId=$entityId, command=$command, trackOutput=$trackOutput)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Minecart command block (entityId=$entityId, command=$command, trackOutput=$trackOutput)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/SignTextC2SP.kt
View File

@ -50,6 +50,6 @@ class SignTextC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Sign text (position=$position)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Sign text (position=$position)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/StructureBlockC2SP.kt
View File

@ -61,7 +61,7 @@ class StructureBlockC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Structure block (position=$position, action=$action, mode=$mode, name=\"$name\", offsetX=$offsetX, offsetY=$offsetY, offsetZ=$offsetZ, sizeX=$sizeX, sizeY=$sizeY, sizeZ=$sizeZ, mirror=$mirror, rotation=$rotation, metaData=$metaData, integrity=$integrity, seed=$seed, flags=$flags)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Structure block (position=$position, action=$action, mode=$mode, name=\"$name\", offsetX=$offsetX, offsetY=$offsetY, offsetZ=$offsetZ, sizeX=$sizeX, sizeY=$sizeY, sizeZ=$sizeZ, mirror=$mirror, rotation=$rotation, metaData=$metaData, integrity=$integrity, seed=$seed, flags=$flags)" }
}
enum class StructureBlockActions {

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/ChatMessageC2SP.kt
View File

@ -29,6 +29,6 @@ class ChatMessageC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Chat message (message=$message)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Chat message (message=$message)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/CommandC2SP.kt
View File

@ -50,6 +50,6 @@ class CommandC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Command (message=$command, time=$time, signature=$signature)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Command (message=$command, time=$time, signature=$signature)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/CommandSuggestionsC2SP.kt
View File

@ -44,6 +44,6 @@ class CommandSuggestionsC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Chat suggestions (text=\"$text\", assumeCommand=$assumeCommand, position=$position)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Chat suggestions (text=\"$text\", assumeCommand=$assumeCommand, position=$position)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/LegacyMessageAcknowledgementC2SP.kt
View File

@ -30,6 +30,6 @@ class LegacyMessageAcknowledgementC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Message acknowledgement (acknowledgement=$acknowledgement)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Message acknowledgement (acknowledgement=$acknowledgement)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/MessageAcknowledgementC2SP.kt
View File

@ -29,6 +29,6 @@ class MessageAcknowledgementC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Message acknowledgement (acknowledgement=$offset)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Message acknowledgement (acknowledgement=$offset)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/SignedChatMessageC2SP.kt
View File

@ -58,6 +58,6 @@ class SignedChatMessageC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Signed chat message (message=$message, time=$time, signature=$signature, previewed=$previewed)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Signed chat message (message=$message, time=$time, signature=$signature, previewed=$previewed)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/container/CloseContainerC2SP.kt
View File

@ -29,6 +29,6 @@ class CloseContainerC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Close container (containerId=$containerId)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Close container (containerId=$containerId)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/container/ContainerActionC2SP.kt
View File

@ -34,6 +34,6 @@ class ContainerActionC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Container action (containerId=$containerId, actionId=$actionId, accepted=$accepted)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Container action (containerId=$containerId, actionId=$actionId, accepted=$accepted)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/container/ContainerButtonC2SP.kt
View File

@ -31,6 +31,6 @@ class ContainerButtonC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Container button (containerId=$containerId, buttonId=$buttonId)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Container button (containerId=$containerId, buttonId=$buttonId)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/container/ContainerClickC2SP.kt
View File

@ -57,6 +57,6 @@ data class ContainerClickC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Container click (containerId=$containerId, revision=$revision, slot=$slot, action=$button, actionId=$actionId, changes=$changes, floating=$floating)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Container click (containerId=$containerId, revision=$revision, slot=$slot, action=$button, actionId=$actionId, changes=$changes, floating=$floating)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/difficulty/DifficultyC2SP.kt
View File

@ -31,6 +31,6 @@ class DifficultyC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Difficulty (difficulty=$difficulty)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Difficulty (difficulty=$difficulty)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/difficulty/LockDifficultyC2SP.kt
View File

@ -30,6 +30,6 @@ class LockDifficultyC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Lock difficulty (lock=$lock)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Lock difficulty (lock=$lock)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/EntityActionC2SP.kt
View File

@ -44,7 +44,7 @@ class EntityActionC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Entity action (entityId=$entityId, action=$action, parameter=$parameter)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Entity action (entityId=$entityId, action=$action, parameter=$parameter)" }
}
enum class EntityActions {

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/EntityNbtC2SP.kt
View File

@ -30,6 +30,6 @@ class EntityNbtC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Entity NBT (entityId=$entityId, transactionId=$transactionId)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Entity NBT (entityId=$entityId, transactionId=$transactionId)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/EntitySpectateC2SP.kt
View File

@ -33,6 +33,6 @@ class EntitySpectateC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Entity spectate (uuid=$uuid)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Entity spectate (uuid=$uuid)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/interact/EntityAttackC2SP.kt
View File

@ -39,6 +39,6 @@ class EntityAttackC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Entity attack (entityId=$entityId, sneaking=$sneaking)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Entity attack (entityId=$entityId, sneaking=$sneaking)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/interact/EntityEmptyInteractC2SP.kt
View File

@ -48,6 +48,6 @@ class EntityEmptyInteractC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Entity interaction (entityId=$entityId, hand=$hand, sneaking=$sneaking)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Entity interaction (entityId=$entityId, hand=$hand, sneaking=$sneaking)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/interact/EntityInteractPositionC2SP.kt
View File

@ -53,6 +53,6 @@ class EntityInteractPositionC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Entity interaction (entityId=$entityId, position=$position, hand=$hand, sneaking=$sneaking)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Entity interaction (entityId=$entityId, position=$position, hand=$hand, sneaking=$sneaking)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/item/ItemStackCreateC2SP.kt
View File

@ -32,6 +32,6 @@ class ItemStackCreateC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Item stack create (slot=$slot, createdItem=$createdItem)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Item stack create (slot=$slot, createdItem=$createdItem)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/item/UseItemC2SP.kt
View File

@ -35,6 +35,6 @@ data class UseItemC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Use item (hand=$hand, sequence=$sequence)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Use item (hand=$hand, sequence=$sequence)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/ConfirmTeleportC2SP.kt
View File

@ -29,6 +29,6 @@ class ConfirmTeleportC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Confirm teleport (teleportId=$teleportId)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Confirm teleport (teleportId=$teleportId)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/GroundChangeC2SP.kt
View File

@ -32,6 +32,6 @@ class GroundChangeC2SP(
if (reducedLog) {
return
}
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Ground change (onGround=$onGround))" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Ground change (onGround=$onGround))" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/PositionC2SP.kt
View File

@ -41,6 +41,6 @@ class PositionC2SP(
if (reducedLog) {
return
}
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Position (position=$position, onGround=$onGround)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Position (position=$position, onGround=$onGround)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/PositionRotationC2SP.kt
View File

@ -45,6 +45,6 @@ class PositionRotationC2SP(
if (reducedLog) {
return
}
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Position + rotation (position=$position, rotation=$rotation, onGround=$onGround)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Position + rotation (position=$position, rotation=$rotation, onGround=$onGround)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/RotationC2SP.kt
View File

@ -36,6 +36,6 @@ class RotationC2SP(
if (reducedLog) {
return
}
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Rotation (rotation=$rotation, onGround=$onGround)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Rotation (rotation=$rotation, onGround=$onGround)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/SwingArmC2SP.kt
View File

@ -36,6 +36,6 @@ class SwingArmC2SP(
if (reducedLog) {
return
}
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Swing arm (arm=$arm)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Swing arm (arm=$arm)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/ToggleFlyC2SP.kt
View File

@ -41,6 +41,6 @@ class ToggleFlyC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Toggle fly (flying=${abilities.flying})" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Toggle fly (flying=${abilities.flying})" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/vehicle/MoveVehicleC2SP.kt
View File

@ -34,6 +34,6 @@ class MoveVehicleC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Move vehicle (position=$position, rotation=$rotation)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Move vehicle (position=$position, rotation=$rotation)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/vehicle/SteerBoatC2SP.kt
View File

@ -31,6 +31,6 @@ class SteerBoatC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Steer boat (leftPaddle=$leftPaddle, rightPaddle=$rightPaddle)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Steer boat (leftPaddle=$leftPaddle, rightPaddle=$rightPaddle)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/vehicle/VehicleInputC2SP.kt
View File

@ -47,6 +47,6 @@ class VehicleInputC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Vehicle input (sideways=$sideways, forward=$forward, jump=$jump, unmount=$unmount)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Vehicle input (sideways=$sideways, forward=$forward, jump=$jump, unmount=$unmount)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/CraftingRecipeC2SP.kt
View File

@ -31,6 +31,6 @@ class CraftingRecipeC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Crafting recipe request (containerId=$containerId, recipeId=$recipeId)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Crafting recipe request (containerId=$containerId, recipeId=$recipeId)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/DisplayedRecipeC2SP.kt
View File

@ -30,6 +30,6 @@ class DisplayedRecipeC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Display recipe set (recipe=$recipe)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Display recipe set (recipe=$recipe)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/RecipeBookC2SP.kt
View File

@ -33,7 +33,7 @@ class RecipeBookC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Recipe book (book=$book, bookOpen=$bookOpen, filterActive=$filterActive)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Recipe book (book=$book, bookOpen=$bookOpen, filterActive=$filterActive)" }
}
enum class RecipeBooks {

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/book/DisplayRecipeC2SP.kt
View File

@ -30,6 +30,6 @@ class DisplayRecipeC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Display recipe (recipeId=$recipeId)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Display recipe (recipeId=$recipeId)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/book/RecipeBookStatesC2SP.kt
View File

@ -44,6 +44,6 @@ class RecipeBookStatesC2SP(
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Crafting book states (craftingBookOpen=$craftingBookOpen, craftingFilter=$craftingFilter, blastingBookOpen=$blastingBookOpen, blastingFilter=$blastingFilter, smokingBookOpen=$smokingBookOpen, smokingFilter=$smokingFilter)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Crafting book states (craftingBookOpen=$craftingBookOpen, craftingFilter=$craftingFilter, blastingBookOpen=$blastingBookOpen, blastingFilter=$blastingFilter, smokingBookOpen=$smokingBookOpen, smokingFilter=$smokingFilter)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/status/PingC2SP.kt
View File

@ -28,6 +28,6 @@ class PingC2SP(val payload: Long) : C2SPacket {
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Status ping (payload=$payload)" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Status ping (payload=$payload)" }
}
}

4
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/status/StatusRequestC2SP.kt
View File

@ -1,6 +1,6 @@
/*
* 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.
*
@ -23,6 +23,6 @@ import de.bixilon.minosoft.util.logging.LogMessageType
class StatusRequestC2SP : C2SPacket {
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_OUT, LogLevels.VERBOSE) { "Status request" }
Log.log(LogMessageType.NETWORK_OUT, LogLevels.VERBOSE) { "Status request" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/ChannelS2CP.kt
View File

@ -32,7 +32,7 @@ class ChannelS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Login channel (messageId=$messageId, channel=$channel, data=$data)" }
Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Login channel (messageId=$messageId, channel=$channel, data=$data)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/CompressionS2CP.kt
View File

@ -25,6 +25,6 @@ class CompressionS2CP(buffer: PlayInByteBuffer) : CompressionS2CP {
override val threshold: Int = buffer.readVarInt()
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Compression (threshold=$threshold)" }
Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Compression (threshold=$threshold)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/EncryptionS2CP.kt
View File

@ -70,7 +70,7 @@ class EncryptionS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Encryption request (serverId=$serverId, publicKey=${publicKey.toBase64()}, nonce=${nonce.toBase64()})" }
Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Encryption request (serverId=$serverId, publicKey=${publicKey.toBase64()}, nonce=${nonce.toBase64()})" }
}
companion object : PacketErrorHandler {

4
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/KickS2CP.kt
View File

@ -30,12 +30,12 @@ class KickS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
override fun handle(connection: PlayConnection) {
connection.events.fire(LoginKickEvent(connection, this))
Log.log(LogMessageType.NETWORK_STATUS, level = LogLevels.WARN) { "Kicked from ${connection.address}: $reason" }
Log.log(LogMessageType.NETWORK, level = LogLevels.WARN) { "Kicked from ${connection.address}: $reason" }
connection.network.disconnect()
connection.state = PlayConnectionStates.ERROR
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Login kick (reason=$reason)" }
Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Login kick (reason=$reason)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/SuccessS2CP.kt
View File

@ -43,6 +43,6 @@ class SuccessS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Login success (uuid=$uuid, name=$name, properties=$properties)" }
Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Login success (uuid=$uuid, name=$name, properties=$properties)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BookS2CP.kt
View File

@ -25,6 +25,6 @@ class BookS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
val hand: Hands = Hands[buffer.readVarInt()]
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Book (hand=$hand)" }
Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Book (hand=$hand)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BundleS2CP.kt
View File

@ -24,6 +24,6 @@ import de.bixilon.minosoft.util.logging.LogMessageType
class BundleS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Bundle" }
Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Bundle" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CameraS2CP.kt
View File

@ -29,6 +29,6 @@ class CameraS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Camera (entityId=$entityId)" }
Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Camera (entityId=$entityId)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ChannelS2CP.kt
View File

@ -42,6 +42,6 @@ class ChannelS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Channel (channel=$channel, size=${data.size})" }
Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Channel (channel=$channel, size=${data.size})" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ChatPreviewS2CP.kt
View File

@ -25,6 +25,6 @@ class ChatPreviewS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
val preview = buffer.readOptional { buffer.readChatComponent() }
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Chat preview (id=$id, preview=\"${preview}§r\")" }
Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Chat preview (id=$id, preview=\"${preview}§r\")" }
}
}

6
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CommandsS2CP.kt
View File

@ -80,7 +80,7 @@ class CommandsS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
val parserName = if (versionId >= ProtocolVersions.V_22W12A) connection.registries.argumentType[readVarInt()] else readResourceLocation()
val parser = ArgumentParserFactories[parserName]
if (parser == null) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Can not find parser: $parserName" }
Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Can not find parser: $parserName" }
builder.parser = DummyParser
} else {
builder.parser = parser.read(this)
@ -90,7 +90,7 @@ class CommandsS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
val suggestionName = readResourceLocation()
val suggestionType = SuggestionFactories[suggestionName]
if (suggestionType == null) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Can not find suggestion type: $suggestionName" }
Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Can not find suggestion type: $suggestionName" }
} else {
builder.suggestionType = suggestionType.build(this.connection, this)
}
@ -101,6 +101,6 @@ class CommandsS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Commands (nodes=$nodes, rootNode=$rootNode)" }
Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Commands (nodes=$nodes, rootNode=$rootNode)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CompassPositionS2CP.kt
View File

@ -39,6 +39,6 @@ class CompassPositionS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Compass position (position=$position, angle=$angle)" }
Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Compass position (position=$position, angle=$angle)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CompressionS2CP.kt
View File

@ -24,6 +24,6 @@ class CompressionS2CP(buffer: PlayInByteBuffer) : CompressionS2CP {
override val threshold: Int = buffer.readVarInt()
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Compression set (threshold=$threshold)" }
Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Compression set (threshold=$threshold)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CraftingRecipeS2CP.kt
View File

@ -37,6 +37,6 @@ class CraftingRecipeS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Crafting recipe (containerId=$containerId, recipeId=$recipeId, recipeName=$recipeName)" }
Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Crafting recipe (containerId=$containerId, recipeId=$recipeId, recipeName=$recipeName)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/DamageTiltS2CP.kt
View File

@ -36,6 +36,6 @@ class DamageTiltS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Damage tilt (entityId=$entityId, yaw=$yaw)" }
Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Damage tilt (entityId=$entityId, yaw=$yaw)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/DifficultyS2CP.kt
View File

@ -40,6 +40,6 @@ class DifficultyS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Difficulty (difficulty=$difficulty, locked=${locked})" }
Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Difficulty (difficulty=$difficulty, locked=${locked})" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ExperienceS2CP.kt
View File

@ -53,6 +53,6 @@ class ExperienceS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Experience set (bar=$bar, level=$level, total=$total)" }
Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Experience set (bar=$bar, level=$level, total=$total)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ExplosionS2CP.kt
View File

@ -96,6 +96,6 @@ class ExplosionS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
}
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Explosion (position=$position, power=$power, explodedBlocks=$explodedBlocks, velocity=$velocity)" }
Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Explosion (position=$position, power=$power, explodedBlocks=$explodedBlocks, velocity=$velocity)" }
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/FeaturesS2CP.kt
View File

@ -24,6 +24,6 @@ class FeaturesS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
val features = buffer.readArray { buffer.readResourceLocation() }.toSet()
override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Features (features=$features)" }
Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Features (features=$features)" }
}
}

Some files were not shown because too many files have changed in this diff Show More