2.0.4

AuroraLS3 · Aug 26, 2017 · a9341bf · a9341bf
1 parent 3ef0ddb
commit a9341bf
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 109 deletions.
diff --git a/AbstractPluginFramework/pom.xml b/AbstractPluginFramework/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.djrapitops</groupId>
     <artifactId>AbstractPluginFramework</artifactId>
-    <version>2.0.3</version>
+    <version>2.0.4</version>
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/AbstractPluginFramework/src/main/java/com/djrapitops/plugin/BukkitPlugin.java b/AbstractPluginFramework/src/main/java/com/djrapitops/plugin/BukkitPlugin.java
@@ -11,7 +11,6 @@
 import com.djrapitops.plugin.utilities.log.BukkitLog;
 import com.djrapitops.plugin.utilities.log.PluginLog;
 import com.djrapitops.plugin.utilities.player.Fetch;
-import com.djrapitops.plugin.utilities.status.ProcessStatus;
 import com.djrapitops.plugin.utilities.status.TaskStatus;
 import org.bukkit.ChatColor;
 import org.bukkit.event.Listener;
@@ -47,7 +46,6 @@ public abstract class BukkitPlugin<T extends BukkitPlugin> extends JavaPlugin im
     private String debugMode = "false";
     private ColorScheme colorScheme = new ColorScheme(ChatColor.WHITE, ChatColor.GRAY, ChatColor.DARK_GRAY);
 
-    private final ProcessStatus<T> progressStat;
     private final TaskStatus<T> taskStat;
     private final BenchUtil benchmark;
     private PluginLog log;
