From c023531e85a3ae2959ce6eb0a03a8921685f70f8 Mon Sep 17 00:00:00 2001
From: Teriuihi <teriuihi@alttd.com>
Date: Sun, 7 Aug 2022 20:30:13 +0200
Subject: [PATCH] Fixed logging

---
 .../com/alttd/boosterapi/util/ALogger.java    | 27 +++++++++++++------
 .../com/alttd/boosters/BoostersPlugin.java    |  3 +++
 .../com/alttd/vboosters/VelocityBoosters.java |  4 ---
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/api/src/main/java/com/alttd/boosterapi/util/ALogger.java b/api/src/main/java/com/alttd/boosterapi/util/ALogger.java
index 69d3e99..cd27a37 100755
--- a/api/src/main/java/com/alttd/boosterapi/util/ALogger.java
+++ b/api/src/main/java/com/alttd/boosterapi/util/ALogger.java
@@ -1,32 +1,43 @@
 package com.alttd.boosterapi.util;
 
 import org.apache.commons.lang.exception.ExceptionUtils;
+import java.util.logging.Logger;
 
 public class ALogger {
 
-    private static org.slf4j.Logger logger;
+    private static org.slf4j.Logger velocityLogger = null;
+    private static Logger bukkitLogger = null;
 
     public static void init(org.slf4j.Logger log) {
-        logger = log;
+        velocityLogger = log;
     }
 
-    private void log(String message) {
-        logger.info(message);
+    public static void init(Logger log) {
+        bukkitLogger = log;
     }
 
     public static void warn(String message) {
-        logger.warn(message);
+        if (velocityLogger != null)
+            velocityLogger.warn(message);
+        if (bukkitLogger != null)
+            bukkitLogger.warning(message);
     }
 
     public static void info(String message) {
-        logger.info(message);
+        if (velocityLogger != null)
+            velocityLogger.info(message);
+        if (bukkitLogger != null)
+            bukkitLogger.info(message);
     }
 
     public static void error(String message) {
-        logger.error(message);
+        if (velocityLogger != null)
+            velocityLogger.error(message);
+        if (bukkitLogger != null)
+            bukkitLogger.severe(message);
     }
 
     public static void fatal(String error, Exception exception) {
-        logger.error(error + "\n" +  ExceptionUtils.getStackTrace(exception));
+        error(error + "\n" +  ExceptionUtils.getStackTrace(exception));
     }
 }
diff --git a/plugin/src/main/java/com/alttd/boosters/BoostersPlugin.java b/plugin/src/main/java/com/alttd/boosters/BoostersPlugin.java
index d5d9c8a..c08ea46 100644
--- a/plugin/src/main/java/com/alttd/boosters/BoostersPlugin.java
+++ b/plugin/src/main/java/com/alttd/boosters/BoostersPlugin.java
@@ -3,12 +3,14 @@ package com.alttd.boosters;
 import com.alttd.boosterapi.BoosterAPI;
 import com.alttd.boosterapi.BoosterImplementation;
 import com.alttd.boosterapi.config.Config;
+import com.alttd.boosterapi.util.ALogger;
 import com.alttd.boosters.listeners.MCmmoListener;
 import com.alttd.boosters.listeners.MyPetListener;
 import com.alttd.boosters.listeners.PhantomSpawnListener;
 import com.alttd.boosters.listeners.PluginMessage;
 import com.alttd.boosters.managers.BoosterManager;
 import com.alttd.boosters.storage.ServerBoosterStorage;
+import org.bukkit.Bukkit;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -22,6 +24,7 @@ public final class BoostersPlugin extends JavaPlugin {
     @Override
     public void onEnable() {
         instance = this;
+        ALogger.init(Bukkit.getLogger());
         boosterAPI = new BoosterImplementation();
         boosterManager = new BoosterManager();
 
diff --git a/velocity/src/main/java/com/alttd/vboosters/VelocityBoosters.java b/velocity/src/main/java/com/alttd/vboosters/VelocityBoosters.java
index 560af7d..4b5ee32 100644
--- a/velocity/src/main/java/com/alttd/vboosters/VelocityBoosters.java
+++ b/velocity/src/main/java/com/alttd/vboosters/VelocityBoosters.java
@@ -2,11 +2,7 @@ package com.alttd.vboosters;
 
 import com.alttd.boosterapi.BoosterAPI;
 import com.alttd.boosterapi.BoosterImplementation;
-import com.alttd.boosterapi.config.Config;
-import com.alttd.boosterapi.config.ServerConfig;
 import com.alttd.boosterapi.util.ALogger;
-import com.alttd.proxydiscordlink.DiscordLink;
-import com.alttd.proxydiscordlink.bot.api.DiscordSendMessage;
 import com.alttd.vboosters.commands.BoosterCommand;
 import com.alttd.vboosters.commands.DonorRankCommand;
 import com.alttd.vboosters.listeners.PluginMessageListener;