Working on Bug Fixes

Author: Im-Fran

CHANGELOG.md

@@ -1,6 +1,6 @@
 ## v4.2.13 Changelog:
 ```
-* Bungee Bug Fixes
+* Moved Log Filter register method to the LogsFilter class
 ```
 
 ## v4.2.12 Changelog:

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>xyz.theprogramsrc</groupId>
     <artifactId>SuperCoreAPI</artifactId>
-    <version>4.2.13_BETA</version>
+    <version>4.2.13_BETA2</version>
     <packaging>jar</packaging>
 
     <name>SuperCoreAPI</name>

src/main/java/xyz/theprogramsrc/supercoreapi/SuperPlugin.java

@@ -1,6 +1,5 @@
 package xyz.theprogramsrc.supercoreapi;
 
-import xyz.theprogramsrc.supercoreapi.global.LogsFilter;
 import xyz.theprogramsrc.supercoreapi.global.data.PluginDataStorage;
 import xyz.theprogramsrc.supercoreapi.global.dependencies.DependencyManager;
 import xyz.theprogramsrc.supercoreapi.global.translations.TranslationManager;
@@ -154,12 +153,6 @@ default void addDisableHook(Runnable runnable){
      */
     void emergencyStop();
 
-    /**
-     * Registers a log filter
-     * @param logsFilter the filter
-     */
-    void registerLogFilter(LogsFilter logsFilter);
-
     /**
      * Gets the plugin data storage
      * @return the plugin data storage

src/main/java/xyz/theprogramsrc/supercoreapi/bungee/BungeePlugin.java

@@ -9,7 +9,6 @@
 import xyz.theprogramsrc.supercoreapi.bungee.storage.Settings;
 import xyz.theprogramsrc.supercoreapi.bungee.utils.BungeeUtils;
 import xyz.theprogramsrc.supercoreapi.bungee.utils.tasks.BungeeTasks;
-import xyz.theprogramsrc.supercoreapi.global.LogsFilter;
 import xyz.theprogramsrc.supercoreapi.global.data.PluginDataStorage;
 import xyz.theprogramsrc.supercoreapi.global.dependencies.Dependencies;
 import xyz.theprogramsrc.supercoreapi.global.dependencies.DependencyManager;
@@ -216,10 +215,4 @@ public LinkedList<Exception> getLastErrors() {
     public void addError(Exception e){
         this.errors.add(e);
     }
-
-    @Override
-    public void registerLogFilter(LogsFilter logsFilter){
-        org.apache.logging.log4j.core.Logger consoleLogger = ((org.apache.logging.log4j.core.Logger) org.apache.logging.log4j.LogManager.getRootLogger());
-        consoleLogger.addFilter(logsFilter);
-    }
 }

src/main/java/xyz/theprogramsrc/supercoreapi/global/LogsFilter.java

@@ -1,6 +1,7 @@
 package xyz.theprogramsrc.supercoreapi.global;
 
 import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.core.Logger;
@@ -35,6 +36,11 @@ private Result process(String message){
         return Result.NEUTRAL;
     }
 
+    public void register(){
+        Logger consoleLogger = ((Logger) LogManager.getRootLogger());
+        consoleLogger.addFilter(this);
+    }
+
     @Override
     public Result filter(LogEvent event) {
         return this.process(event.getMessage().getFormattedMessage());
@@ -63,7 +69,7 @@ public String[] getExtraRequirements(){
         return new String[0];
     }
 
-    public static enum FilterResult{
+    public enum FilterResult{
         DENY,
         NEUTRAL,
         NONE

src/main/java/xyz/theprogramsrc/supercoreapi/spigot/SpigotPlugin.java

@@ -1,14 +1,11 @@
 package xyz.theprogramsrc.supercoreapi.spigot;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.core.Logger;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 import xyz.theprogramsrc.supercoreapi.SuperPlugin;
 import xyz.theprogramsrc.supercoreapi.SuperUtils;
-import xyz.theprogramsrc.supercoreapi.global.LogsFilter;
 import xyz.theprogramsrc.supercoreapi.global.data.PluginDataStorage;
 import xyz.theprogramsrc.supercoreapi.global.dependencies.Dependencies;
 import xyz.theprogramsrc.supercoreapi.global.dependencies.DependencyManager;
@@ -309,10 +306,4 @@ public LinkedList<Exception> getLastErrors() {
     public void addError(Exception e){
         this.errors.add(e);
     }
-
-    @Override
-    public void registerLogFilter(LogsFilter logsFilter){
-        Logger consoleLogger = (Logger) LogManager.getRootLogger();
-        consoleLogger.addFilter(logsFilter);
-    }
 }