Switch to SLF4J, needs testing. May revert

Fernthedev · Fernthedev · commit e70b9d89d6f8 · 2020-12-01T13:23:16.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -52,6 +52,7 @@ allprojects {
     ext.aikarVer = "0.5.0-SNAPSHOT"
     ext.adventureAPI = "4.1.1"
     ext.adventureAPIPlatform = "4.0.0-SNAPSHOT"
+    ext.slf4j_ver = "1.7.30"
     project.ext.beta_version = '4' // Only modify when beta
     ext.beta_prefix = 'rc'
     description = 'An API for universal code'
diff --git a/bungee/src/main/java/com/github/fernthedev/fernapi/server/bungee/BungeeInterface.java b/bungee/src/main/java/com/github/fernthedev/fernapi/server/bungee/BungeeInterface.java
@@ -14,11 +14,12 @@
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.util.List;
 import java.util.UUID;
-import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 public class BungeeInterface implements MethodInterface<ProxiedPlayer, CommandSender> {
@@ -35,8 +36,8 @@ public boolean isMainThread() {
     }
 
     @Override
-    public Logger getLogger() {
-        return fernBungeeAPI.getLogger();
+    public Logger getAbstractLogger() {
+        return LoggerFactory.getLogger(fernBungeeAPI.getClass());
     }
 
     @Override
@@ -153,4 +154,6 @@ public List<IFPlayer<ProxiedPlayer>> matchPlayerName(String name) {
                 .filter(proxiedPlayerIFPlayer -> proxiedPlayerIFPlayer.getName().contains(name))
                 .collect(Collectors.toList());
     }
+
+
 }
diff --git a/bungee/src/main/java/com/github/fernthedev/fernapi/server/bungee/FernCommand.java b/bungee/src/main/java/com/github/fernthedev/fernapi/server/bungee/FernCommand.java
@@ -6,10 +6,10 @@
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.plugin.Command;
+import org.slf4j.Logger;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.Logger;
 
 public abstract class FernCommand extends Command {
     /**
@@ -38,7 +38,7 @@ protected BaseComponent message(String text) {
     }
 
     protected Logger logger() {
-        return Universal.getMethods().getLogger();
+        return Universal.getMethods().getAbstractLogger();
     }
 
     protected void sendMessage(CommandSender player, String message) {
diff --git a/core/build.gradle b/core/build.gradle
@@ -19,9 +19,7 @@ dependencies {
     implementation("com.google.guava:guava:29.0-jre")
 
 //    api group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.29'
-
-
-//
+    api group: 'org.slf4j', name: 'slf4j-jdk14', version: slf4j_ver
     compileOnly 'org.projectlombok:lombok:1.18.16'
     annotationProcessor 'org.projectlombok:lombok:1.18.16'
 }
diff --git a/core/src/main/java/com/github/fernthedev/fernapi/universal/Universal.java b/core/src/main/java/com/github/fernthedev/fernapi/universal/Universal.java
@@ -16,9 +16,9 @@
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
+import org.slf4j.Logger;
 
 import java.util.Locale;
-import java.util.logging.Logger;
 
 /**
  * Holds most of the core api
@@ -62,7 +62,7 @@ public static Universal getInstance() {
     }
 
     public static Logger getLogger() {
-        return getMethods().getLogger();
+        return getMethods().getAbstractLogger();
     }
 
     public void setup(@NonNull MethodInterface<?, ?> methodInterface, FernAPIPlugin aplugin,
@@ -71,7 +71,7 @@ public void setup(@NonNull MethodInterface<?, ?> methodInterface, FernAPIPlugin
                       PluginData<?> pluginData
     ) {
         if (setup) throw new FernRuntimeException("The interface has already been registered.");
-        methodInterface.getLogger().info("Registered interface");
+        methodInterface.getAbstractLogger().info("Registered interface");
         setup = true;
         mi = methodInterface;
         ch = chatHandler;
@@ -111,7 +111,7 @@ public void setup(@NonNull MethodInterface<?, ?> methodInterface, FernAPIPlugin
 
         UUIDFetcher.addRequestTimer();
 
-        getMethods().getLogger().info("Registered FernAPI " + getMethods().getServerType().toString() + " using version " + VersionUtil.getVersionData());
+        getMethods().getAbstractLogger().info("Registered FernAPI " + getMethods().getServerType().toString() + " using version " + VersionUtil.getVersionData());
 
     }
 
@@ -130,7 +130,7 @@ protected static void checkNull() {
 
     public static void debug(String message) {
         if(debug) {
-            getMethods().getLogger().info("[DEBUG] " + message);
+            getMethods().getAbstractLogger().info("[DEBUG] " + message);
         }
     }
 
diff --git a/core/src/main/java/com/github/fernthedev/fernapi/universal/examples/mysql/DatabaseTest.java b/core/src/main/java/com/github/fernthedev/fernapi/universal/examples/mysql/DatabaseTest.java
@@ -35,9 +35,9 @@ public TableInfo getTableInfo() {
     @Override
     public void onConnectAttempt(boolean connected) {
         if(connected) {
-            Universal.getMethods().getLogger().info("Connected successfully");
+            Universal.getMethods().getAbstractLogger().info("Connected successfully");
         }else{
-            Universal.getMethods().getLogger().warning("Unable to connect successfully");
+            Universal.getMethods().getAbstractLogger().warn("Unable to connect successfully");
         }
     }
 
diff --git a/core/src/main/java/com/github/fernthedev/fernapi/universal/handlers/MethodInterface.java b/core/src/main/java/com/github/fernthedev/fernapi/universal/handlers/MethodInterface.java
@@ -5,11 +5,11 @@
 import com.github.fernthedev.fernapi.universal.api.IFPlayer;
 import com.github.fernthedev.fernapi.universal.api.OfflineFPlayer;
 import lombok.NonNull;
+import org.slf4j.Logger;
 
 import java.io.File;
 import java.util.List;
 import java.util.UUID;
-import java.util.logging.Logger;
 
 /**
  *
@@ -18,7 +18,7 @@
 public interface MethodInterface<PlayerType, ConsoleType> {
     boolean isMainThread();
 
-    Logger getLogger();
+    Logger getAbstractLogger();
 
     ServerType getServerType();
 
diff --git a/core/src/main/java/com/github/fernthedev/fernapi/universal/mysql/DatabaseListener.java b/core/src/main/java/com/github/fernthedev/fernapi/universal/mysql/DatabaseListener.java
@@ -6,11 +6,11 @@
 import com.github.fernthedev.fernapi.universal.exceptions.database.DatabaseNotConnectedException;
 import lombok.*;
 import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
 
 import java.sql.*;
 import java.util.LinkedList;
 import java.util.Queue;
-import java.util.logging.Logger;
 
 public abstract class DatabaseListener {
 
@@ -416,7 +416,7 @@ public void createTable(@NonNull TableInfo tableDataInfo) throws DatabaseExcepti
     }
 
     protected Logger getLogger() {
-        return Universal.getMethods().getLogger();
+        return Universal.getMethods().getAbstractLogger();
     }
 
     @Synchronized
diff --git a/core/src/main/java/com/github/fernthedev/fernapi/universal/mysql/HikariDatabaseHandler.java b/core/src/main/java/com/github/fernthedev/fernapi/universal/mysql/HikariDatabaseHandler.java
@@ -109,7 +109,7 @@ public boolean openConnection(DatabaseAuthInfo dataInfo) throws SQLException {
         } catch (DatabaseNotConnectedException ignored) {}
 
         if (!listener.isSetup()) {
-            Universal.getMethods().getLogger().info("Connecting to MySQL now.");
+            Universal.getMethods().getAbstractLogger().info("Connecting to MySQL now.");
             listener.setFirstConnect(true);
             listener.createConnection(dataInfo);
 
@@ -133,7 +133,7 @@ public boolean openConnection(DatabaseAuthInfo dataInfo) throws SQLException {
      */
     public void registerDatabase(@NonNull DatabaseAuthInfo databaseAuthInfo, @NonNull DatabaseListener databaseListener) {
         if (!databaseListener.isSetup()) {
-            Universal.getMethods().getLogger().info("Setting database connection");
+            Universal.getMethods().getAbstractLogger().info("Setting database connection");
         }
 
         databaseManagerMap.put(databaseAuthInfo, databaseListener);
@@ -201,7 +201,7 @@ private void setHikariData(DatabaseAuthInfo dataInfo) {
 //        hikari.addDataSourceProperty("user", dataInfo.getUsername());
 //        hikari.addDataSourceProperty("password", dataInfo.getPassword());
         } else {
-            Universal.getLogger().warning("Restart required to apply new SQL driver change. ");
+            Universal.getLogger().warn("Restart required to apply new SQL driver change. ");
         }
     }
 
diff --git a/core/src/main/java/com/github/fernthedev/fernapi/universal/util/ProxyAskPlaceHolder.java b/core/src/main/java/com/github/fernthedev/fernapi/universal/util/ProxyAskPlaceHolder.java
@@ -40,7 +40,7 @@ public class ProxyAskPlaceHolder extends PluginMessageHandler {
      * Internal use
      */
     private ProxyAskPlaceHolder() {
-        Universal.getMethods().getLogger().info("Registered PlaceHolderAPI Listener");
+        Universal.getMethods().getAbstractLogger().info("Registered PlaceHolderAPI Listener");
         proxyPlaceholderRunnable = (player, placeHolder, isReplaced) -> {};
     }
 
diff --git a/core/src/main/java/com/github/fernthedev/fernapi/universal/util/network/vanish/VanishProxyCheck.java b/core/src/main/java/com/github/fernthedev/fernapi/universal/util/network/vanish/VanishProxyCheck.java
@@ -6,7 +6,6 @@
 import com.github.fernthedev.fernapi.universal.data.network.Channel;
 import com.github.fernthedev.fernapi.universal.data.network.PluginMessageData;
 import com.github.fernthedev.fernapi.universal.exceptions.FernRuntimeException;
-import com.github.fernthedev.fernapi.universal.handlers.FernAPIPlugin;
 import com.github.fernthedev.fernapi.universal.handlers.PluginMessageHandler;
 import com.github.fernthedev.fernapi.universal.handlers.ServerType;
 import com.github.fernthedev.fernapi.universal.util.ProxyAskPlaceHolder;
@@ -60,7 +59,7 @@ private VanishProxyCheck() {
         if (o != null) throw new FernRuntimeException("VanishProxyCheck is already registered");
 
         o = new Object();
-        Universal.getMethods().getLogger().info("Registered VanishProxyCheck Listener");
+        Universal.getMethods().getAbstractLogger().info("Registered VanishProxyCheck Listener");
     }
 
     /**
diff --git a/spigot/build.gradle b/spigot/build.gradle
@@ -29,11 +29,9 @@ dependencies {
     compile "net.kyori:adventure-platform-bukkit:$adventureAPIPlatform"
     api'fr.minuskube.inv:smart-invs:1.2.7'
     api ("me.lucko:helper:5.6.5")
-
     compileOnly group: 'me.clip', name: 'placeholderapi', version: '2.9.2'
 
     compileOnly 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT' // The Spigot API with no shadowing. Requires the OSS repo.
-
     compileOnly "com.github.MilkBowl:VaultAPI:1.7"
 
 //    compileOnly ('com.github.Fernthedev:VaultAPI:7.0') {
diff --git a/spigot/src/main/java/com/github/fernthedev/fernapi/server/spigot/SpigotInterface.java b/spigot/src/main/java/com/github/fernthedev/fernapi/server/spigot/SpigotInterface.java
@@ -13,12 +13,13 @@
 import org.bukkit.Bukkit;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
-import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 public class SpigotInterface implements MethodInterface<Player, ConsoleCommandSender> {
@@ -34,8 +35,8 @@ public boolean isMainThread() {
     }
 
     @Override
-    public Logger getLogger() {
-        return fernSpigotAPI.getLogger();
+    public Logger getAbstractLogger() {
+        return LoggerFactory.getLogger(fernSpigotAPI.getClass());
     }
 
     @Override
diff --git a/spigot/src/main/java/com/github/fernthedev/fernapi/server/spigot/network/SpigotMessageHandler.java b/spigot/src/main/java/com/github/fernthedev/fernapi/server/spigot/network/SpigotMessageHandler.java
@@ -66,7 +66,7 @@ public void sendPluginData(IFPlayer fplayer, @NonNull PluginMessageData data) {
         }
 
         if (player == null) {
-            Universal.getMethods().getLogger().warning("No players online, cannot send plugin message");
+            Universal.getMethods().getAbstractLogger().warn("No players online, cannot send plugin message");
             try {
                 throw new NoPlayersOnlineException("Players are required to send plugin messages through spigot to other servers.");
             } catch (NoPlayersOnlineException e) {
diff --git a/sponge/src/main/java/com/github/fernthedev/fernapi/server/sponge/SpongeInterface.java b/sponge/src/main/java/com/github/fernthedev/fernapi/server/sponge/SpongeInterface.java
@@ -2,7 +2,6 @@
 
 import com.github.fernthedev.fernapi.server.sponge.player.SpongeFConsole;
 import com.github.fernthedev.fernapi.server.sponge.player.SpongeFPlayer;
-import com.github.fernthedev.fernapi.universal.Universal;
 import com.github.fernthedev.fernapi.universal.api.FernCommandIssuer;
 import com.github.fernthedev.fernapi.universal.api.IFConsole;
 import com.github.fernthedev.fernapi.universal.api.IFPlayer;
@@ -12,6 +11,7 @@
 import com.github.fernthedev.fernapi.universal.handlers.ServerType;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.command.source.ConsoleSource;
 import org.spongepowered.api.entity.living.player.Player;
@@ -34,9 +34,8 @@ public boolean isMainThread() {
     }
 
     @Override
-    public java.util.logging.Logger getLogger() {
-        Universal.debug("Java Logger does not exist in Sponge.");
-        return (java.util.logging.Logger) sponge.getLogger();
+    public Logger getAbstractLogger() {
+        return sponge.getLogger();
     }
 
     @Override
diff --git a/sponge/src/main/java/com/github/fernthedev/fernapi/server/sponge/network/SpongeMessageHandler.java b/sponge/src/main/java/com/github/fernthedev/fernapi/server/sponge/network/SpongeMessageHandler.java
@@ -165,7 +165,7 @@ public void sendPluginData(IFPlayer<?> fplayer, PluginMessageData data) {
         }
 
         if (player == null) {
-            Universal.getMethods().getLogger().warning("No players online, cannot send plugin message");
+            Universal.getMethods().getAbstractLogger().warn("No players online, cannot send plugin message");
             try {
                 throw new NoPlayersOnlineException("Players are required to send plugin messages through spigot to other servers.");
             } catch (NoPlayersOnlineException e) {
diff --git a/velocity/src/main/java/com/github/fernthedev/fernapi/server/velocity/VelocityInterface.java b/velocity/src/main/java/com/github/fernthedev/fernapi/server/velocity/VelocityInterface.java
@@ -12,16 +12,16 @@
 import com.velocitypowered.api.proxy.ConsoleCommandSource;
 import com.velocitypowered.api.proxy.Player;
 import lombok.NonNull;
+import org.slf4j.Logger;
 
 import java.io.File;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 public class VelocityInterface implements MethodInterface<Player, ConsoleCommandSource> {
-    private FernVelocityAPI fernVelocityAPI;
+    private final FernVelocityAPI fernVelocityAPI;
 
     VelocityInterface(FernVelocityAPI fernVelocityAPI) {
         this.fernVelocityAPI = fernVelocityAPI;
@@ -34,9 +34,8 @@ public boolean isMainThread() {
     }
 
     @Override
-    public Logger getLogger() {
-        fernVelocityAPI.getLogger().warn("Java Logger does not exist in Velocity.");
-        return (Logger) fernVelocityAPI.getLogger();
+    public Logger getAbstractLogger() {
+        return fernVelocityAPI.getLogger();
     }
 
     @Override
diff --git a/velocity/src/main/java/com/github/fernthedev/fernapi/server/velocity/network/VelocityMessageHandler.java b/velocity/src/main/java/com/github/fernthedev/fernapi/server/velocity/network/VelocityMessageHandler.java
@@ -155,7 +155,7 @@ public void sendPluginData(IFPlayer<?> fplayer, @NonNull PluginMessageData data)
         }
 
         if (player == null) {
-            Universal.getMethods().getLogger().warning("No players online, cannot send plugin message");
+            Universal.getMethods().getAbstractLogger().warn("No players online, cannot send plugin message");
             try {
                 throw new NoPlayersOnlineException("Players are required to send plugin messages through bungee/velocity to other servers.");
             } catch (NoPlayersOnlineException e) {

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@ public TableInfo getTableInfo() {`
`35`	`35`	`@Override`
`36`	`36`	`public void onConnectAttempt(boolean connected) {`
`37`	`37`	`if(connected) {`
`38`		`- Universal.getMethods().getLogger().info("Connected successfully");`
	`38`	`+ Universal.getMethods().getAbstractLogger().info("Connected successfully");`
`39`	`39`	`}else{`
`40`		`- Universal.getMethods().getLogger().warning("Unable to connect successfully");`
	`40`	`+ Universal.getMethods().getAbstractLogger().warn("Unable to connect successfully");`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public class ProxyAskPlaceHolder extends PluginMessageHandler {`
`40`	`40`	`* Internal use`
`41`	`41`	`*/`
`42`	`42`	`private ProxyAskPlaceHolder() {`
`43`		`- Universal.getMethods().getLogger().info("Registered PlaceHolderAPI Listener");`
	`43`	`+ Universal.getMethods().getAbstractLogger().info("Registered PlaceHolderAPI Listener");`
`44`	`44`	`proxyPlaceholderRunnable = (player, placeHolder, isReplaced) -> {};`
`45`	`45`	`}`
`46`	`46`