migrate to slf4j

5 files changed, 25 insertions, 20 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java b/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java
index efbc3e56..2b81a1a0 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java
@@ -17,7 +17,7 @@ public class DiscordRPCManager implements IPCListener{
     public static long startTimestamp;
     public static IPCClient client;
     public boolean isConnected;
-    public static final Logger logger = LoggerFactory.getLogger("Skyblocker DiscordRPC");
+    private static final Logger LOGGER = LoggerFactory.getLogger(DiscordRPCManager.class.getName());
     public static DecimalFormat dFormat = new DecimalFormat("###,###.##");
     public int cycleCount = 0;
 
@@ -34,17 +34,17 @@ public class DiscordRPCManager implements IPCListener{
 
     public void start(){
         try {
-            logger.info("Starting...");
+            LOGGER.info("[Skyblocker DiscordRPC] Starting...");
             startTimestamp = OffsetDateTime.now().toEpochSecond();
             client = new IPCClient(934607927837356052L);
             client.setListener(this);
             try {
                 client.connect();
             } catch (Exception e) {
-                logger.warn("Failed to connect: " + e.getMessage());
+                LOGGER.warn("Failed to connect: " + e.getMessage());
             }
         } catch (Throwable ex) {
-            logger.error("unexpected error occurred while trying to start...");
+            LOGGER.error("[Skyblocker DiscordRPC] unexpected error occurred while trying to start...");
             ex.printStackTrace();
         }
     }
@@ -79,7 +79,7 @@ public class DiscordRPCManager implements IPCListener{
 
     public void stop(){
         if (client != null && client.getStatus() == PipeStatus.CONNECTED) {
-            logger.info("Closing...");
+            LOGGER.info("Closing...");
             isConnected = false;
             client.close();
             client = null;
@@ -88,13 +88,13 @@ public class DiscordRPCManager implements IPCListener{
 
     @Override
     public void onReady(IPCClient client) {
-        logger.info("Started!");
+        LOGGER.info("Started!");
         isConnected = true;
     }
 
     @Override
     public void onClose(IPCClient client, JsonObject json) {
-        logger.info("Closed");
+        LOGGER.info("Closed");
         isConnected = false;
     }
 
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java
index d4f7fec5..1b87925c 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java
@@ -9,8 +9,11 @@ import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.Box;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DungeonBlaze {
+    private static final Logger LOGGER = LoggerFactory.getLogger(DungeonBlaze.class.getName());
     static Entity highestBlaze = null;
     static Entity lowestBlaze = null;
     static boolean renderHooked = false;
@@ -70,7 +73,7 @@ public class DungeonBlaze {
                 }
             }
         }catch(Exception e) {
-            System.out.println("BlazeRenderer: " + e);
+            LOGGER.warn("[Skyblocker BlazeRenderer] " + e);
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java
index 4d40ea83..57c40654 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java
@@ -9,14 +9,14 @@ import net.minecraft.item.Items;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.*;
 
 
 public class ColorTerminal extends ContainerSolver {
-    private static final Logger LOGGER = LogManager.getLogger(ColorTerminal.class.getName());
+    private static final Logger LOGGER = LoggerFactory.getLogger(ColorTerminal.class.getName());
     private static final Map<String, DyeColor> colorFromName;
     private DyeColor targetColor;
     private static final Map<Item, DyeColor> itemColor;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
index 1d70c5e0..8afefdb4 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
@@ -13,7 +13,8 @@ import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Formatting;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,6 +28,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.zip.GZIPInputStream;
 
 public class PriceInfoTooltip {
+    private static final Logger LOGGER = LoggerFactory.getLogger(PriceInfoTooltip.class.getName());
     private static final SkyblockerMod skyblocker = SkyblockerMod.getInstance();
     private static final MinecraftClient client = MinecraftClient.getInstance();
     private static JsonObject npcPricesJson;
@@ -301,7 +303,7 @@ public class PriceInfoTooltip {
                 }
             }
         } catch (IOException e) {
-            LogManager.getLogger(PriceInfoTooltip.class.getName()).warn("[Skyblocker] Failed to download average BIN prices!", e);
+            LOGGER.warn("[Skyblocker] Failed to download average BIN prices!", e);
         }
         switch (type) {
             case ONE_DAY -> oneDayAvgPricesJson = result;
@@ -316,7 +318,7 @@ public class PriceInfoTooltip {
             InputStreamReader reader = new InputStreamReader(apiAddr.openStream());
             result = new Gson().fromJson(reader, JsonObject.class);
         } catch (IOException e) {
-            LogManager.getLogger(PriceInfoTooltip.class.getName()).warn("[Skyblocker] Failed to download bazaar prices!", e);
+            LOGGER.warn("[Skyblocker] Failed to download bazaar prices!", e);
         }
         bazaarPricesJson = result;
     }
@@ -328,7 +330,7 @@ public class PriceInfoTooltip {
             InputStreamReader reader = new InputStreamReader(apiAddr.openStream());
             result = new Gson().fromJson(reader, JsonObject.class);
         } catch (IOException e) {
-            LogManager.getLogger(PriceInfoTooltip.class.getName()).warn("[Skyblocker] Failed to download lowest BIN prices!", e);
+            LOGGER.warn("[Skyblocker] Failed to download lowest BIN prices!", e);
         }
         lowestPricesJson = result;
     }
@@ -340,7 +342,7 @@ public class PriceInfoTooltip {
             InputStreamReader reader = new InputStreamReader(apiAddr.openStream());
             result = new Gson().fromJson(reader, JsonObject.class);
         } catch (IOException e) {
-            LogManager.getLogger(PriceInfoTooltip.class.getName()).warn("[Skyblocker] Failed to download NPC prices!", e);
+            LOGGER.warn("[Skyblocker] Failed to download NPC prices!", e);
         }
         npcPricesJson = result;
     }
@@ -352,7 +354,7 @@ public class PriceInfoTooltip {
             InputStreamReader reader = new InputStreamReader(apiAddr.openStream());
             result = new Gson().fromJson(reader, JsonObject.class);
         } catch (IOException e) {
-            LogManager.getLogger(PriceInfoTooltip.class.getName()).warn("[Skyblocker] Failed to download museum items!", e);
+            LOGGER.warn("[Skyblocker] Failed to download museum items!", e);
         }
         isMuseumJson = result;
     }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Events.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Events.java
index e3aa4da4..02936517 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/Events.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Events.java
@@ -9,11 +9,11 @@ import org.slf4j.LoggerFactory;
 
 public class Events {
     public static MinecraftClient client = MinecraftClient.getInstance();
-    public static Logger logger = LoggerFactory.getLogger(SkyblockerMod.NAMESPACE);
+    public static Logger LOGGER = LoggerFactory.getLogger(SkyblockerMod.NAMESPACE);
 
     public static void onSkyblockJoin(){
         Utils.isOnSkyblock = true;
-        logger.info("Joined Skyblock");
+        LOGGER.info("[Skyblocker] Joined Skyblock");
         if (UpdateChecker.shouldUpdate()){
             TranslatableText linkMessage = new TranslatableText("skyblocker.update.update_message");
             TranslatableText linkMessageEnding = new TranslatableText("skyblocker.update.update_message_end");
@@ -26,7 +26,7 @@ public class Events {
     }
 
     public static void onSkyblockDisconnect(){
-        logger.info("Disconnected from Skyblock");
+        LOGGER.info("[Skyblocker] Disconnected from Skyblock");
         SkyblockerMod.getInstance().discordRPCManager.stop();
         Utils.isOnSkyblock = false;
         Utils.isInDungeons = false;