feat: new logger system

arcadelabs · Aug 8, 2022 · a382d3c · a382d3c
1 parent 73716e6
commit a382d3c
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -16,9 +16,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
+        <jar.finalName>${project.name}-v${project.version}</jar.finalName>
     </properties>
     <build>
-        <finalName>LabAide</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/src/main/java/in/arcadelabs/labaide/LabAide.java b/src/main/java/in/arcadelabs/labaide/LabAide.java
@@ -19,33 +19,63 @@
 package in.arcadelabs.labaide;
 
 import in.arcadelabs.labaide.logger.Logger;
+import in.arcadelabs.labaide.metrics.BStats;
 import lombok.Getter;
 import lombok.SneakyThrows;
 import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Getter
 public class LabAide extends JavaPlugin {
 
   @Getter
   private static LabAide instance;
   private static Logger logger;
+  private BStats metrics;
+  private final LegacyComponentSerializer legecySerializer = LegacyComponentSerializer.builder().hexColors().useUnusualXRepeatedCharacterHexFormat().build();
+  private final MiniMessage miniMessage = MiniMessage.builder().build();
+  private final List<Plugin> dependants = new ArrayList<>();
+
+  public static Logger Logger() {
+    return logger;
+  }
 
   @SneakyThrows
   @Override
   public void onEnable() {
-    logger = new Logger("❥",
+    metrics = new BStats(this, 16060);
+    instance = this;
+    logger = new Logger("LabAide",
             MiniMessage.miniMessage().deserialize(
-                    "<gradient:#f10f5d:#f58c67><b><color:#f89999>『</color>ArcadeLabs<color:#f89999>』"),
+                    "<b><color:#f58066>⌬</color></b>  "),
             null, null);
-    logger.logger(Logger.Level.INFO, MiniMessage.miniMessage().deserialize("<green><b>LabAide up and functional!"));
-  }
+    logger.log(Logger.Level.INFO, MiniMessage.miniMessage().deserialize(
+            "<b><gradient:#e01e37:#f58c67>" +
+                    "LabAide </gradient><color:#f89999><gradient:#f58c67:#f10f5d>up and functional!" +
+                    "</gradient></b>"));
 
-  public static Logger Logger() {
-    return logger;
+    final List<Plugin> serverPlugins = List.of(Bukkit.getPluginManager().getPlugins());
+    for (final Plugin plugin : serverPlugins) {
+      if (plugin.getDescription().getDepend().contains("LabAide")
+              || plugin.getDescription().getSoftDepend().contains("LabAide")) dependants.add(plugin);
+    }
+    final String pluralOrNot = dependants.size() > 1 ?
+            "Hooked into " + dependants.size() + " plugins.\n Dependants: "
+                    + dependants.toString().substring(1, dependants.toString().length() - 1) :
+            "Hooked into " + dependants.get(0);
+    logger.log(Logger.Level.INFO, MiniMessage.miniMessage().deserialize(
+            "<b><gradient:#e01e37:#f58c67>" + pluralOrNot + "</gradient></b>"));
   }
 
   @Override
   public void onDisable() {
+    logger.log(Logger.Level.INFO, MiniMessage.miniMessage().deserialize(
+            "<b><gradient:#f58c67:#f10f5d>Adios...</gradient></b>"));
   }
 }
diff --git a/src/main/java/in/arcadelabs/labaide/logger/Logger.java b/src/main/java/in/arcadelabs/labaide/logger/Logger.java
@@ -53,7 +53,7 @@ public Logger(final String name, final Component prefix, final String allPrefix,
    * @param level   the level
    * @param message the message
    */
-  public void logger(final Level level, final Component message) {
+  public void log(final Level level, final Component message) {
     switch (level) {
       case INFO -> logger.info(prefix.append(message));
       case WARN -> logger.warn(prefix.append(message));
@@ -69,7 +69,7 @@ public void logger(final Level level, final Component message) {
    * @param message   the message
    * @param stackrace the stackrace
    */
-  public void logger(final Level level, final Component message, final Throwable stackrace) {
+  public void log(final Level level, final Component message, final Throwable stackrace) {
     switch (level) {
       case INFO -> logger.info(prefix.append(message), stackrace);
       case WARN -> logger.warn(prefix.append(message), stackrace);
@@ -85,9 +85,9 @@ public void logger(final Level level, final Component message, final Throwable s
    * @param level   the level
    * @param message the message
    */
-  public void logger(final Player player, final Level level, final Component message) {
-    if (player == null) this.logger(level, miniMessage.deserialize(allPrefix).append(message));
-    else this.logger(level, miniMessage.deserialize(playerPrefix, Placeholder.component("player", player.name()))
+  public void log(final Player player, final Level level, final Component message) {
+    if (player == null) this.log(level, miniMessage.deserialize(allPrefix).append(message));
+    else this.log(level, miniMessage.deserialize(playerPrefix, Placeholder.component("player", player.name()))
             .append(message));
   }
 

diff --git a/src/main/java/in/arcadelabs/labaide/updatechecker/UpdateChecker.java b/src/main/java/in/arcadelabs/labaide/updatechecker/UpdateChecker.java
@@ -234,7 +234,7 @@ public void run() {
           }
         }
         for (final String message : instance.getMessage()) {
-          LabAide.Logger().logger(Logger.Level.INFO ,MiniMessage.miniMessage().deserialize(message));
+          LabAide.Logger().log(Logger.Level.INFO, MiniMessage.miniMessage().deserialize(message));
         }
         try {
           reader = new InputStreamReader(url.openStream());