@@ -62,7 +60,6 @@ public BukkitPlugin() {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        progressStat = new ProcessStatus(this);
         taskStat = new TaskStatus(this);
         benchmark = new BenchUtil(this);
         factory = new RunnableFactory(this);
@@ -179,11 +176,6 @@ public void setLog(PluginLog log) {
         this.log = log;
     }
 
-    @Override
-    public ProcessStatus<T> processStatus() {
-        return progressStat;
-    }
-
     @Override
     public TaskStatus<T> taskStatus() {
         return taskStat;

diff --git a/AbstractPluginFramework/src/main/java/com/djrapitops/plugin/BungeePlugin.java b/AbstractPluginFramework/src/main/java/com/djrapitops/plugin/BungeePlugin.java
@@ -10,7 +10,6 @@
 import com.djrapitops.plugin.utilities.log.BungeeLog;
 import com.djrapitops.plugin.utilities.log.PluginLog;
 import com.djrapitops.plugin.utilities.player.Fetch;
-import com.djrapitops.plugin.utilities.status.ProcessStatus;
 import com.djrapitops.plugin.utilities.status.TaskStatus;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.plugin.Listener;
@@ -36,7 +35,6 @@ public abstract class BungeePlugin<T extends BungeePlugin> extends Plugin implem
     private String debugMode = "false";
     private ColorScheme colorScheme = new ColorScheme(ChatColor.WHITE, ChatColor.GRAY, ChatColor.DARK_GRAY);
 
-    private final ProcessStatus<T> progressStat;
     private final TaskStatus<T> taskStat;
     private final BenchUtil benchmark;
     private PluginLog log;
@@ -51,7 +49,6 @@ public BungeePlugin() {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        progressStat = new ProcessStatus(this);
         taskStat = new TaskStatus(this);
         benchmark = new BenchUtil(this);
         factory = new RunnableFactory(this);
@@ -167,11 +164,6 @@ public void setLog(PluginLog log) {
         this.log = log;
     }
 
-    @Override
-    public ProcessStatus<T> processStatus() {
-        return progressStat;
-    }
-
     @Override
     public TaskStatus<T> taskStatus() {
         return taskStat;

diff --git a/AbstractPluginFramework/src/main/java/com/djrapitops/plugin/IPlugin.java b/AbstractPluginFramework/src/main/java/com/djrapitops/plugin/IPlugin.java
@@ -7,7 +7,6 @@
 import com.djrapitops.plugin.utilities.NotificationCenter;
 import com.djrapitops.plugin.utilities.log.PluginLog;
 import com.djrapitops.plugin.utilities.player.Fetch;
-import com.djrapitops.plugin.utilities.status.ProcessStatus;
 import com.djrapitops.plugin.utilities.status.TaskStatus;
 
 /**
@@ -22,8 +21,6 @@ public interface IPlugin {
 
     void onEnableDefaultTasks();
 
-    ProcessStatus processStatus();
-
     TaskStatus taskStatus();
 
     String getVersion();

diff --git a/AbstractPluginFramework/src/main/java/com/djrapitops/plugin/StaticHolder.java b/AbstractPluginFramework/src/main/java/com/djrapitops/plugin/StaticHolder.java
@@ -10,7 +10,7 @@
  */
 public class StaticHolder {
 
-    private static final String apfVersion = "2.0.3";
+    private static final String apfVersion = "2.0.4";
     private static final Map<Class, BukkitPlugin> INSTANCES_BUKKIT = new HashMap<>();
     private static final Map<Class, BungeePlugin> INSTANCES_BUNGEE = new HashMap<>();
     private static Class utilityProvider = null;

diff --git a/...luginFramework/src/main/java/com/djrapitops/plugin/command/defaultcmds/StatusCommand.java b/...luginFramework/src/main/java/com/djrapitops/plugin/command/defaultcmds/StatusCommand.java
@@ -7,11 +7,12 @@
 import com.djrapitops.plugin.settings.ColorScheme;
 import com.djrapitops.plugin.settings.DefaultMessages;
 import com.djrapitops.plugin.utilities.NotificationCenter;
-import com.djrapitops.plugin.utilities.status.ProcessStatus;
+import com.djrapitops.plugin.utilities.log.DebugInfo;
 import com.djrapitops.plugin.utilities.status.TaskStatus;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * A Default Command for displaying plugin's task, process and benchmark status.
@@ -55,18 +56,15 @@ public boolean onCommand(ISender sender, String commandLabel, String[] args) {
                 sender.sendMessage("   " + notification.replace(plugin.getPrefix() + " ", ""));
             }
         }
-
-
         TaskStatus taskStatus = plugin.taskStatus();
-        ProcessStatus processStatus = plugin.processStatus();
+
         sender.sendMessage(sColor + " " + DefaultMessages.BALL.toString() + oColor + " Tasks running: " + sColor + taskStatus.getTaskCount());
         sender.sendMessage(sColor + " " + DefaultMessages.BALL.toString() + oColor + " Processes: ");
-        Arrays.stream(processStatus.getProcesses())
-                .map(process -> tColor + "   " + process)
-                .forEach(sender::sendMessage);
+        Map<String, DebugInfo> debugs = plugin.getPluginLogger().getAllDebugs();
+        debugs.entrySet().forEach(entry -> sender.sendMessage(tColor + "   " + entry.getKey() + ": " + entry.getValue().getLastLine()));
         sender.sendMessage(sColor + " " + DefaultMessages.BALL.toString() + oColor + " Tasks: ");
         Arrays.stream(taskStatus.getTasks())
-                .map(process -> tColor + "   " + process)
+                .map(task -> tColor + "   " + task)
                 .forEach(sender::sendMessage);
         sender.sendMessage(tColor + DefaultMessages.ARROWS_RIGHT.parse());
         return true;

diff --git a/...ractPluginFramework/src/main/java/com/djrapitops/plugin/utilities/NotificationCenter.java b/...ractPluginFramework/src/main/java/com/djrapitops/plugin/utilities/NotificationCenter.java
@@ -34,12 +34,10 @@ public void addNotification(Priority priority, String message) {
     }
 
     public void checkNotifications(IPlayer player) {
-        if (!player.isOp() || player.hasPermission("apf.notify")) {
-            return;
-        }
-
-        for (String msg : getNotifications()) {
-            player.sendMessage(msg);
+        if (player.isOp() || player.hasPermission("apf.notify")) {
+            for (String msg : getNotifications()) {
+                player.sendMessage(msg);
+            }
         }
     }
 

diff --git a/AbstractPluginFramework/src/main/java/com/djrapitops/plugin/utilities/log/BukkitLog.java b/AbstractPluginFramework/src/main/java/com/djrapitops/plugin/utilities/log/BukkitLog.java
@@ -1,10 +1,8 @@
 package com.djrapitops.plugin.utilities.log;
 
 import com.djrapitops.plugin.BukkitPlugin;
-import com.djrapitops.plugin.utilities.status.ProcessStatus;
 import org.bukkit.command.ConsoleCommandSender;
 
-import java.io.File;
 import java.io.IOException;
 
 /**

diff --git a/AbstractPluginFramework/src/main/java/com/djrapitops/plugin/utilities/log/BungeeLog.java b/AbstractPluginFramework/src/main/java/com/djrapitops/plugin/utilities/log/BungeeLog.java
@@ -1,9 +1,7 @@
 package com.djrapitops.plugin.utilities.log;
 
 import com.djrapitops.plugin.BungeePlugin;
-import com.djrapitops.plugin.utilities.status.ProcessStatus;
 
-import java.io.File;
 import java.io.IOException;
 
 /**

diff --git a/AbstractPluginFramework/src/main/java/com/djrapitops/plugin/utilities/log/DebugInfo.java b/AbstractPluginFramework/src/main/java/com/djrapitops/plugin/utilities/log/DebugInfo.java
@@ -91,4 +91,11 @@ private String getFooter(Long time) {
         }
         return footer.toString();
     }
+
+    public String getLastLine() {
+        if (msg.isEmpty()) {
+            return "No information.";
+        }
+        return msg.get(msg.size() - 1);
+    }
 }
diff --git a/AbstractPluginFramework/src/main/java/com/djrapitops/plugin/utilities/log/PluginLog.java b/AbstractPluginFramework/src/main/java/com/djrapitops/plugin/utilities/log/PluginLog.java
@@ -241,4 +241,8 @@ public void setPrefix(String prefix) {
     public ErrorLogManager getErrorLogManager() {
         return errorLogManager;
     }
+
+    public Map<String, DebugInfo> getAllDebugs() {
+        return debugInfoMap;
+    }
 }
diff --git a/...ctPluginFramework/src/main/java/com/djrapitops/plugin/utilities/status/ProcessStatus.java b/...ctPluginFramework/src/main/java/com/djrapitops/plugin/utilities/status/ProcessStatus.java