From 1f010c44a6fa14142beb795d8a16d0aba253c9bc Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Tue, 25 Jan 2022 10:26:04 +0100
Subject: [PATCH] log: remove all deprecated functions

---
 .../data/commands/CommandArgumentNode.java    |  4 ++-
 .../de/bixilon/minosoft/util/Stopwatch.kt     |  4 ++-
 .../de/bixilon/minosoft/util/logging/Log.kt   | 29 +++++--------------
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/src/main/java/de/bixilon/minosoft/data/commands/CommandArgumentNode.java b/src/main/java/de/bixilon/minosoft/data/commands/CommandArgumentNode.java
index 28f72e652..84cc777ea 100644
--- a/src/main/java/de/bixilon/minosoft/data/commands/CommandArgumentNode.java
+++ b/src/main/java/de/bixilon/minosoft/data/commands/CommandArgumentNode.java
@@ -26,6 +26,8 @@ import de.bixilon.minosoft.terminal.commands.executors.CommandConnectionExecutor
 import de.bixilon.minosoft.terminal.commands.executors.CommandExecutor;
 import de.bixilon.minosoft.util.BitByte;
 import de.bixilon.minosoft.util.logging.Log;
+import de.bixilon.minosoft.util.logging.LogLevels;
+import de.bixilon.minosoft.util.logging.LogMessageType;
 
 import javax.annotation.Nullable;
 
@@ -39,7 +41,7 @@ public class CommandArgumentNode extends CommandLiteralNode {
         ResourceLocation parserResourceLocation = buffer.readResourceLocation();
         this.parser = CommandParsers.INSTANCE.getParserInstance(parserResourceLocation);
         if (this.parser == null) {
-            Log.verbose("Unknown command parser: %s", parserResourceLocation);
+            Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE, () -> "Unknown command parser:" + parserResourceLocation);
         } else {
             this.properties = this.parser.readParserProperties(buffer);
         }
diff --git a/src/main/java/de/bixilon/minosoft/util/Stopwatch.kt b/src/main/java/de/bixilon/minosoft/util/Stopwatch.kt
index 731d2a092..d6553ad37 100644
--- a/src/main/java/de/bixilon/minosoft/util/Stopwatch.kt
+++ b/src/main/java/de/bixilon/minosoft/util/Stopwatch.kt
@@ -15,6 +15,8 @@ package de.bixilon.minosoft.util
 
 import de.bixilon.kutil.unit.UnitFormatter
 import de.bixilon.minosoft.util.logging.Log
+import de.bixilon.minosoft.util.logging.LogLevels
+import de.bixilon.minosoft.util.logging.LogMessageType
 
 class Stopwatch {
     val id = LAST_ID++
@@ -37,7 +39,7 @@ class Stopwatch {
 
     fun labPrint() {
         val delta = lab()
-        Log.info("Stop watch ($id) lab: ${UnitFormatter.formatNanos(delta)}")
+        Log.log(LogMessageType.GENERAL, LogLevels.INFO) { "Stop watch ($id) lab: ${UnitFormatter.formatNanos(delta)}" }
     }
 
     fun totalTime(): String {
diff --git a/src/main/java/de/bixilon/minosoft/util/logging/Log.kt b/src/main/java/de/bixilon/minosoft/util/logging/Log.kt
index 134b6f933..9fbe4e787 100644
--- a/src/main/java/de/bixilon/minosoft/util/logging/Log.kt
+++ b/src/main/java/de/bixilon/minosoft/util/logging/Log.kt
@@ -150,15 +150,13 @@ object Log {
             else -> ChatComponent.of(message, ignoreJson = true)
         }
 
-        LOG_QUEUE.add(
-            MessageToSend(
-                message = formattedMessage,
-                time = TimeUtil.time,
-                logMessageType = type,
-                level = level,
-                thread = Thread.currentThread(),
-                additionalPrefix = additionalPrefix,
-            )
+        LOG_QUEUE += MessageToSend(
+            message = formattedMessage,
+            time = TimeUtil.time,
+            logMessageType = type,
+            level = level,
+            thread = Thread.currentThread(),
+            additionalPrefix = additionalPrefix,
         )
     }
 
@@ -179,17 +177,4 @@ object Log {
     fun log(type: LogMessageType, messageBuilder: () -> Any) {
         log(type, additionalPrefix = null, messageBuilder = messageBuilder)
     }
-
-    @Deprecated(message = "Java only")
-    @JvmStatic
-    fun info(message: Any, vararg formatting: Any) {
-        log(LogMessageType.OTHER, level = LogLevels.INFO, message = message, formatting = formatting)
-    }
-
-
-    @Deprecated(message = "Java only")
-    @JvmStatic
-    fun verbose(message: Any, vararg formatting: Any) {
-        log(LogMessageType.OTHER, level = LogLevels.VERBOSE, message = message, formatting = formatting)
-    }
 }