From a38bc112129f53ebd1e23d7d9f6d27d37154c462 Mon Sep 17 00:00:00 2001 From: Madis Otenurm Date: Tue, 24 Oct 2023 10:55:57 +0200 Subject: [PATCH] Reduce log spam (#442) * Fabric/common stuff * Verbose on demand * Improve reliability * Further improvements * Update NCRConfig.java --- .../resources/mixins/forge/nochatreports-forge.mixins.json | 1 - .../java/com/aizistral/nochatreports/common/NCRClient.java | 4 ++-- src/main/java/com/aizistral/nochatreports/common/NCRCore.java | 4 ++-- .../com/aizistral/nochatreports/common/config/JSONConfig.java | 4 ++-- .../common/mixins/client/MixinServerStatusPinger$1.java | 4 +++- .../nochatreports/fabric/mixins/client/MixinMinecraft.java | 2 +- .../fabric/mixins/client/MixinServerStatusPinger$1.java | 2 +- src/main/resources/mixins/common/nochatreports.mixins.json | 1 - .../resources/mixins/fabric/nochatreports-fabric.mixins.json | 1 - 9 files changed, 11 insertions(+), 12 deletions(-) diff --git a/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json b/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json index 02d57d69..ccb04acb 100644 --- a/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json +++ b/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json @@ -3,7 +3,6 @@ "minVersion": "0.8", "package": "com.aizistral.nochatreports.forge.mixins", "compatibilityLevel": "JAVA_17", - "verbose": true, "mixins": [], "client": [ "client.MixinClientConnection", diff --git a/src/main/java/com/aizistral/nochatreports/common/NCRClient.java b/src/main/java/com/aizistral/nochatreports/common/NCRClient.java index 524cfe06..e882e14b 100644 --- a/src/main/java/com/aizistral/nochatreports/common/NCRClient.java +++ b/src/main/java/com/aizistral/nochatreports/common/NCRClient.java @@ -24,7 +24,7 @@ private NCRClient() { } static void setup() { - NCRCore.LOGGER.info("Client initialization..."); + NCRCore.LOGGER.debug("Client initialization..."); ClientEvents.DISCONNECT.register(NCRClient::onDisconnect); ClientEvents.PLAY_READY.register(NCRClient::onPlayReady); @@ -66,7 +66,7 @@ private static void onPlayReady(ClientPacketListener handler, Minecraft client) } if (NCRConfig.getCommon().enableDebugLog()) { - NCRCore.LOGGER.info("Sucessfully connected to server, safety state: {}", ServerSafetyState.getCurrent()); + NCRCore.LOGGER.info("Successfully connected to server, safety state: {}", ServerSafetyState.getCurrent()); } if (NCRConfig.getClient().demandOnServer() && !ServerSafetyState.getCurrent().isSecure()) { diff --git a/src/main/java/com/aizistral/nochatreports/common/NCRCore.java b/src/main/java/com/aizistral/nochatreports/common/NCRCore.java index e931e21e..06949f75 100644 --- a/src/main/java/com/aizistral/nochatreports/common/NCRCore.java +++ b/src/main/java/com/aizistral/nochatreports/common/NCRCore.java @@ -36,8 +36,8 @@ public static void awaken(PlatformProvider platformProvider) { } private static void setup() { - LOGGER.info("KONNICHIWA ZA WARUDO!"); - LOGGER.info("Default JVM text encoding is: " + Charset.defaultCharset().displayName()); + LOGGER.debug("KONNICHIWA ZA WARUDO!"); + LOGGER.debug("Default JVM text encoding is: " + Charset.defaultCharset().displayName()); NCRConfig.load(); } diff --git a/src/main/java/com/aizistral/nochatreports/common/config/JSONConfig.java b/src/main/java/com/aizistral/nochatreports/common/config/JSONConfig.java index f8fe3b42..12a99376 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/JSONConfig.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/JSONConfig.java @@ -33,7 +33,7 @@ public Path getFile() { } public void saveFile() { - NCRCore.LOGGER.info("Writing config file {}...", this.fileName); + NCRCore.LOGGER.debug("Writing config file {}...", this.fileName); writeFile(this.fileName, this); } @@ -44,7 +44,7 @@ protected void uponLoad() { public abstract JSONConfig getDefault(); public static T loadConfig(Class configClass, Supplier freshInstance, String fileName) { - NCRCore.LOGGER.info("Reading config file {}...", fileName); + NCRCore.LOGGER.debug("Reading config file {}...", fileName); T config = readFile(fileName, configClass).orElseGet(freshInstance); config.uponLoad(); return config; diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java index 976e9c6e..81c14e07 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java @@ -42,7 +42,9 @@ private void getNoChatReports(ClientboundStatusResponsePacket packet, CallbackIn } static { - NCRCore.LOGGER.info("Common mixin into ServerStatusPinger$1 succeeded."); + if (NCRConfig.getCommon().enableDebugLog()) { + NCRCore.LOGGER.info("Common mixin into ServerStatusPinger$1 succeeded."); + } } } diff --git a/src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinMinecraft.java index c32033a9..5e8d7840 100644 --- a/src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinMinecraft.java +++ b/src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinMinecraft.java @@ -14,7 +14,7 @@ public class MixinMinecraft { @Inject(method = "run", at = @At("HEAD")) private void onRun(CallbackInfo info) { - NCRCore.LOGGER.info("Game entered main loop!"); + NCRCore.LOGGER.debug("Game entered main loop!"); } } diff --git a/src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinServerStatusPinger$1.java b/src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinServerStatusPinger$1.java index 50df36ef..c0217862 100644 --- a/src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinServerStatusPinger$1.java +++ b/src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinServerStatusPinger$1.java @@ -30,7 +30,7 @@ public ServerData getServerData() { } static { - NCRCore.LOGGER.info("Fabric mixin into ServerStatusPinger$1 succeeded."); + NCRCore.LOGGER.debug("Fabric mixin into ServerStatusPinger$1 succeeded."); } } diff --git a/src/main/resources/mixins/common/nochatreports.mixins.json b/src/main/resources/mixins/common/nochatreports.mixins.json index 8b84b486..d314c18f 100644 --- a/src/main/resources/mixins/common/nochatreports.mixins.json +++ b/src/main/resources/mixins/common/nochatreports.mixins.json @@ -3,7 +3,6 @@ "minVersion": "0.8", "package": "com.aizistral.nochatreports.common.mixins", "compatibilityLevel": "JAVA_17", - "verbose": true, "mixins": [ "common.MixinServerStatus", "common.MixinFriendlyByteBuf", diff --git a/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json b/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json index ed7497e0..a6ce009c 100644 --- a/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json +++ b/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json @@ -3,7 +3,6 @@ "minVersion": "0.8", "package": "com.aizistral.nochatreports.fabric.mixins", "compatibilityLevel": "JAVA_17", - "verbose": true, "mixins": [ ], "client": [