From ec92744baa88e01cc8d92a2586d4b0dd89b198a4 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Fri, 30 Jun 2023 00:47:37 +0200 Subject: [PATCH] rename some log types --- .../profiles/other/OtherProfileManager.kt | 5 ++-- .../profiles/other/OtherProfileMigration.kt | 16 ++++++++++++- .../data/registries/registries/Registries.kt | 2 +- .../de/bixilon/minosoft/gui/RenderLoop.kt | 6 ++--- .../minosoft/gui/rendering/RenderLoader.kt | 24 +++++++++---------- .../minosoft/gui/rendering/Rendering.kt | 2 +- .../gui/rendering/font/loader/FontLoader.kt | 2 +- .../renderer/renderer/RendererManager.kt | 2 +- .../base/texture/texture/file/PNGTexture.kt | 4 ++-- .../system/opengl/OpenGLRenderSystem.kt | 2 +- .../opengl/texture/OpenGLTextureArray.kt | 2 +- .../system/window/glfw/GLFWWindow.kt | 2 +- .../network/connection/play/PlayConnection.kt | 2 +- .../connection/status/StatusConnection.kt | 6 ++--- .../network/client/netty/NettyClient.kt | 4 ++-- .../protocol/packets/c2s/ItemPickC2SP.kt | 2 +- .../packets/c2s/handshaking/HandshakeC2SP.kt | 2 +- .../protocol/packets/c2s/login/ChannelC2SP.kt | 2 +- .../packets/c2s/login/EncryptionC2SP.kt | 2 +- .../protocol/packets/c2s/login/StartC2SP.kt | 2 +- .../protocol/packets/c2s/play/BookC2SP.kt | 2 +- .../protocol/packets/c2s/play/ChannelC2SP.kt | 2 +- .../packets/c2s/play/ChatPreviewC2SP.kt | 2 +- .../packets/c2s/play/ClientActionC2SP.kt | 2 +- .../packets/c2s/play/HeartbeatC2SP.kt | 2 +- .../packets/c2s/play/HotbarSlotC2SP.kt | 2 +- .../packets/c2s/play/PlayerActionC2SP.kt | 2 +- .../protocol/packets/c2s/play/PongC2SP.kt | 2 +- .../packets/c2s/play/ResourcepackC2SP.kt | 2 +- .../packets/c2s/play/SessionDataC2SP.kt | 2 +- .../protocol/packets/c2s/play/SettingsC2SP.kt | 2 +- .../protocol/packets/c2s/play/TradeC2SP.kt | 2 +- .../tab/AdvancementCloseTabC2SP.kt | 4 ++-- .../advancement/tab/AdvancementOpenTabC2SP.kt | 2 +- .../c2s/play/block/AnvilItemNameC2SP.kt | 2 +- .../c2s/play/block/BeaconEffectC2SP.kt | 2 +- .../c2s/play/block/BlockInteractC2SP.kt | 2 +- .../packets/c2s/play/block/BlockNbtC2SP.kt | 2 +- .../c2s/play/block/CommandBlockC2SP.kt | 2 +- .../c2s/play/block/GenerateStructureC2SP.kt | 2 +- .../packets/c2s/play/block/JigsawBlockC2SP.kt | 2 +- .../play/block/MinecartCommandBlockC2SP.kt | 2 +- .../packets/c2s/play/block/SignTextC2SP.kt | 2 +- .../c2s/play/block/StructureBlockC2SP.kt | 2 +- .../packets/c2s/play/chat/ChatMessageC2SP.kt | 2 +- .../packets/c2s/play/chat/CommandC2SP.kt | 2 +- .../c2s/play/chat/CommandSuggestionsC2SP.kt | 2 +- .../chat/LegacyMessageAcknowledgementC2SP.kt | 2 +- .../play/chat/MessageAcknowledgementC2SP.kt | 2 +- .../c2s/play/chat/SignedChatMessageC2SP.kt | 2 +- .../c2s/play/container/CloseContainerC2SP.kt | 2 +- .../c2s/play/container/ContainerActionC2SP.kt | 2 +- .../c2s/play/container/ContainerButtonC2SP.kt | 2 +- .../c2s/play/container/ContainerClickC2SP.kt | 2 +- .../c2s/play/difficulty/DifficultyC2SP.kt | 2 +- .../c2s/play/difficulty/LockDifficultyC2SP.kt | 2 +- .../c2s/play/entity/EntityActionC2SP.kt | 2 +- .../packets/c2s/play/entity/EntityNbtC2SP.kt | 2 +- .../c2s/play/entity/EntitySpectateC2SP.kt | 2 +- .../play/entity/interact/EntityAttackC2SP.kt | 2 +- .../interact/EntityEmptyInteractC2SP.kt | 2 +- .../interact/EntityInteractPositionC2SP.kt | 2 +- .../c2s/play/item/ItemStackCreateC2SP.kt | 2 +- .../packets/c2s/play/item/UseItemC2SP.kt | 2 +- .../c2s/play/move/ConfirmTeleportC2SP.kt | 2 +- .../packets/c2s/play/move/GroundChangeC2SP.kt | 2 +- .../packets/c2s/play/move/PositionC2SP.kt | 2 +- .../c2s/play/move/PositionRotationC2SP.kt | 2 +- .../packets/c2s/play/move/RotationC2SP.kt | 2 +- .../packets/c2s/play/move/SwingArmC2SP.kt | 2 +- .../packets/c2s/play/move/ToggleFlyC2SP.kt | 2 +- .../c2s/play/move/vehicle/MoveVehicleC2SP.kt | 2 +- .../c2s/play/move/vehicle/SteerBoatC2SP.kt | 2 +- .../c2s/play/move/vehicle/VehicleInputC2SP.kt | 2 +- .../c2s/play/recipe/CraftingRecipeC2SP.kt | 2 +- .../c2s/play/recipe/DisplayedRecipeC2SP.kt | 2 +- .../packets/c2s/play/recipe/RecipeBookC2SP.kt | 2 +- .../c2s/play/recipe/book/DisplayRecipeC2SP.kt | 2 +- .../play/recipe/book/RecipeBookStatesC2SP.kt | 2 +- .../protocol/packets/c2s/status/PingC2SP.kt | 2 +- .../packets/c2s/status/StatusRequestC2SP.kt | 4 ++-- .../protocol/packets/s2c/login/ChannelS2CP.kt | 2 +- .../packets/s2c/login/CompressionS2CP.kt | 2 +- .../packets/s2c/login/EncryptionS2CP.kt | 2 +- .../protocol/packets/s2c/login/KickS2CP.kt | 4 ++-- .../protocol/packets/s2c/login/SuccessS2CP.kt | 2 +- .../protocol/packets/s2c/play/BookS2CP.kt | 2 +- .../protocol/packets/s2c/play/BundleS2CP.kt | 2 +- .../protocol/packets/s2c/play/CameraS2CP.kt | 2 +- .../protocol/packets/s2c/play/ChannelS2CP.kt | 2 +- .../packets/s2c/play/ChatPreviewS2CP.kt | 2 +- .../protocol/packets/s2c/play/CommandsS2CP.kt | 6 ++--- .../packets/s2c/play/CompassPositionS2CP.kt | 2 +- .../packets/s2c/play/CompressionS2CP.kt | 2 +- .../packets/s2c/play/CraftingRecipeS2CP.kt | 2 +- .../packets/s2c/play/DamageTiltS2CP.kt | 2 +- .../packets/s2c/play/DifficultyS2CP.kt | 2 +- .../packets/s2c/play/ExperienceS2CP.kt | 2 +- .../packets/s2c/play/ExplosionS2CP.kt | 2 +- .../protocol/packets/s2c/play/FeaturesS2CP.kt | 2 +- .../packets/s2c/play/GameEventS2CP.kt | 2 +- .../protocol/packets/s2c/play/HealthS2CP.kt | 2 +- .../packets/s2c/play/HeartbeatS2CP.kt | 2 +- .../packets/s2c/play/HotbarSlotS2CP.kt | 2 +- .../packets/s2c/play/InitializeS2CP.kt | 2 +- .../packets/s2c/play/ItemCooldownS2CP.kt | 2 +- .../protocol/packets/s2c/play/KickS2CP.kt | 4 ++-- .../packets/s2c/play/MoveVehicleS2CP.kt | 2 +- .../packets/s2c/play/NbtResponseS2CP.kt | 2 +- .../s2c/play/OpenHorseContainerS2CP.kt | 4 ++-- .../protocol/packets/s2c/play/ParticleS2CP.kt | 2 +- .../protocol/packets/s2c/play/PingS2CP.kt | 2 +- .../packets/s2c/play/PlayStatusS2CP.kt | 2 +- .../packets/s2c/play/PlayerAbilitiesS2CP.kt | 2 +- .../packets/s2c/play/PlayerFaceS2CP.kt | 2 +- .../packets/s2c/play/ResourcepackS2CP.kt | 2 +- .../protocol/packets/s2c/play/RespawnS2CP.kt | 2 +- .../s2c/play/SimulationDistanceS2CP.kt | 2 +- .../packets/s2c/play/StatisticsS2CP.kt | 2 +- .../protocol/packets/s2c/play/TagsS2CP.kt | 2 +- .../packets/s2c/play/TemporaryChatPreview.kt | 2 +- .../protocol/packets/s2c/play/TimeS2CP.kt | 2 +- .../packets/s2c/play/VibrationS2CP.kt | 2 +- .../packets/s2c/play/VillagerTradesS2CP.kt | 2 +- .../packets/s2c/play/WorldEventS2CP.kt | 2 +- .../play/advancement/AdvancementTabS2CP.kt | 2 +- .../s2c/play/advancement/AdvancementsS2CP.kt | 4 ++-- .../packets/s2c/play/block/BlockActionS2CP.kt | 4 ++-- .../s2c/play/block/BlockBreakAnimationS2CP.kt | 2 +- .../packets/s2c/play/block/BlockBreakS2CP.kt | 2 +- .../packets/s2c/play/block/BlockDataS2CP.kt | 2 +- .../packets/s2c/play/block/BlockS2CP.kt | 2 +- .../packets/s2c/play/block/BlocksS2CP.kt | 2 +- .../s2c/play/block/LegacyBlockBreakS2CP.kt | 2 +- .../s2c/play/border/CenterWorldBorderS2CP.kt | 2 +- .../play/border/InitializeWorldBorderS2CP.kt | 2 +- .../play/border/InterpolateWorldBorderS2CP.kt | 2 +- .../s2c/play/border/SizeWorldBorderS2CP.kt | 2 +- .../play/border/WarnBlocksWorldBorderS2CP.kt | 2 +- .../play/border/WarnTimeWorldBorderS2CP.kt | 2 +- .../s2c/play/bossbar/AddBossbarS2CP.kt | 2 +- .../s2c/play/bossbar/FlagsBossbarS2CP.kt | 2 +- .../s2c/play/bossbar/RemoveBossbarS2CP.kt | 6 ++--- .../s2c/play/bossbar/StyleBossbarS2CP.kt | 2 +- .../s2c/play/bossbar/TitleBossbarS2CP.kt | 2 +- .../s2c/play/bossbar/ValueBossbarS2CP.kt | 2 +- .../packets/s2c/play/chat/ChatMessageS2CP.kt | 2 +- .../s2c/play/chat/ChatSuggestionsS2CP.kt | 2 +- .../s2c/play/chat/CommandSuggestionsS2CP.kt | 2 +- .../packets/s2c/play/chat/HideMessageS2CP.kt | 2 +- .../s2c/play/chat/MessageHeaderS2CP.kt | 2 +- .../s2c/play/chat/SignedChatMessageS2CP.kt | 2 +- .../s2c/play/chat/UnsignedChatMessageS2CP.kt | 2 +- .../packets/s2c/play/chunk/ChunkBiomeS2CP.kt | 2 +- .../packets/s2c/play/chunk/ChunkCenterS2CP.kt | 2 +- .../packets/s2c/play/chunk/ChunkLightS2CP.kt | 2 +- .../packets/s2c/play/chunk/ChunkS2CP.kt | 2 +- .../packets/s2c/play/chunk/ChunksS2CP.kt | 2 +- .../packets/s2c/play/chunk/UnloadChunkS2CP.kt | 2 +- .../s2c/play/chunk/ViewDistanceS2CP.kt | 2 +- .../s2c/play/combat/EndCombatEventS2CP.kt | 2 +- .../s2c/play/combat/EnterCombatEventS2CP.kt | 2 +- .../s2c/play/combat/KillCombatEventS2CP.kt | 2 +- .../s2c/play/container/CloseContainerS2CP.kt | 4 ++-- .../s2c/play/container/ContainerActionS2CP.kt | 2 +- .../s2c/play/container/ContainerItemS2CP.kt | 2 +- .../s2c/play/container/ContainerItemsS2CP.kt | 2 +- .../play/container/ContainerPropertiesS2CP.kt | 2 +- .../s2c/play/container/OpenContainerS2CP.kt | 2 +- .../s2c/play/entity/EntityAnimationS2CP.kt | 2 +- .../s2c/play/entity/EntityAttributesS2CP.kt | 2 +- .../s2c/play/entity/EntityCollectS2CP.kt | 2 +- .../s2c/play/entity/EntityDamageS2CP.kt | 2 +- .../packets/s2c/play/entity/EntityDataS2CP.kt | 2 +- .../s2c/play/entity/EntityEquipmentS2CP.kt | 2 +- .../s2c/play/entity/EntityPlayerS2CP.kt | 2 +- .../s2c/play/entity/EntitySleepS2CP.kt | 2 +- .../s2c/play/entity/EntityStatusS2CP.kt | 4 ++-- .../play/entity/effect/EntityEffectS2CP.kt | 2 +- .../entity/effect/EntityRemoveEffectS2CP.kt | 2 +- .../s2c/play/entity/move/EmptyMoveS2CP.kt | 2 +- .../s2c/play/entity/move/HeadRotationS2CP.kt | 2 +- .../play/entity/move/MovementRotationS2CP.kt | 2 +- .../play/entity/move/PositionRotationS2CP.kt | 2 +- .../s2c/play/entity/move/RelativeMoveS2CP.kt | 2 +- .../s2c/play/entity/move/RotationS2CP.kt | 2 +- .../s2c/play/entity/move/TeleportS2CP.kt | 2 +- .../s2c/play/entity/move/VelocityS2CP.kt | 2 +- .../play/entity/passenger/EntityAttachS2CP.kt | 2 +- .../entity/passenger/EntityPassengerS2CP.kt | 2 +- .../play/entity/spawn/EntityDestroyS2CP.kt | 2 +- .../entity/spawn/EntityExperienceOrbS2CP.kt | 3 +-- .../play/entity/spawn/EntityMobSpawnS2CP.kt | 2 +- .../entity/spawn/EntityObjectSpawnS2CP.kt | 2 +- .../play/entity/spawn/EntityPaintingS2CP.kt | 2 +- .../entity/spawn/GlobalEntitySpawnS2CP.kt | 5 ++-- .../protocol/packets/s2c/play/map/MapS2CP.kt | 2 +- .../s2c/play/map/legacy/DataLegacyMapS2CP.kt | 2 +- .../s2c/play/map/legacy/PinsLegacyMapS2CP.kt | 2 +- .../s2c/play/map/legacy/ScaleLegacyMapS2CP.kt | 2 +- .../packets/s2c/play/recipes/RecipesS2CP.kt | 4 ++-- .../s2c/play/recipes/UnlockRecipesS2CP.kt | 2 +- .../play/scoreboard/ObjectivePositionS2CP.kt | 2 +- .../objective/CreateObjectiveS2CP.kt | 2 +- .../objective/RemoveObjectiveS2CP.kt | 2 +- .../objective/UpdateObjectiveS2CP.kt | 2 +- .../score/PutScoreboardScoreS2CP.kt | 2 +- .../score/RemoveScoreboardScoreS2CP.kt | 2 +- .../scoreboard/teams/AddTeamMemberS2CP.kt | 2 +- .../play/scoreboard/teams/CreateTeamS2CP.kt | 2 +- .../scoreboard/teams/RemoveTeamMemberS2CP.kt | 2 +- .../play/scoreboard/teams/RemoveTeamS2CP.kt | 6 ++--- .../play/scoreboard/teams/UpdateTeamS2CP.kt | 2 +- .../packets/s2c/play/sign/SignEditorS2CP.kt | 2 +- .../packets/s2c/play/sign/SignTextS2CP.kt | 2 +- .../packets/s2c/play/sound/EntitySoundS2CP.kt | 2 +- .../packets/s2c/play/sound/NamedSoundS2CP.kt | 2 +- .../packets/s2c/play/sound/SoundEventS2CP.kt | 2 +- .../packets/s2c/play/sound/StopSoundS2CP.kt | 2 +- .../packets/s2c/play/tab/LegacyTabListS2CP.kt | 2 +- .../packets/s2c/play/tab/TabListRemoveS2CP.kt | 2 +- .../packets/s2c/play/tab/TabListS2CP.kt | 2 +- .../packets/s2c/play/tab/TabListTextS2CP.kt | 2 +- .../packets/s2c/play/title/HideTitleS2CP.kt | 2 +- .../packets/s2c/play/title/HotbarTextS2CP.kt | 2 +- .../packets/s2c/play/title/ResetTitleS2CP.kt | 2 +- .../packets/s2c/play/title/SubtitleS2CP.kt | 2 +- .../packets/s2c/play/title/TitleTextS2CP.kt | 2 +- .../packets/s2c/play/title/TitleTimesS2CP.kt | 2 +- .../protocol/packets/s2c/status/PongS2CP.kt | 2 +- .../protocol/packets/s2c/status/StatusS2CP.kt | 4 ++-- .../protocol/protocol/LANServerListener.kt | 8 +++---- .../protocol/buffers/play/PlayInByteBuffer.kt | 2 +- .../minosoft/util/logging/LogMessageType.kt | 12 ++++------ 234 files changed, 292 insertions(+), 281 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/config/profile/profiles/other/OtherProfileManager.kt b/src/main/java/de/bixilon/minosoft/config/profile/profiles/other/OtherProfileManager.kt index 8fc470cf9..74ee755e2 100644 --- a/src/main/java/de/bixilon/minosoft/config/profile/profiles/other/OtherProfileManager.kt +++ b/src/main/java/de/bixilon/minosoft/config/profile/profiles/other/OtherProfileManager.kt @@ -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 { 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 { override fun migrate(from: Int, data: MutableMap) { when (from) { 1 -> OtherProfileMigration.migrate1(data) + 2 -> OtherProfileMigration.migrate2(data) } } } diff --git a/src/main/java/de/bixilon/minosoft/config/profile/profiles/other/OtherProfileMigration.kt b/src/main/java/de/bixilon/minosoft/config/profile/profiles/other/OtherProfileMigration.kt index 15f53bc6b..07fa99916 100644 --- a/src/main/java/de/bixilon/minosoft/config/profile/profiles/other/OtherProfileMigration.kt +++ b/src/main/java/de/bixilon/minosoft/config/profile/profiles/other/OtherProfileMigration.kt @@ -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) { 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) { + 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" + } + } } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/registries/Registries.kt b/src/main/java/de/bixilon/minosoft/data/registries/registries/Registries.kt index 03ce85eac..02781950e 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/registries/Registries.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/registries/Registries.kt @@ -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" } } } } diff --git a/src/main/java/de/bixilon/minosoft/gui/RenderLoop.kt b/src/main/java/de/bixilon/minosoft/gui/RenderLoop.kt index 8094565df..55b0f9782 100644 --- a/src/main/java/de/bixilon/minosoft/gui/RenderLoop.kt +++ b/src/main/java/de/bixilon/minosoft/gui/RenderLoop.kt @@ -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 { 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() } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderLoader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderLoader.kt index 85a147e28..ae74116bf 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderLoader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderLoader.kt @@ -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()}" } } } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/Rendering.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/Rendering.kt index f968219f7..c1a90fadb 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/Rendering.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/Rendering.kt @@ -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) diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/loader/FontLoader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/loader/FontLoader.kt index f166776b8..57b03fd47 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/loader/FontLoader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/loader/FontLoader.kt @@ -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) diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/renderer/renderer/RendererManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/renderer/renderer/RendererManager.kt index 858e527c0..90c57fe07 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/renderer/renderer/RendererManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/renderer/renderer/RendererManager.kt @@ -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 } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/file/PNGTexture.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/file/PNGTexture.kt index 34a3fa546..935f15e6c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/file/PNGTexture.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/file/PNGTexture.kt @@ -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() } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt index 6065aba52..0848daeba 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt @@ -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 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLTextureArray.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLTextureArray.kt index e0aa78b4f..e938a9316 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLTextureArray.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLTextureArray.kt @@ -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 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/glfw/GLFWWindow.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/glfw/GLFWWindow.kt index c5c0e4a3d..06e1b3d75 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/glfw/GLFWWindow.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/glfw/GLFWWindow.kt @@ -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 } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/PlayConnection.kt b/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/PlayConnection.kt index 2a92e44c5..11ea99db9 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/PlayConnection.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/PlayConnection.kt @@ -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 } diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/connection/status/StatusConnection.kt b/src/main/java/de/bixilon/minosoft/protocol/network/connection/status/StatusConnection.kt index 3e0d0a677..255829907 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/connection/status/StatusConnection.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/network/connection/status/StatusConnection.kt @@ -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()) diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/network/client/netty/NettyClient.kt b/src/main/java/de/bixilon/minosoft/protocol/network/network/client/netty/NettyClient.kt index 1ba4c45f6..7ee22eebd 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/network/client/netty/NettyClient.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/network/network/client/netty/NettyClient.kt @@ -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 diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/ItemPickC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/ItemPickC2SP.kt index 43f589d44..a9a6fbddf 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/ItemPickC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/ItemPickC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/handshaking/HandshakeC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/handshaking/HandshakeC2SP.kt index 43a856370..7368f3001 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/handshaking/HandshakeC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/handshaking/HandshakeC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/login/ChannelC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/login/ChannelC2SP.kt index 44a209889..4a733d506 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/login/ChannelC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/login/ChannelC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/login/EncryptionC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/login/EncryptionC2SP.kt index 2ab947d4f..598847b88 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/login/EncryptionC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/login/EncryptionC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/login/StartC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/login/StartC2SP.kt index b09d7ba5b..a1c953898 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/login/StartC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/login/StartC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/BookC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/BookC2SP.kt index dd3ec6912..76f01edc0 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/BookC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/BookC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/ChannelC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/ChannelC2SP.kt index 767ec97b8..571bad594 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/ChannelC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/ChannelC2SP.kt @@ -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()})" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/ChatPreviewC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/ChatPreviewC2SP.kt index d44cdafbb..66ab24a6d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/ChatPreviewC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/ChatPreviewC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/ClientActionC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/ClientActionC2SP.kt index 7b9f5be34..9153ee40e 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/ClientActionC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/ClientActionC2SP.kt @@ -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 { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/HeartbeatC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/HeartbeatC2SP.kt index 9de706ca7..60f9d8183 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/HeartbeatC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/HeartbeatC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/HotbarSlotC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/HotbarSlotC2SP.kt index 510608fe6..95e23c376 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/HotbarSlotC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/HotbarSlotC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/PlayerActionC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/PlayerActionC2SP.kt index afd50b0bc..a07025c1f 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/PlayerActionC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/PlayerActionC2SP.kt @@ -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 { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/PongC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/PongC2SP.kt index e4ce07bc4..1b9cbebda 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/PongC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/PongC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/ResourcepackC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/ResourcepackC2SP.kt index e42c8d207..efc072767 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/ResourcepackC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/ResourcepackC2SP.kt @@ -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 { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/SessionDataC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/SessionDataC2SP.kt index afba2e11d..a5768b02a 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/SessionDataC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/SessionDataC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/SettingsC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/SettingsC2SP.kt index 14c66f0e8..3d2a18ddd 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/SettingsC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/SettingsC2SP.kt @@ -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 { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/TradeC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/TradeC2SP.kt index 39b63bd85..52a6502e3 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/TradeC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/TradeC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/advancement/tab/AdvancementCloseTabC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/advancement/tab/AdvancementCloseTabC2SP.kt index 2790766ff..5d9477c5f 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/advancement/tab/AdvancementCloseTabC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/advancement/tab/AdvancementCloseTabC2SP.kt @@ -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" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/advancement/tab/AdvancementOpenTabC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/advancement/tab/AdvancementOpenTabC2SP.kt index 8a08dab57..56cb88e39 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/advancement/tab/AdvancementOpenTabC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/advancement/tab/AdvancementOpenTabC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/AnvilItemNameC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/AnvilItemNameC2SP.kt index 5d2215c76..4742b91c6 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/AnvilItemNameC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/AnvilItemNameC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/BeaconEffectC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/BeaconEffectC2SP.kt index 92b06cace..dcddecf5c 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/BeaconEffectC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/BeaconEffectC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/BlockInteractC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/BlockInteractC2SP.kt index 62fd94eea..c56b6173f 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/BlockInteractC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/BlockInteractC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/BlockNbtC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/BlockNbtC2SP.kt index 43d465dd5..55b428676 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/BlockNbtC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/BlockNbtC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/CommandBlockC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/CommandBlockC2SP.kt index 5aa7e807b..0e0726c63 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/CommandBlockC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/CommandBlockC2SP.kt @@ -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 { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/GenerateStructureC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/GenerateStructureC2SP.kt index 617d41975..007a3c467 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/GenerateStructureC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/GenerateStructureC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/JigsawBlockC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/JigsawBlockC2SP.kt index 0751f38d0..47c5b482e 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/JigsawBlockC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/JigsawBlockC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/MinecartCommandBlockC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/MinecartCommandBlockC2SP.kt index 128a639cb..94b7cb2e1 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/MinecartCommandBlockC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/MinecartCommandBlockC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/SignTextC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/SignTextC2SP.kt index ffaedbfdb..7430427f4 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/SignTextC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/SignTextC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/StructureBlockC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/StructureBlockC2SP.kt index 19d41ff0d..7f9ce7376 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/StructureBlockC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/block/StructureBlockC2SP.kt @@ -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 { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/ChatMessageC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/ChatMessageC2SP.kt index cc06f0696..f6e52fafc 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/ChatMessageC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/ChatMessageC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/CommandC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/CommandC2SP.kt index c6c40e19d..db25e2705 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/CommandC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/CommandC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/CommandSuggestionsC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/CommandSuggestionsC2SP.kt index d1d956124..b6165f614 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/CommandSuggestionsC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/CommandSuggestionsC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/LegacyMessageAcknowledgementC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/LegacyMessageAcknowledgementC2SP.kt index 5d91a69dd..081f17ba9 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/LegacyMessageAcknowledgementC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/LegacyMessageAcknowledgementC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/MessageAcknowledgementC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/MessageAcknowledgementC2SP.kt index efca9b86a..30ffe8ab8 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/MessageAcknowledgementC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/MessageAcknowledgementC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/SignedChatMessageC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/SignedChatMessageC2SP.kt index aaf92a653..11c367773 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/SignedChatMessageC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/SignedChatMessageC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/container/CloseContainerC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/container/CloseContainerC2SP.kt index 901c2d031..69d5e0b6a 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/container/CloseContainerC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/container/CloseContainerC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/container/ContainerActionC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/container/ContainerActionC2SP.kt index dc1d9fcae..49c7c0832 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/container/ContainerActionC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/container/ContainerActionC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/container/ContainerButtonC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/container/ContainerButtonC2SP.kt index d785854b3..78b85a53a 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/container/ContainerButtonC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/container/ContainerButtonC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/container/ContainerClickC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/container/ContainerClickC2SP.kt index 16105bace..2f90111b0 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/container/ContainerClickC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/container/ContainerClickC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/difficulty/DifficultyC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/difficulty/DifficultyC2SP.kt index 12634028e..5bce0ef22 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/difficulty/DifficultyC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/difficulty/DifficultyC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/difficulty/LockDifficultyC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/difficulty/LockDifficultyC2SP.kt index 84527c9c1..442cc852b 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/difficulty/LockDifficultyC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/difficulty/LockDifficultyC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/EntityActionC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/EntityActionC2SP.kt index ac0fe3c1d..e70e049f5 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/EntityActionC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/EntityActionC2SP.kt @@ -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 { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/EntityNbtC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/EntityNbtC2SP.kt index 2985a55cb..33701e2bb 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/EntityNbtC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/EntityNbtC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/EntitySpectateC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/EntitySpectateC2SP.kt index b532fb8c2..b67525292 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/EntitySpectateC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/EntitySpectateC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/interact/EntityAttackC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/interact/EntityAttackC2SP.kt index ac94d4190..b73dadfce 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/interact/EntityAttackC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/interact/EntityAttackC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/interact/EntityEmptyInteractC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/interact/EntityEmptyInteractC2SP.kt index eea4b4079..72de66720 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/interact/EntityEmptyInteractC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/interact/EntityEmptyInteractC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/interact/EntityInteractPositionC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/interact/EntityInteractPositionC2SP.kt index 00ee62dcb..17090bd7c 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/interact/EntityInteractPositionC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/interact/EntityInteractPositionC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/item/ItemStackCreateC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/item/ItemStackCreateC2SP.kt index 735cee283..1ca16f3bb 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/item/ItemStackCreateC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/item/ItemStackCreateC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/item/UseItemC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/item/UseItemC2SP.kt index 195fc215a..431c43459 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/item/UseItemC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/item/UseItemC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/ConfirmTeleportC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/ConfirmTeleportC2SP.kt index 82631522c..af143b2db 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/ConfirmTeleportC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/ConfirmTeleportC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/GroundChangeC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/GroundChangeC2SP.kt index 40c4dd611..08369571b 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/GroundChangeC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/GroundChangeC2SP.kt @@ -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))" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/PositionC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/PositionC2SP.kt index 34fafd239..c344570ef 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/PositionC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/PositionC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/PositionRotationC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/PositionRotationC2SP.kt index dc56fa8e4..d20b6edd1 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/PositionRotationC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/PositionRotationC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/RotationC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/RotationC2SP.kt index 8970a94fa..b90331270 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/RotationC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/RotationC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/SwingArmC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/SwingArmC2SP.kt index a644b070b..d31c66c28 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/SwingArmC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/SwingArmC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/ToggleFlyC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/ToggleFlyC2SP.kt index eaac25247..b1aba8724 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/ToggleFlyC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/ToggleFlyC2SP.kt @@ -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})" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/vehicle/MoveVehicleC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/vehicle/MoveVehicleC2SP.kt index 3e7b72d65..9bdc135a4 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/vehicle/MoveVehicleC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/vehicle/MoveVehicleC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/vehicle/SteerBoatC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/vehicle/SteerBoatC2SP.kt index 0b4937ab0..23cc09afc 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/vehicle/SteerBoatC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/vehicle/SteerBoatC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/vehicle/VehicleInputC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/vehicle/VehicleInputC2SP.kt index fe521b25d..ab2880b0c 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/vehicle/VehicleInputC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/move/vehicle/VehicleInputC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/CraftingRecipeC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/CraftingRecipeC2SP.kt index 007de246a..a9cf56346 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/CraftingRecipeC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/CraftingRecipeC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/DisplayedRecipeC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/DisplayedRecipeC2SP.kt index 32f236b4d..ce2228129 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/DisplayedRecipeC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/DisplayedRecipeC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/RecipeBookC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/RecipeBookC2SP.kt index c8f96c71b..4b066d741 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/RecipeBookC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/RecipeBookC2SP.kt @@ -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 { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/book/DisplayRecipeC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/book/DisplayRecipeC2SP.kt index 2813b6109..237c95ff9 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/book/DisplayRecipeC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/book/DisplayRecipeC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/book/RecipeBookStatesC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/book/RecipeBookStatesC2SP.kt index 351ca610a..824ffa312 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/book/RecipeBookStatesC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/recipe/book/RecipeBookStatesC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/status/PingC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/status/PingC2SP.kt index fe4a50170..ead75089d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/status/PingC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/status/PingC2SP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/status/StatusRequestC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/status/StatusRequestC2SP.kt index 38270d76c..f370269f8 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/status/StatusRequestC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/status/StatusRequestC2SP.kt @@ -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" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/ChannelS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/ChannelS2CP.kt index d9c892b2d..389a85eb1 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/ChannelS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/ChannelS2CP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/CompressionS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/CompressionS2CP.kt index 3dbb67ffb..b3975c230 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/CompressionS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/CompressionS2CP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/EncryptionS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/EncryptionS2CP.kt index fa74d06a4..7690a8439 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/EncryptionS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/EncryptionS2CP.kt @@ -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 { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/KickS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/KickS2CP.kt index 4a5e3cb52..8247094af 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/KickS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/KickS2CP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/SuccessS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/SuccessS2CP.kt index 2807a4fb2..35a214f2e 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/SuccessS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/SuccessS2CP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BookS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BookS2CP.kt index b521fa987..c6b62d118 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BookS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BookS2CP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BundleS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BundleS2CP.kt index d86c78b61..c2db21bf8 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BundleS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BundleS2CP.kt @@ -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" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CameraS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CameraS2CP.kt index 31fdb6382..91409005b 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CameraS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CameraS2CP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ChannelS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ChannelS2CP.kt index c12014656..d8da46177 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ChannelS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ChannelS2CP.kt @@ -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})" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ChatPreviewS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ChatPreviewS2CP.kt index 67d8b2e87..5b14f7d9d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ChatPreviewS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ChatPreviewS2CP.kt @@ -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\")" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CommandsS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CommandsS2CP.kt index 831e4d79e..6ed49357d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CommandsS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CommandsS2CP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CompassPositionS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CompassPositionS2CP.kt index 494082252..f34f8a7e3 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CompassPositionS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CompassPositionS2CP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CompressionS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CompressionS2CP.kt index 8e87fd652..74720a202 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CompressionS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CompressionS2CP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CraftingRecipeS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CraftingRecipeS2CP.kt index 450fd4c5f..8a046f593 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CraftingRecipeS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CraftingRecipeS2CP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/DamageTiltS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/DamageTiltS2CP.kt index 6b08ec7f6..e4c2bd592 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/DamageTiltS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/DamageTiltS2CP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/DifficultyS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/DifficultyS2CP.kt index 5a3e67828..5955ec3b8 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/DifficultyS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/DifficultyS2CP.kt @@ -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})" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ExperienceS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ExperienceS2CP.kt index f35d97b21..1aa6ddee5 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ExperienceS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ExperienceS2CP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ExplosionS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ExplosionS2CP.kt index ce473fbf7..9b7bf3be2 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ExplosionS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ExplosionS2CP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/FeaturesS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/FeaturesS2CP.kt index 565d98fdc..1dd7e7b41 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/FeaturesS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/FeaturesS2CP.kt @@ -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)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/GameEventS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/GameEventS2CP.kt index e562f2bba..5ce03380f 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/GameEventS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/GameEventS2CP.kt @@ -37,6 +37,6 @@ class GameEventS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Game event (event=$event, data=$data)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Game event (event=$event, data=$data)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/HealthS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/HealthS2CP.kt index 1aa4a56ce..58dbef3dc 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/HealthS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/HealthS2CP.kt @@ -55,6 +55,6 @@ class HealthS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Health set (hp=$hp, hunger=$hunger, saturation=$saturation)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Health set (hp=$hp, hunger=$hunger, saturation=$saturation)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/HeartbeatS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/HeartbeatS2CP.kt index 20f2157d2..d9815da16 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/HeartbeatS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/HeartbeatS2CP.kt @@ -40,6 +40,6 @@ class HeartbeatS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Heartbeat (id=$id)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Heartbeat (id=$id)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/HotbarSlotS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/HotbarSlotS2CP.kt index e98799df8..93d956039 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/HotbarSlotS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/HotbarSlotS2CP.kt @@ -34,6 +34,6 @@ class HotbarSlotS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Hotbar slot (slot=$slot)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Hotbar slot (slot=$slot)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/InitializeS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/InitializeS2CP.kt index 00c1a13e2..08721a92f 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/InitializeS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/InitializeS2CP.kt @@ -185,7 +185,7 @@ class InitializeS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Initialize (entityId=$entityId, gamemode=$gamemode, dimension=$dimension, difficulty=$difficulty, hardcore=$isHardcore, viewDistance=$viewDistance)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Initialize (entityId=$entityId, gamemode=$gamemode, dimension=$dimension, difficulty=$difficulty, hardcore=$isHardcore, viewDistance=$viewDistance)" } } companion object : PacketErrorHandler { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ItemCooldownS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ItemCooldownS2CP.kt index 86f4efdba..0773973ce 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ItemCooldownS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ItemCooldownS2CP.kt @@ -32,6 +32,6 @@ class ItemCooldownS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Item cooldown set (item=$item, time=$time)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Item cooldown set (item=$item, time=$time)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/KickS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/KickS2CP.kt index 6e630e4d1..d51db1f35 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/KickS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/KickS2CP.kt @@ -35,10 +35,10 @@ class KickS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { // got kicked connection.network.disconnect() connection.state = PlayConnectionStates.KICKED - Log.log(LogMessageType.NETWORK_STATUS, LogLevels.WARN) { "Kicked from ${connection.address}: $reason" } + Log.log(LogMessageType.NETWORK, LogLevels.WARN) { "Kicked from ${connection.address}: $reason" } } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Kick (reason=$reason)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Kick (reason=$reason)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/MoveVehicleS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/MoveVehicleS2CP.kt index ef8b65811..ff467d564 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/MoveVehicleS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/MoveVehicleS2CP.kt @@ -41,6 +41,6 @@ class MoveVehicleS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Vehicle move (position=$position, yaw=$yaw, pitch=$pitch)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Vehicle move (position=$position, yaw=$yaw, pitch=$pitch)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/NbtResponseS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/NbtResponseS2CP.kt index 69eecf36f..37be77471 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/NbtResponseS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/NbtResponseS2CP.kt @@ -26,6 +26,6 @@ class NbtResponseS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { val nbt: Map = buffer.readNBT().asJsonObject() override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Nbt response (transactionId=$transactionId nbt=$nbt)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Nbt response (transactionId=$transactionId nbt=$nbt)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/OpenHorseContainerS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/OpenHorseContainerS2CP.kt index b3843d341..981f7f989 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/OpenHorseContainerS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/OpenHorseContainerS2CP.kt @@ -30,10 +30,10 @@ class OpenHorseContainerS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { val entity = connection.world.entities[entityId] ?: return // TODO - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.WARN) { "Can not open entity container: $entity" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.WARN) { "Can not open entity container: $entity" } } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Open horse container (containerId=$containerId, slotCount=$slotCount, entityId=$entityId)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Open horse container (containerId=$containerId, slotCount=$slotCount, entityId=$entityId)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ParticleS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ParticleS2CP.kt index aa31a1654..6873a9a26 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ParticleS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ParticleS2CP.kt @@ -64,6 +64,6 @@ class ParticleS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Particle (type=$type, longDistance=$longDistance, position=$position, offset=$offset, speed=$speed, count=$count, data=$data)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Particle (type=$type, longDistance=$longDistance, position=$position, offset=$offset, speed=$speed, count=$count, data=$data)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PingS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PingS2CP.kt index 4ff50fbd2..f7a1ca1ba 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PingS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PingS2CP.kt @@ -34,6 +34,6 @@ class PingS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Ping (payload=$payload)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Ping (payload=$payload)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PlayStatusS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PlayStatusS2CP.kt index 14964ae6c..a862ae245 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PlayStatusS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PlayStatusS2CP.kt @@ -29,6 +29,6 @@ class PlayStatusS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { val forcesSecureChat = if (buffer.versionId >= ProtocolVersions.V_1_19_1_RC2) buffer.readBoolean() else null override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Play status (motd=\"$motd§r\", favicon=$favicon, previewsChat=$previewsChat, forcesSecureChat=$forcesSecureChat)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Play status (motd=\"$motd§r\", favicon=$favicon, previewsChat=$previewsChat, forcesSecureChat=$forcesSecureChat)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PlayerAbilitiesS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PlayerAbilitiesS2CP.kt index 827639584..0a12c04fc 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PlayerAbilitiesS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PlayerAbilitiesS2CP.kt @@ -49,7 +49,7 @@ class PlayerAbilitiesS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Player abilities (invulnerable=$invulnerable, flying=$flying, allowFly=$allowFly, creative=$creative, flyingSpeed=$flyingSpeed, walkingSpeed=$walkingSpeed)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Player abilities (invulnerable=$invulnerable, flying=$flying, allowFly=$allowFly, creative=$creative, flyingSpeed=$flyingSpeed, walkingSpeed=$walkingSpeed)" } } override fun handle(connection: PlayConnection) { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PlayerFaceS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PlayerFaceS2CP.kt index cba8012d5..9c23c5e6f 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PlayerFaceS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PlayerFaceS2CP.kt @@ -40,7 +40,7 @@ class PlayerFaceS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Face player (face=$face, position=$position, entityId=$entityId, entityFace=$entityFace)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Face player (face=$face, position=$position, entityId=$entityId, entityFace=$entityFace)" } } enum class PlayerFaces { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ResourcepackS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ResourcepackS2CP.kt index 8bac75626..f00646511 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ResourcepackS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ResourcepackS2CP.kt @@ -54,6 +54,6 @@ class ResourcepackS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Resourcepack (url=$url, hash=$hash, forced=$forced, promptText=$promptText)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Resourcepack (url=$url, hash=$hash, forced=$forced, promptText=$promptText)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/RespawnS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/RespawnS2CP.kt index 66b4278ca..c4358616f 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/RespawnS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/RespawnS2CP.kt @@ -120,6 +120,6 @@ class RespawnS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Respawn (dimension=$dimension, difficulty=$difficulty, gamemode=$gamemode)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Respawn (dimension=$dimension, difficulty=$difficulty, gamemode=$gamemode)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/SimulationDistanceS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/SimulationDistanceS2CP.kt index c2a0825bf..28e075e83 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/SimulationDistanceS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/SimulationDistanceS2CP.kt @@ -29,6 +29,6 @@ class SimulationDistanceS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Simulation distance (simulationDistance=$simulationDistance)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Simulation distance (simulationDistance=$simulationDistance)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/StatisticsS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/StatisticsS2CP.kt index d98427e7d..b442ddb73 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/StatisticsS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/StatisticsS2CP.kt @@ -52,6 +52,6 @@ class StatisticsS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Statistics (statistics=$statistics)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Statistics (statistics=$statistics)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/TagsS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/TagsS2CP.kt index 9853c1df8..bb48f7f71 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/TagsS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/TagsS2CP.kt @@ -118,6 +118,6 @@ class TagsS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Tags (tags=$tags)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Tags (tags=$tags)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/TemporaryChatPreview.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/TemporaryChatPreview.kt index f0a9ac401..b2dc66964 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/TemporaryChatPreview.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/TemporaryChatPreview.kt @@ -25,6 +25,6 @@ class TemporaryChatPreview(buffer: PlayInByteBuffer) : PlayS2CPacket { override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Temporary chat preview (enabled=$enabled)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Temporary chat preview (enabled=$enabled)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/TimeS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/TimeS2CP.kt index b0a689fa6..68c743f14 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/TimeS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/TimeS2CP.kt @@ -36,6 +36,6 @@ class TimeS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "World time set (time=$time, age=$age)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "World time set (time=$time, age=$age)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/VibrationS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/VibrationS2CP.kt index f78bbf196..0f1674e38 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/VibrationS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/VibrationS2CP.kt @@ -28,7 +28,7 @@ class VibrationS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { override fun log(reducedLog: Boolean) { Log.log( - LogMessageType.NETWORK_PACKETS_IN, + LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE ) { "Vibration signal (sourcePosition=$sourcePosition, target=$target, arrival=$arrival)" } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/VillagerTradesS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/VillagerTradesS2CP.kt index 532da2ccb..7a4da3265 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/VillagerTradesS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/VillagerTradesS2CP.kt @@ -54,6 +54,6 @@ class VillagerTradesS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Villager trades (containerId=$containerId, trades=$trades, level=$level, experience=$experience, regularVillager=$regularVillager, canRestock=$canRestock)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Villager trades (containerId=$containerId, trades=$trades, level=$level, experience=$experience, regularVillager=$regularVillager, canRestock=$canRestock)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/WorldEventS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/WorldEventS2CP.kt index 03e5c5407..ed2ba11c8 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/WorldEventS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/WorldEventS2CP.kt @@ -41,6 +41,6 @@ class WorldEventS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "World event packet (position=$position, event=${event ?: eventId}, data=$data, isGlobal=$isGlobal)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "World event packet (position=$position, event=${event ?: eventId}, data=$data, isGlobal=$isGlobal)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/advancement/AdvancementTabS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/advancement/AdvancementTabS2CP.kt index 1bf8aa63e..207542166 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/advancement/AdvancementTabS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/advancement/AdvancementTabS2CP.kt @@ -26,6 +26,6 @@ class AdvancementTabS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Advancement tab (tab=$tab)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Advancement tab (tab=$tab)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/advancement/AdvancementsS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/advancement/AdvancementsS2CP.kt index de5b013ce..c56d813f1 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/advancement/AdvancementsS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/advancement/AdvancementsS2CP.kt @@ -43,9 +43,9 @@ class AdvancementsS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { override fun log(reducedLog: Boolean) { if (reducedLog) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Advancements (reset=$reset, advancements=${advancements.size}, progress=${progress.size})" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Advancements (reset=$reset, advancements=${advancements.size}, progress=${progress.size})" } } else { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Advancements (reset=$reset, advancements=$advancements, progress=$progress)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Advancements (reset=$reset, advancements=$advancements, progress=$progress)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockActionS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockActionS2CP.kt index 1a68e50b5..8f75b2f6a 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockActionS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockActionS2CP.kt @@ -39,13 +39,13 @@ class BlockActionS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { val blockEntity = connection.world.getOrPutBlockEntity(position) ?: return if (blockEntity !is BlockActionEntity) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.WARN) { "Block entity $blockEntity can not accept block entity actions!" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.WARN) { "Block entity $blockEntity can not accept block entity actions!" } return } blockEntity.setBlockActionData(data1, data2) } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Block action (position=$position, data1=$data1, data2=$data2, block=$block)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Block action (position=$position, data1=$data1, data2=$data2, block=$block)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockBreakAnimationS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockBreakAnimationS2CP.kt index d868a6991..4915a2041 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockBreakAnimationS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockBreakAnimationS2CP.kt @@ -51,6 +51,6 @@ class BlockBreakAnimationS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Block break animation (entityId=$entityId, blockPosition=$blockPosition, stage=$stage)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Block break animation (entityId=$entityId, blockPosition=$blockPosition, stage=$stage)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockBreakS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockBreakS2CP.kt index 6f0283b65..5e4b1faf0 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockBreakS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockBreakS2CP.kt @@ -24,6 +24,6 @@ class BlockBreakS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { val sequence = buffer.readVarInt() override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Block break (sequence=$sequence)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Block break (sequence=$sequence)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockDataS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockDataS2CP.kt index 40d2cc231..2204258c6 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockDataS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockDataS2CP.kt @@ -52,6 +52,6 @@ class BlockDataS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Block data (position=$position, type=$type, nbt=$nbt)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Block data (position=$position, type=$type, nbt=$nbt)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockS2CP.kt index f2c49f176..6acabf79d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockS2CP.kt @@ -48,6 +48,6 @@ class BlockS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Block set (position=$position, state=$state)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Block set (position=$position, state=$state)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlocksS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlocksS2CP.kt index 02491c229..5c3c4af35 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlocksS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlocksS2CP.kt @@ -100,6 +100,6 @@ class BlocksS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Blocks (chunkPosition=${chunkPosition}, size=${update.size})" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Blocks (chunkPosition=${chunkPosition}, size=${update.size})" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/LegacyBlockBreakS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/LegacyBlockBreakS2CP.kt index 024df9e40..d252125a0 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/LegacyBlockBreakS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/LegacyBlockBreakS2CP.kt @@ -44,6 +44,6 @@ class LegacyBlockBreakS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Block break (position=$position, state=$state, action=$action, successful=$successful)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Block break (position=$position, state=$state, action=$action, successful=$successful)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/CenterWorldBorderS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/CenterWorldBorderS2CP.kt index 90028caa1..446a7f885 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/CenterWorldBorderS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/CenterWorldBorderS2CP.kt @@ -29,6 +29,6 @@ class CenterWorldBorderS2CP(buffer: PlayInByteBuffer) : WorldBorderS2CP { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Center set world border (center=$center)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Center set world border (center=$center)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/InitializeWorldBorderS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/InitializeWorldBorderS2CP.kt index 08b50af3d..d5dc7d5e3 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/InitializeWorldBorderS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/InitializeWorldBorderS2CP.kt @@ -39,6 +39,6 @@ class InitializeWorldBorderS2CP(buffer: PlayInByteBuffer) : WorldBorderS2CP { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Initialize world border (center=$center, oldRadius=$oldRadius, newRadius=$newRadius, speed=$millis, portalBound=$portalBound, warningTime=$warningTime, warningBlocks=$warningBlocks)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Initialize world border (center=$center, oldRadius=$oldRadius, newRadius=$newRadius, speed=$millis, portalBound=$portalBound, warningTime=$warningTime, warningBlocks=$warningBlocks)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/InterpolateWorldBorderS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/InterpolateWorldBorderS2CP.kt index 409a828a6..4fae6aa21 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/InterpolateWorldBorderS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/InterpolateWorldBorderS2CP.kt @@ -31,6 +31,6 @@ class InterpolateWorldBorderS2CP(buffer: PlayInByteBuffer) : WorldBorderS2CP { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Interpolate size world border (oldRadius=$oldRadius, newRadius=$newRadius, millis=$millis)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Interpolate size world border (oldRadius=$oldRadius, newRadius=$newRadius, millis=$millis)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/SizeWorldBorderS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/SizeWorldBorderS2CP.kt index c42872c75..97f27c065 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/SizeWorldBorderS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/SizeWorldBorderS2CP.kt @@ -30,6 +30,6 @@ class SizeWorldBorderS2CP(buffer: PlayInByteBuffer) : WorldBorderS2CP { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Size set world border (radius=$radius)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Size set world border (radius=$radius)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/WarnBlocksWorldBorderS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/WarnBlocksWorldBorderS2CP.kt index b67dc5b8c..57805d275 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/WarnBlocksWorldBorderS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/WarnBlocksWorldBorderS2CP.kt @@ -29,6 +29,6 @@ class WarnBlocksWorldBorderS2CP(buffer: PlayInByteBuffer) : WorldBorderS2CP { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Warning blocks set world border (warningBlocks=$warningBlocks)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Warning blocks set world border (warningBlocks=$warningBlocks)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/WarnTimeWorldBorderS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/WarnTimeWorldBorderS2CP.kt index 29a74bbcc..0dd82640d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/WarnTimeWorldBorderS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/border/WarnTimeWorldBorderS2CP.kt @@ -30,6 +30,6 @@ class WarnTimeWorldBorderS2CP(buffer: PlayInByteBuffer) : WorldBorderS2CP { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Warning time set world border (warningTime=$warningTime)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Warning time set world border (warningTime=$warningTime)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/AddBossbarS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/AddBossbarS2CP.kt index ee6a877ab..5bd301d3e 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/AddBossbarS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/AddBossbarS2CP.kt @@ -56,6 +56,6 @@ class AddBossbarS2CP( } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Bossbar add (uuid=$uuid, title=\"$title\", health=$value, color=$color, notches=$notches, flags=$flags)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Bossbar add (uuid=$uuid, title=\"$title\", health=$value, color=$color, notches=$notches, flags=$flags)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/FlagsBossbarS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/FlagsBossbarS2CP.kt index 3f4f5b7b3..fe226577a 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/FlagsBossbarS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/FlagsBossbarS2CP.kt @@ -37,6 +37,6 @@ class FlagsBossbarS2CP( } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Bossbar flags set (uuid=$uuid, flags=$flags)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Bossbar flags set (uuid=$uuid, flags=$flags)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/RemoveBossbarS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/RemoveBossbarS2CP.kt index 298fe4adf..9906ff795 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/RemoveBossbarS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/RemoveBossbarS2CP.kt @@ -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. * @@ -26,10 +26,10 @@ class RemoveBossbarS2CP( override fun handle(connection: PlayConnection) { val bossbar = connection.bossbarManager.bossbars.remove(uuid) ?: return - connection.fire(BossbarRemoveEvent(connection, uuid, bossbar)) + connection.events.fire(BossbarRemoveEvent(connection, uuid, bossbar)) } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Bossbar remove (uuid=$uuid)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Bossbar remove (uuid=$uuid)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/StyleBossbarS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/StyleBossbarS2CP.kt index 1f1508680..95f3cc138 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/StyleBossbarS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/StyleBossbarS2CP.kt @@ -51,6 +51,6 @@ class StyleBossbarS2CP( } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Bossbar style set (uuid=$uuid, color=$color, notches=$notches)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Bossbar style set (uuid=$uuid, color=$color, notches=$notches)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/TitleBossbarS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/TitleBossbarS2CP.kt index a4ac67dbc..28937df82 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/TitleBossbarS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/TitleBossbarS2CP.kt @@ -43,6 +43,6 @@ class TitleBossbarS2CP( // servers have sometimes "animated" bossbars return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Bossbar name set (uuid=$uuid, title=\"$title\")" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Bossbar name set (uuid=$uuid, title=\"$title\")" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/ValueBossbarS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/ValueBossbarS2CP.kt index bb9240e62..f806de0f7 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/ValueBossbarS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/bossbar/ValueBossbarS2CP.kt @@ -43,6 +43,6 @@ class ValueBossbarS2CP( } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Bossbar value set (uuid=$uuid, value=$value)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Bossbar value set (uuid=$uuid, value=$value)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/ChatMessageS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/ChatMessageS2CP.kt index d0ab6722e..d8e0f7fb4 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/ChatMessageS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/ChatMessageS2CP.kt @@ -68,6 +68,6 @@ class ChatMessageS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Chat message (test=\"$text\", sender=$sender, overlay=$overlay)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Chat message (test=\"$text\", sender=$sender, overlay=$overlay)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/ChatSuggestionsS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/ChatSuggestionsS2CP.kt index 41c209d5f..5fb01700c 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/ChatSuggestionsS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/ChatSuggestionsS2CP.kt @@ -27,7 +27,7 @@ class ChatSuggestionsS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { val matches = buffer.readArray { buffer.readString() } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Chat suggestions (action=$action, matches=$matches)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Chat suggestions (action=$action, matches=$matches)" } } enum class Actions { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/CommandSuggestionsS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/CommandSuggestionsS2CP.kt index 4d25ca447..ef5ec8a59 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/CommandSuggestionsS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/CommandSuggestionsS2CP.kt @@ -34,6 +34,6 @@ class CommandSuggestionsS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Command suggestions (matches=$matches)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Command suggestions (matches=$matches)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/HideMessageS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/HideMessageS2CP.kt index 334dd81fd..732a0c10d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/HideMessageS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/HideMessageS2CP.kt @@ -26,6 +26,6 @@ class HideMessageS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { val signature = if (buffer.versionId < ProtocolVersions.V_22W42A || id >= 0) buffer.readSignatureData() else null override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Hide message (id=$id, signature=$signature)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Hide message (id=$id, signature=$signature)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/MessageHeaderS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/MessageHeaderS2CP.kt index e5a163b68..691a064d1 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/MessageHeaderS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/MessageHeaderS2CP.kt @@ -26,6 +26,6 @@ class MessageHeaderS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { val bodyDigest = buffer.readByteArray() override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Message header (header=$header, signature=$signature, bodyDigest=$bodyDigest)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Message header (header=$header, signature=$signature, bodyDigest=$bodyDigest)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/SignedChatMessageS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/SignedChatMessageS2CP.kt index 656977ac4..d0eb24e3d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/SignedChatMessageS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/SignedChatMessageS2CP.kt @@ -148,6 +148,6 @@ class SignedChatMessageS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Chat message (message=$message)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Chat message (message=$message)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/UnsignedChatMessageS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/UnsignedChatMessageS2CP.kt index c4f2a32fe..38b0bf373 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/UnsignedChatMessageS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/UnsignedChatMessageS2CP.kt @@ -39,6 +39,6 @@ class UnsignedChatMessageS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Chat message (text=$text, parameters=$parameters)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Chat message (text=$text, parameters=$parameters)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkBiomeS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkBiomeS2CP.kt index ac101a126..14503251a 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkBiomeS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkBiomeS2CP.kt @@ -38,6 +38,6 @@ class ChunkBiomeS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { // TODO: handle override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Chunk biome (data=$data)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Chunk biome (data=$data)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkCenterS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkCenterS2CP.kt index c0e4edc19..622ac0016 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkCenterS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkCenterS2CP.kt @@ -25,6 +25,6 @@ class ChunkCenterS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { private val position = ChunkPosition(buffer.readVarInt(), buffer.readVarInt()) override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Chunk center (position=$position)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Chunk center (position=$position)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkLightS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkLightS2CP.kt index a72899f4a..b77307892 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkLightS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkLightS2CP.kt @@ -55,7 +55,7 @@ class ChunkLightS2CP @JvmOverloads constructor( if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Chunk light (position=$position)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Chunk light (position=$position)" } } override fun handle(connection: PlayConnection) { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkS2CP.kt index 17e54a2bc..e7b07297f 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkS2CP.kt @@ -199,7 +199,7 @@ class ChunkS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Chunk (position=$position)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Chunk (position=$position)" } } private data class ChunkReadingData( diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunksS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunksS2CP.kt index cc112bdf2..a98adbaac 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunksS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunksS2CP.kt @@ -81,6 +81,6 @@ class ChunksS2CP : PlayS2CPacket { if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Chunks (positions=${chunks.keys})" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Chunks (positions=${chunks.keys})" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/UnloadChunkS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/UnloadChunkS2CP.kt index ab389a537..4a39aec81 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/UnloadChunkS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/UnloadChunkS2CP.kt @@ -33,6 +33,6 @@ class UnloadChunkS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Unload chunk (position=$position)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Unload chunk (position=$position)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ViewDistanceS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ViewDistanceS2CP.kt index d9a5f881c..9058bf6b5 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ViewDistanceS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ViewDistanceS2CP.kt @@ -29,6 +29,6 @@ class ViewDistanceS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "View distance (viewDistance=$viewDistance)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "View distance (viewDistance=$viewDistance)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/combat/EndCombatEventS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/combat/EndCombatEventS2CP.kt index 8fec6d73f..b8ded1dd1 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/combat/EndCombatEventS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/combat/EndCombatEventS2CP.kt @@ -26,6 +26,6 @@ class EndCombatEventS2CP(buffer: PlayInByteBuffer) : CombatEventS2CP { val entityId = if (buffer.versionId >= V_1_20_PRE3) -1 else buffer.readInt() override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Combat end event (entityId=$entityId, duration=$duration)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Combat end event (entityId=$entityId, duration=$duration)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/combat/EnterCombatEventS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/combat/EnterCombatEventS2CP.kt index fdbcbb276..526eccb54 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/combat/EnterCombatEventS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/combat/EnterCombatEventS2CP.kt @@ -23,6 +23,6 @@ import de.bixilon.minosoft.util.logging.LogMessageType class EnterCombatEventS2CP(buffer: PlayInByteBuffer) : CombatEventS2CP { override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Combat event enter" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Combat event enter" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/combat/KillCombatEventS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/combat/KillCombatEventS2CP.kt index 65f6a197c..cea0c697a 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/combat/KillCombatEventS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/combat/KillCombatEventS2CP.kt @@ -27,6 +27,6 @@ class KillCombatEventS2CP(buffer: PlayInByteBuffer) : CombatEventS2CP { val message = buffer.readChatComponent() override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Combat event kill (deadEntityId=$deadEntityId, killerEntityId=$killerEntityId, message=$message )" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Combat event kill (deadEntityId=$deadEntityId, killerEntityId=$killerEntityId, message=$message )" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/CloseContainerS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/CloseContainerS2CP.kt index 1a0996a64..f21f7d063 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/CloseContainerS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/CloseContainerS2CP.kt @@ -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. * @@ -36,6 +36,6 @@ class CloseContainerS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Container close (containerId=$containerId)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Container close (containerId=$containerId)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/ContainerActionS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/ContainerActionS2CP.kt index a51f274e3..543e8e265 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/ContainerActionS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/ContainerActionS2CP.kt @@ -36,6 +36,6 @@ class ContainerActionS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Container action status (containerId=$containerId, actionId=$actionId, accepted=$accepted)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Container action status (containerId=$containerId, actionId=$actionId, accepted=$accepted)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/ContainerItemS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/ContainerItemS2CP.kt index 95f0f94ca..efef5c104 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/ContainerItemS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/ContainerItemS2CP.kt @@ -57,6 +57,6 @@ class ContainerItemS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Container item (containerId=$containerId, revision=$revision, slot=$slot, stack=$stack)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Container item (containerId=$containerId, revision=$revision, slot=$slot, stack=$stack)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/ContainerItemsS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/ContainerItemsS2CP.kt index ace9255b0..4e61e08b9 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/ContainerItemsS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/ContainerItemsS2CP.kt @@ -86,6 +86,6 @@ class ContainerItemsS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Container items (containerId=$containerId, items=${items.contentToString()}, floating=$floatingItem)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Container items (containerId=$containerId, items=${items.contentToString()}, floating=$floatingItem)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/ContainerPropertiesS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/ContainerPropertiesS2CP.kt index 990068860..3721b8e82 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/ContainerPropertiesS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/ContainerPropertiesS2CP.kt @@ -33,6 +33,6 @@ class ContainerPropertiesS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Container properties (containerId=$containerId, property=$property, value=$value)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Container properties (containerId=$containerId, property=$property, value=$value)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/OpenContainerS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/OpenContainerS2CP.kt index 1a1fcce38..861d0b0f1 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/OpenContainerS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/OpenContainerS2CP.kt @@ -86,6 +86,6 @@ class OpenContainerS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Open container (containerId=$containerId, containerType=$containerType, title=\"$title\", slotCount=$slotCount, hasTitle=$hasTitle, entityId=$entityId)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Open container (containerId=$containerId, containerType=$containerType, title=\"$title\", slotCount=$slotCount, hasTitle=$hasTitle, entityId=$entityId)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityAnimationS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityAnimationS2CP.kt index de203521d..f150a02dd 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityAnimationS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityAnimationS2CP.kt @@ -28,7 +28,7 @@ class EntityAnimationS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Entity animation (entityId=$entityId, animation=$animation)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Entity animation (entityId=$entityId, animation=$animation)" } } override fun handle(connection: PlayConnection) { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityAttributesS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityAttributesS2CP.kt index 86ed183be..1e83d26e5 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityAttributesS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityAttributesS2CP.kt @@ -68,6 +68,6 @@ class EntityAttributesS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Entity effect attributes (entityId=$entityId, attributes=$attributes)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Entity effect attributes (entityId=$entityId, attributes=$attributes)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityCollectS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityCollectS2CP.kt index 62920905b..4b6c46de9 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityCollectS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityCollectS2CP.kt @@ -45,6 +45,6 @@ class EntityCollectS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Entity collect animation (itemEntityId=$itemEntityId, collectorEntityId=$collectorEntityId, count=$collectorEntityId)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Entity collect animation (itemEntityId=$itemEntityId, collectorEntityId=$collectorEntityId, count=$collectorEntityId)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityDamageS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityDamageS2CP.kt index cf67e54f5..b3dd61cf5 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityDamageS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityDamageS2CP.kt @@ -30,6 +30,6 @@ class EntityDamageS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Entity damage (entityId=$entityId, type=$type, source=$source, direct=$direct, position=$position)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Entity damage (entityId=$entityId, type=$type, source=$source, direct=$direct, position=$position)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityDataS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityDataS2CP.kt index efd08b3d8..9e1641947 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityDataS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityDataS2CP.kt @@ -37,6 +37,6 @@ class EntityDataS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Entity data (entityId=$entityId, data=$data)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Entity data (entityId=$entityId, data=$data)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityEquipmentS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityEquipmentS2CP.kt index bc24b7d61..5c64ee27a 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityEquipmentS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityEquipmentS2CP.kt @@ -66,6 +66,6 @@ class EntityEquipmentS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Entity equipment (entityId=$entityId, equipment=$equipment)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Entity equipment (entityId=$entityId, equipment=$equipment)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityPlayerS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityPlayerS2CP.kt index c4414bc1c..792a28e0e 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityPlayerS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityPlayerS2CP.kt @@ -79,6 +79,6 @@ class EntityPlayerS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Player entity spawn (entityId=$entityId, name=${entity.additional.name}, uuid=$entityUUID)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Player entity spawn (entityId=$entityId, name=${entity.additional.name}, uuid=$entityUUID)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntitySleepS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntitySleepS2CP.kt index 328e102ed..a09a763ca 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntitySleepS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntitySleepS2CP.kt @@ -31,6 +31,6 @@ class EntitySleepS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Entity sleep (entityId=$entityId, blocKPosition=$blockPosition)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Entity sleep (entityId=$entityId, blocKPosition=$blockPosition)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityStatusS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityStatusS2CP.kt index e198b3ca4..d69584e7f 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityStatusS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityStatusS2CP.kt @@ -34,13 +34,13 @@ class EntityStatusS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { val entity = connection.world.entities[entityId] ?: return val event = EntityEvents.get(connection.version, entity, eventId) if (event == null) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Unknown entity event (entity=${entity.type.identifier}, id=$eventId)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Unknown entity event (entity=${entity.type.identifier}, id=$eventId)" } return } event.unsafeCast>().handle(entity) } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Entity status (entityId=$entityId, event=$eventId)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Entity status (entityId=$entityId, event=$eventId)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/effect/EntityEffectS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/effect/EntityEffectS2CP.kt index 0ce44d316..e5b04044c 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/effect/EntityEffectS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/effect/EntityEffectS2CP.kt @@ -88,6 +88,6 @@ class EntityEffectS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Entity effect (entityId=$entityId, effect=$effect, isAmbient=$isAmbient, hideParticles=$hideParticles, showIcon=$showIcon)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Entity effect (entityId=$entityId, effect=$effect, isAmbient=$isAmbient, hideParticles=$hideParticles, showIcon=$showIcon)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/effect/EntityRemoveEffectS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/effect/EntityRemoveEffectS2CP.kt index 342d03753..f4916869a 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/effect/EntityRemoveEffectS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/effect/EntityRemoveEffectS2CP.kt @@ -35,6 +35,6 @@ class EntityRemoveEffectS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Entity effect remove (entityId=$entityId, effect=$effect)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Entity effect remove (entityId=$entityId, effect=$effect)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/EmptyMoveS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/EmptyMoveS2CP.kt index 1a49dbd6a..a08cbba53 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/EmptyMoveS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/EmptyMoveS2CP.kt @@ -24,6 +24,6 @@ class EmptyMoveS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { val entityId: Int = buffer.readEntityId() override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Entity empty move (entityId=$entityId)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Entity empty move (entityId=$entityId)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/HeadRotationS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/HeadRotationS2CP.kt index 8e35909e7..8a4955e6f 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/HeadRotationS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/HeadRotationS2CP.kt @@ -34,6 +34,6 @@ class HeadRotationS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Entity head rotation (entityId=$entityId, headYaw=$headYaw)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Entity head rotation (entityId=$entityId, headYaw=$headYaw)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/MovementRotationS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/MovementRotationS2CP.kt index 389a7be32..d2d73292d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/MovementRotationS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/MovementRotationS2CP.kt @@ -46,6 +46,6 @@ class MovementRotationS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Entity movement + rotate (entityId=$entityId, delta=$delta, rotation=$rotation, onGround=$onGround)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Entity movement + rotate (entityId=$entityId, delta=$delta, rotation=$rotation, onGround=$onGround)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/PositionRotationS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/PositionRotationS2CP.kt index 681f2b556..8c17ea4d1 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/PositionRotationS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/PositionRotationS2CP.kt @@ -98,6 +98,6 @@ class PositionRotationS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Position + rotation (position=$position, rotation=$rotation, onGround=$onGround, flags=$flags, teleportId=$teleportId, dismountVehicle=$dismountVehicle)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Position + rotation (position=$position, rotation=$rotation, onGround=$onGround, flags=$flags, teleportId=$teleportId, dismountVehicle=$dismountVehicle)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/RelativeMoveS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/RelativeMoveS2CP.kt index ee3f4fa59..e84d42aba 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/RelativeMoveS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/RelativeMoveS2CP.kt @@ -44,6 +44,6 @@ class RelativeMoveS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Entity relative move (entityId=$entityId, delta=$delta, onGround=$onGround)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Entity relative move (entityId=$entityId, delta=$delta, onGround=$onGround)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/RotationS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/RotationS2CP.kt index fadfcbf4c..20acd77ca 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/RotationS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/RotationS2CP.kt @@ -40,6 +40,6 @@ class RotationS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Entity rotation (entityId=$entityId, rotation=$rotation, onGround=$onGround)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Entity rotation (entityId=$entityId, rotation=$rotation, onGround=$onGround)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/TeleportS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/TeleportS2CP.kt index 79c943fce..ec174b4e6 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/TeleportS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/TeleportS2CP.kt @@ -51,6 +51,6 @@ class TeleportS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Entity teleport (entityId=$entityId, position=$position, rotation=$rotation, onGround=$onGround)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Entity teleport (entityId=$entityId, position=$position, rotation=$rotation, onGround=$onGround)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/VelocityS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/VelocityS2CP.kt index c15414986..e6bb4d620 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/VelocityS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/move/VelocityS2CP.kt @@ -35,6 +35,6 @@ class VelocityS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Entity velocity (entityId=$entityId, velocity=$velocity)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Entity velocity (entityId=$entityId, velocity=$velocity)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/passenger/EntityAttachS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/passenger/EntityAttachS2CP.kt index e10a45e10..299f87ee6 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/passenger/EntityAttachS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/passenger/EntityAttachS2CP.kt @@ -38,6 +38,6 @@ class EntityAttachS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Entity attach (entityId=$entityId, vehicle=$vehicle, leash=$leash)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Entity attach (entityId=$entityId, vehicle=$vehicle, leash=$leash)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/passenger/EntityPassengerS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/passenger/EntityPassengerS2CP.kt index 2ddf3f41b..388d79c39 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/passenger/EntityPassengerS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/passenger/EntityPassengerS2CP.kt @@ -41,6 +41,6 @@ class EntityPassengerS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Entity passenger (vehicle=$vehicle, passengers=$passengers)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Entity passenger (vehicle=$vehicle, passengers=$passengers)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityDestroyS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityDestroyS2CP.kt index e77d26271..2532e0ef2 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityDestroyS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityDestroyS2CP.kt @@ -54,6 +54,6 @@ class EntityDestroyS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Entity destroy (entityIds=$entityIds)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Entity destroy (entityIds=$entityIds)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityExperienceOrbS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityExperienceOrbS2CP.kt index 10d2fe61c..7ba1cb0d2 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityExperienceOrbS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityExperienceOrbS2CP.kt @@ -19,7 +19,6 @@ import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection import de.bixilon.minosoft.protocol.packets.factory.LoadPacket import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer -import de.bixilon.minosoft.protocol.protocol.ProtocolVersions import de.bixilon.minosoft.util.KUtil.startInit import de.bixilon.minosoft.util.logging.Log import de.bixilon.minosoft.util.logging.LogLevels @@ -47,6 +46,6 @@ class EntityExperienceOrbS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Experience orb spawn (entityId=$entityId, entity=$entity)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Experience orb spawn (entityId=$entityId, entity=$entity)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityMobSpawnS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityMobSpawnS2CP.kt index 122c4ddeb..32595c64b 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityMobSpawnS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityMobSpawnS2CP.kt @@ -72,6 +72,6 @@ class EntityMobSpawnS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Mob spawn (entityId=$entityId, entityUUID=$entityUUID, entity=$entity)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Mob spawn (entityId=$entityId, entityUUID=$entityUUID, entity=$entity)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityObjectSpawnS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityObjectSpawnS2CP.kt index 8748424b8..bb6757cbf 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityObjectSpawnS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityObjectSpawnS2CP.kt @@ -73,6 +73,6 @@ class EntityObjectSpawnS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Entity object spawn (entityId=$entityId, entityUUID=$entityUUID, entity=$entity, velocity=$velocity)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Entity object spawn (entityId=$entityId, entityUUID=$entityUUID, entity=$entity, velocity=$velocity)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityPaintingS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityPaintingS2CP.kt index f565515bf..a3ee9d0fb 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityPaintingS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityPaintingS2CP.kt @@ -66,6 +66,6 @@ class EntityPaintingS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Entity painting (entityId=$entityId, motif=${entity.motif}, direction=${entity.direction})" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Entity painting (entityId=$entityId, motif=${entity.motif}, direction=${entity.direction})" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/GlobalEntitySpawnS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/GlobalEntitySpawnS2CP.kt index d9262064a..784812e0e 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/GlobalEntitySpawnS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/GlobalEntitySpawnS2CP.kt @@ -19,9 +19,8 @@ import de.bixilon.minosoft.modding.event.events.EntitySpawnEvent import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection import de.bixilon.minosoft.protocol.packets.factory.LoadPacket import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket -import de.bixilon.minosoft.protocol.protocol.ProtocolVersions -import de.bixilon.minosoft.util.KUtil.startInit import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer +import de.bixilon.minosoft.util.KUtil.startInit import de.bixilon.minosoft.util.logging.Log import de.bixilon.minosoft.util.logging.LogLevels import de.bixilon.minosoft.util.logging.LogMessageType @@ -46,6 +45,6 @@ class GlobalEntitySpawnS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Global entity spawn (entityId=$entity, type=$type, entity=$entity)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Global entity spawn (entityId=$entity, type=$type, entity=$entity)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/MapS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/MapS2CP.kt index a92f3c2ec..64c5ed64e 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/MapS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/MapS2CP.kt @@ -87,6 +87,6 @@ class MapS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Map (id=$id, scale=$scale, trackPosition=$trackPosition, pins=$pins)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Map (id=$id, scale=$scale, trackPosition=$trackPosition, pins=$pins)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/legacy/DataLegacyMapS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/legacy/DataLegacyMapS2CP.kt index ce39c9600..ee290233c 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/legacy/DataLegacyMapS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/legacy/DataLegacyMapS2CP.kt @@ -30,6 +30,6 @@ class DataLegacyMapS2CP( if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Data legacy map (start=$start, colors=$colors)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Data legacy map (start=$start, colors=$colors)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/legacy/PinsLegacyMapS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/legacy/PinsLegacyMapS2CP.kt index 513e53c90..dbf640d91 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/legacy/PinsLegacyMapS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/legacy/PinsLegacyMapS2CP.kt @@ -47,6 +47,6 @@ class PinsLegacyMapS2CP( if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Pins legacy map (pins=$pins)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Pins legacy map (pins=$pins)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/legacy/ScaleLegacyMapS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/legacy/ScaleLegacyMapS2CP.kt index 17adb4f59..0b937dead 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/legacy/ScaleLegacyMapS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/map/legacy/ScaleLegacyMapS2CP.kt @@ -28,6 +28,6 @@ class ScaleLegacyMapS2CP( if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Scale legacy map (scale=$scale)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Scale legacy map (scale=$scale)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/recipes/RecipesS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/recipes/RecipesS2CP.kt index a1a48a02d..14d595b38 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/recipes/RecipesS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/recipes/RecipesS2CP.kt @@ -54,9 +54,9 @@ class RecipesS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { override fun log(reducedLog: Boolean) { if (reducedLog) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Recipes (count=${recipes.size})" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Recipes (count=${recipes.size})" } } else { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Recipes (recipes=$recipes)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Recipes (recipes=$recipes)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/recipes/UnlockRecipesS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/recipes/UnlockRecipesS2CP.kt index 56099aa7e..c9ff72dbb 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/recipes/UnlockRecipesS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/recipes/UnlockRecipesS2CP.kt @@ -64,7 +64,7 @@ class UnlockRecipesS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Recipes (action=$action, crafting=$crafting, smelting=$smelting, blasting=$blasting, smoking=$smoking, listed=$listed, tagged=$tagged)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Recipes (action=$action, crafting=$crafting, smelting=$smelting, blasting=$blasting, smoking=$smoking, listed=$listed, tagged=$tagged)" } } enum class Actions { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/ObjectivePositionS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/ObjectivePositionS2CP.kt index 7aa737e5a..b0a1d5a89 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/ObjectivePositionS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/ObjectivePositionS2CP.kt @@ -41,6 +41,6 @@ class ObjectivePositionS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Objective position (position=$position, objective=$name)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Objective position (position=$position, objective=$name)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/objective/CreateObjectiveS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/objective/CreateObjectiveS2CP.kt index 80aa0501f..49c51aad9 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/objective/CreateObjectiveS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/objective/CreateObjectiveS2CP.kt @@ -54,7 +54,7 @@ class CreateObjectiveS2CP( } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Create scoreboard objective (name=$name, displayName=$displayName, unit=$unit)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Create scoreboard objective (name=$name, displayName=$displayName, unit=$unit)" } } override fun handle(connection: PlayConnection) { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/objective/RemoveObjectiveS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/objective/RemoveObjectiveS2CP.kt index c5c26ede9..7a8d02ce5 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/objective/RemoveObjectiveS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/objective/RemoveObjectiveS2CP.kt @@ -27,7 +27,7 @@ class RemoveObjectiveS2CP( ) : ObjectiveS2CP { override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Remove scoreboard objective (objective=$objective)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Remove scoreboard objective (objective=$objective)" } } override fun handle(connection: PlayConnection) { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/objective/UpdateObjectiveS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/objective/UpdateObjectiveS2CP.kt index eaa526cd7..86a4c1630 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/objective/UpdateObjectiveS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/objective/UpdateObjectiveS2CP.kt @@ -54,7 +54,7 @@ class UpdateObjectiveS2CP( if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Update scoreboard objective (objective=$objective, displayName=$displayName, unit=$unit)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Update scoreboard objective (objective=$objective, displayName=$displayName, unit=$unit)" } } override fun handle(connection: PlayConnection) { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/score/PutScoreboardScoreS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/score/PutScoreboardScoreS2CP.kt index 3569b4926..a6db1d756 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/score/PutScoreboardScoreS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/score/PutScoreboardScoreS2CP.kt @@ -44,6 +44,6 @@ class PutScoreboardScoreS2CP( override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Put scoreboard score (entity=$entity§r, objective=$objective§r, value=$value)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Put scoreboard score (entity=$entity§r, objective=$objective§r, value=$value)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/score/RemoveScoreboardScoreS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/score/RemoveScoreboardScoreS2CP.kt index 39a517785..d03810e98 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/score/RemoveScoreboardScoreS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/score/RemoveScoreboardScoreS2CP.kt @@ -43,6 +43,6 @@ class RemoveScoreboardScoreS2CP( override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Remove scoreboard score (entity=$entity§r, objective=$objective§r)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Remove scoreboard score (entity=$entity§r, objective=$objective§r)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/AddTeamMemberS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/AddTeamMemberS2CP.kt index 6c60e6729..8954aed1e 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/AddTeamMemberS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/AddTeamMemberS2CP.kt @@ -50,6 +50,6 @@ class AddTeamMemberS2CP( if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Team member add (name=$name, members=$members)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Team member add (name=$name, members=$members)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/CreateTeamS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/CreateTeamS2CP.kt index 59d3838bd..f19b4485c 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/CreateTeamS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/CreateTeamS2CP.kt @@ -133,6 +133,6 @@ class CreateTeamS2CP( if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Team create (name=$name, prefix=$prefix, suffix=$suffix, friendlyFire=$friendlyFire, canSeeInvisibleTeam=$canSeeInvisibleTeam, collisionRule=$collisionRule, nameTagVisibility=$nameTagVisibility, color=${color}§r, members=$members)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Team create (name=$name, prefix=$prefix, suffix=$suffix, friendlyFire=$friendlyFire, canSeeInvisibleTeam=$canSeeInvisibleTeam, collisionRule=$collisionRule, nameTagVisibility=$nameTagVisibility, color=${color}§r, members=$members)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/RemoveTeamMemberS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/RemoveTeamMemberS2CP.kt index 575318fe4..d1f785f99 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/RemoveTeamMemberS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/RemoveTeamMemberS2CP.kt @@ -51,6 +51,6 @@ class RemoveTeamMemberS2CP( } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Team member remove (name=$name, members=$members)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Team member remove (name=$name, members=$members)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/RemoveTeamS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/RemoveTeamS2CP.kt index c45085721..9c1c86127 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/RemoveTeamS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/RemoveTeamS2CP.kt @@ -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. * @@ -26,10 +26,10 @@ class RemoveTeamS2CP(val name: String) : TeamsS2CP { connection.scoreboardManager.updateScoreTeams(team, team.members, true) - connection.fire(ScoreboardTeamRemoveEvent(connection, team)) + connection.events.fire(ScoreboardTeamRemoveEvent(connection, team)) } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Team remove (name=$name)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Team remove (name=$name)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/UpdateTeamS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/UpdateTeamS2CP.kt index ce49c382b..d7ba83288 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/UpdateTeamS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/UpdateTeamS2CP.kt @@ -112,6 +112,6 @@ class UpdateTeamS2CP( if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Team update (name=$name, prefix=$prefix, suffix=$suffix, friendlyFire=$friendlyFire, canSeeInvisibleTeam=$canSeeInvisibleTeam, collisionRule=$collisionRule, nameTagVisibility=$nameTagVisibility, color=$color)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Team update (name=$name, prefix=$prefix, suffix=$suffix, friendlyFire=$friendlyFire, canSeeInvisibleTeam=$canSeeInvisibleTeam, collisionRule=$collisionRule, nameTagVisibility=$nameTagVisibility, color=$color)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sign/SignEditorS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sign/SignEditorS2CP.kt index e0d8b2241..be9a98ea6 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sign/SignEditorS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sign/SignEditorS2CP.kt @@ -35,6 +35,6 @@ class SignEditorS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Sign editor (position=$position, side=$side)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Sign editor (position=$position, side=$side)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sign/SignTextS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sign/SignTextS2CP.kt index 4a5de97a2..433420b39 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sign/SignTextS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sign/SignTextS2CP.kt @@ -52,6 +52,6 @@ class SignTextS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Sign text (position=$position, lines=$lines" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Sign text (position=$position, lines=$lines" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/EntitySoundS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/EntitySoundS2CP.kt index 9d3707046..e20a64293 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/EntitySoundS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/EntitySoundS2CP.kt @@ -47,6 +47,6 @@ class EntitySoundS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Entity sound effect (soundEvent=$soundEvent, category=$category, entityId$entityId, volume=$volume, pitch=$pitch)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Entity sound effect (soundEvent=$soundEvent, category=$category, entityId$entityId, volume=$volume, pitch=$pitch)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/NamedSoundS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/NamedSoundS2CP.kt index 35af3fadd..163b2b1bd 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/NamedSoundS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/NamedSoundS2CP.kt @@ -74,6 +74,6 @@ class NamedSoundS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Named sound event (sound=$soundEvent, volume=$volume, pitch=$pitch, position=$position, category=$category)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Named sound event (sound=$soundEvent, volume=$volume, pitch=$pitch, position=$position, category=$category)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/SoundEventS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/SoundEventS2CP.kt index 2e95fd043..7df528ca7 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/SoundEventS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/SoundEventS2CP.kt @@ -82,6 +82,6 @@ class SoundEventS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Sound event (category=$category, position=$position, sound=$sound, volume=$volume, pitch=$pitch)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Sound event (category=$category, position=$position, sound=$sound, volume=$volume, pitch=$pitch)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/StopSoundS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/StopSoundS2CP.kt index b063495c9..790023469 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/StopSoundS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/sound/StopSoundS2CP.kt @@ -54,6 +54,6 @@ class StopSoundS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Stop sound (category=$category, sound=$sound)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Stop sound (category=$category, sound=$sound)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/tab/LegacyTabListS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/tab/LegacyTabListS2CP.kt index a89f42084..5aa1fca83 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/tab/LegacyTabListS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/tab/LegacyTabListS2CP.kt @@ -47,6 +47,6 @@ class LegacyTabListS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Legacy tab list data (items=$items)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Legacy tab list data (items=$items)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/tab/TabListRemoveS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/tab/TabListRemoveS2CP.kt index a412969fb..d6468b526 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/tab/TabListRemoveS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/tab/TabListRemoveS2CP.kt @@ -43,6 +43,6 @@ class TabListRemoveS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Tab list remove (uuids=$uuids)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Tab list remove (uuids=$uuids)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/tab/TabListS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/tab/TabListS2CP.kt index 6a73065ed..5f4d10afb 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/tab/TabListS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/tab/TabListS2CP.kt @@ -107,6 +107,6 @@ class TabListS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { if (reducedLog) { return } - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Tab list data (entries=$entries)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Tab list data (entries=$entries)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/tab/TabListTextS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/tab/TabListTextS2CP.kt index 744da5c7b..68ed4e556 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/tab/TabListTextS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/tab/TabListTextS2CP.kt @@ -32,6 +32,6 @@ class TabListTextS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Tab list text (header=$header, footer=$footer)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Tab list text (header=$header, footer=$footer)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/HideTitleS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/HideTitleS2CP.kt index 252818949..e7526de6b 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/HideTitleS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/HideTitleS2CP.kt @@ -29,6 +29,6 @@ class HideTitleS2CP(buffer: PlayInByteBuffer) : TitleS2CP { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Hide title" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Hide title" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/HotbarTextS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/HotbarTextS2CP.kt index 1ae2e2b6e..da230a0d1 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/HotbarTextS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/HotbarTextS2CP.kt @@ -28,7 +28,7 @@ class HotbarTextS2CP(buffer: PlayInByteBuffer) : TitleS2CP { val text = buffer.readChatComponent() override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Hotbar text (text=$text)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Hotbar text (text=$text)" } } override fun handle(connection: PlayConnection) { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/ResetTitleS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/ResetTitleS2CP.kt index 9cc25f200..f3dd2ed1c 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/ResetTitleS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/ResetTitleS2CP.kt @@ -29,6 +29,6 @@ class ResetTitleS2CP(buffer: PlayInByteBuffer) : TitleS2CP { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Reset title" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Reset title" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/SubtitleS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/SubtitleS2CP.kt index 90a6d6ba1..469140fc1 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/SubtitleS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/SubtitleS2CP.kt @@ -30,6 +30,6 @@ class SubtitleS2CP(buffer: PlayInByteBuffer) : TitleS2CP { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Subtitle (test=$text)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Subtitle (test=$text)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/TitleTextS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/TitleTextS2CP.kt index 7c8b3980d..200f541f9 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/TitleTextS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/TitleTextS2CP.kt @@ -30,6 +30,6 @@ class TitleTextS2CP(buffer: PlayInByteBuffer) : TitleS2CP { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Title text (text=$text)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Title text (text=$text)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/TitleTimesS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/TitleTimesS2CP.kt index 3a8e84166..69fc47ee3 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/TitleTimesS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/title/TitleTimesS2CP.kt @@ -32,6 +32,6 @@ class TitleTimesS2CP(buffer: PlayInByteBuffer) : TitleS2CP { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Title time (fadeInTime=$fadeInTime, stayTime=$stayTime, fadeOutTime=$fadeOutTime)" } + Log.log(LogMessageType.NETWORK_IN, level = LogLevels.VERBOSE) { "Title time (fadeInTime=$fadeInTime, stayTime=$stayTime, fadeOutTime=$fadeOutTime)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/status/PongS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/status/PongS2CP.kt index ec769dced..8dc249c23 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/status/PongS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/status/PongS2CP.kt @@ -37,6 +37,6 @@ class PongS2CP(buffer: InByteBuffer) : StatusS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Status pong (payload=$payload)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Status pong (payload=$payload)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/status/StatusS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/status/StatusS2CP.kt index 409cbf33e..98b9f55dd 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/status/StatusS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/status/StatusS2CP.kt @@ -35,7 +35,7 @@ class StatusS2CP(buffer: InByteBuffer) : StatusS2CPacket { override fun handle(connection: StatusConnection) { val version: Version? = Versions.getByProtocol(status.protocolId ?: -1) if (version == null) { - Log.log(LogMessageType.NETWORK_STATUS, LogLevels.WARN) { "Server is running on unknown version (protocolId=${status.protocolId})" } + Log.log(LogMessageType.NETWORK, LogLevels.WARN) { "Server is running on unknown version (protocolId=${status.protocolId})" } } else { connection.serverVersion = version } @@ -48,6 +48,6 @@ class StatusS2CP(buffer: InByteBuffer) : StatusS2CPacket { } override fun log(reducedLog: Boolean) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Server status response (status=$status)" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Server status response (status=$status)" } } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/LANServerListener.kt b/src/main/java/de/bixilon/minosoft/protocol/protocol/LANServerListener.kt index 70f7a152f..65ef42187 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/LANServerListener.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/LANServerListener.kt @@ -75,14 +75,14 @@ object LANServerListener { val inetAddress = InetAddress.getByName(BROADCAST_ADDRESS) socket.joinGroup(InetSocketAddress(inetAddress, BROADCAST_PORT), NetworkInterface.getByInetAddress(inetAddress)) val buffer = ByteArray(256) // this should be enough, if the packet is longer, it is probably invalid - Log.log(LogMessageType.NETWORK_STATUS, LogLevels.VERBOSE) { "Listening for LAN servers..." } + Log.log(LogMessageType.NETWORK, LogLevels.VERBOSE) { "Listening for LAN servers..." } latch?.dec() while (true) { try { val packet = DatagramPacket(buffer, buffer.size) socket.receive(packet) val broadcast = String(buffer, 0, packet.length, StandardCharsets.UTF_8) - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "LAN servers broadcast (${packet.address.hostAddress}:${packet.port}): $broadcast" } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "LAN servers broadcast (${packet.address.hostAddress}:${packet.port}): $broadcast" } val sender = packet.address if (SERVERS.containsKey(sender)) { // This guy sent us already a server, maybe just the regular 1.5 second interval, a duplicate or a DOS attack...We don't care @@ -95,7 +95,7 @@ object LANServerListener { if (SERVERS.size > MAXIMUM_SERVERS) { continue } - Log.log(LogMessageType.NETWORK_STATUS, LogLevels.INFO) { "Discovered LAN servers: ${server.address}" } + Log.log(LogMessageType.NETWORK, LogLevels.INFO) { "Discovered LAN servers: ${server.address}" } SERVERS[sender] = server LANServerType.servers += server } catch (ignored: Throwable) { @@ -110,7 +110,7 @@ object LANServerListener { } finally { this.listeningThread = null SERVERS.clear() - Log.log(LogMessageType.NETWORK_STATUS, LogLevels.VERBOSE) { "Stop listening for LAN servers..." } + Log.log(LogMessageType.NETWORK, LogLevels.VERBOSE) { "Stop listening for LAN servers..." } } }, "LAN Server Listener") thread.start() diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/buffers/play/PlayInByteBuffer.kt b/src/main/java/de/bixilon/minosoft/protocol/protocol/buffers/play/PlayInByteBuffer.kt index 1ac3be60a..365e0416a 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/buffers/play/PlayInByteBuffer.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/buffers/play/PlayInByteBuffer.kt @@ -228,7 +228,7 @@ class PlayInByteBuffer : InByteBuffer { PlayerProperties.TEXTURE_PROPERTIES -> { check(textures == null) { "Textures duplicated" } if (signature == null) { - Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Server tried to send unsigned texture data, ignoring." } + Log.log(LogMessageType.NETWORK_IN, LogLevels.VERBOSE) { "Server tried to send unsigned texture data, ignoring." } continue } textures = PlayerTextures.of(value, signature) diff --git a/src/main/java/de/bixilon/minosoft/util/logging/LogMessageType.kt b/src/main/java/de/bixilon/minosoft/util/logging/LogMessageType.kt index 41f0b14c5..18da8e8db 100644 --- a/src/main/java/de/bixilon/minosoft/util/logging/LogMessageType.kt +++ b/src/main/java/de/bixilon/minosoft/util/logging/LogMessageType.kt @@ -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. * @@ -32,23 +32,21 @@ enum class LogMessageType( AUTHENTICATION(ChatColors.BLACK), - NETWORK_RESOLVING(ChatColors.DARK_GREEN), - NETWORK_STATUS(ChatColors.DARK_GREEN), - NETWORK_PACKETS_IN( + NETWORK(ChatColors.DARK_GREEN), + NETWORK_IN( ChatColors.BLUE, mapOf( LogLevels.FATAL to ChatColors.DARK_RED, LogLevels.WARN to ChatColors.RED, ), defaultLevel = LogLevels.WARN ), - NETWORK_PACKETS_OUT( + NETWORK_OUT( ChatColors.DARK_AQUA, mapOf( LogLevels.FATAL to ChatColors.DARK_RED, LogLevels.WARN to ChatColors.RED, ), defaultLevel = LogLevels.WARN ), - RENDERING_GENERAL(ChatColors.GREEN), - RENDERING_LOADING(ChatColors.GREEN), + RENDERING(ChatColors.GREEN), AUDIO(ChatColors.DARK_PURPLE), CHAT_IN(ChatColors.LIGHT_PURPLE),