fix logger

mist475 · Nov 2, 2023 · a365d17 · a365d17
1 parent ea52807
commit a365d17
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/src/main/java/com/prupe/mcpatcher/MCLogger.java b/src/main/java/com/prupe/mcpatcher/MCLogger.java
@@ -24,7 +24,6 @@ public class MCLogger {
     private long lastFloodReport;
     private int floodCount;
     private long lastMessage = System.currentTimeMillis();
-    private long lastLogEvery = lastMessage;
 
     public static MCLogger getLogger(String category) {
         return getLogger(category, category);
@@ -60,7 +59,7 @@ public String format(LogRecord record) {
                             prefix.append("\n");
                             message = message.substring(1);
                         }
-                        return prefix + "[" + MCLogger.this.logPrefix + "] " + level + ": " + message;
+                        return prefix + "[" + MCLogger.this.logPrefix + "] " + level.toString() + ": " + message;
                     }
                 }
             };
@@ -116,16 +115,12 @@ public boolean isLoggable(Level level) {
         return logger.isLoggable(level);
     }
 
-    public void setLevel(Level level) {
-        logger.setLevel(level);
-    }
-
     public void log(Level level, String format, Object... params) {
         if (isLoggable(level)) {
             if (level.intValue() >= FLOOD_LEVEL && !checkFlood()) {
                 return;
             }
-            logger.log(level, format, params);
+            logger.log(level, String.format(format, params));
         }
     }
 
@@ -161,16 +156,6 @@ public void finest(String format, Object... params) {
         log(Level.FINEST, format, params);
     }
 
-    public boolean logEvery(long milliseconds) {
-        long now = System.currentTimeMillis();
-        if (now - lastLogEvery > milliseconds) {
-            lastLogEvery = now;
-            return true;
-        } else {
-            return false;
-        }
-    }
-
     private static class ErrorLevel extends Level {
 
         protected ErrorLevel() {

diff --git a/src/main/java/com/prupe/mcpatcher/mal/tile/TileLoader.java b/src/main/java/com/prupe/mcpatcher/mal/tile/TileLoader.java
@@ -71,7 +71,7 @@ public void afterChange() {
                 for (TileLoader loader : loaders) {
                     if (!loader.tilesToRegister.isEmpty()) {
                         loader.subLogger.warning(
-                            "could not load all %s tiles (%d remaining): %s",
+                            "could not load all %s tiles (%d remaining)",
                             loader.mapName,
                             loader.tilesToRegister.size());
                         loader.tilesToRegister.clear();