common: Add PluginMiddleware for logging

libraries/common/build.gradle.kts

@@ -20,7 +20,7 @@ repositories {
 
 dependencies {
     compileOnly("dev.folia:folia-api:1.20.4-R0.1-SNAPSHOT")
-    compileOnly("de.oliver.FancyAnalytics:logger:0.0.7")
+    compileOnly("de.oliver.FancyAnalytics:logger:0.0.8")
 
     // database drivers
     compileOnly("org.xerial:sqlite-jdbc:3.49.1.0")

libraries/common/src/main/java/de/oliver/fancylib/logging/PluginMiddleware.java

@@ -0,0 +1,33 @@
+package de.oliver.fancylib.logging;
+
+import de.oliver.fancyanalytics.logger.LogEntry;
+import de.oliver.fancyanalytics.logger.middleware.Middleware;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PluginMiddleware implements Middleware {
+
+    private static final Logger log = LoggerFactory.getLogger(PluginMiddleware.class);
+    private final Plugin plugin;
+
+    public PluginMiddleware(Plugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public @Nullable LogEntry process(LogEntry logEntry) {
+        // server info
+        logEntry.addProperty("server_software", plugin.getServer().getName());
+        logEntry.addProperty("server_version", plugin.getServer().getBukkitVersion());
+        logEntry.addProperty("is_online_mode", plugin.getServer().getOnlineMode());
+
+        // plugin info
+        logEntry.addProperty("plugin_name", plugin.getDescription().getName());
+        logEntry.addProperty("plugin_version", plugin.getDescription().getVersion());
+
+        return logEntry;
+    }
+
+}

libraries/config/build.gradle.kts

@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
     compileOnly("io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT")
-    compileOnly("de.oliver.FancyAnalytics:logger:0.0.7")
+    compileOnly("de.oliver.FancyAnalytics:logger:0.0.8")
     compileOnly("org.jetbrains:annotations:26.0.2")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.2")

libraries/packets/build.gradle.kts

@@ -26,7 +26,7 @@ dependencies {
     implementation(project(":libraries:packets:implementations:1_21_4"))
     implementation(project(":libraries:packets:implementations:1_21_3"))
     implementation(project(":libraries:packets:implementations:1_20_6"))
-    implementation("de.oliver.FancyAnalytics:logger:0.0.7")
+    implementation("de.oliver.FancyAnalytics:logger:0.0.8")
 }
 
 tasks {

libraries/packets/packets-api/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     compileOnly("io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT")
-    compileOnly("de.oliver.FancyAnalytics:logger:0.0.7")
+    compileOnly("de.oliver.FancyAnalytics:logger:0.0.8")
 }
 
 tasks {

libraries/packets/test-plugin/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
     implementation(project(":libraries:packets:packets-api"))
     implementation(project(":libraries:packets:implementations:1_20_6"))
     implementation(project(":libraries:packets:implementations:1_21_3"))
-    implementation("de.oliver.FancyAnalytics:logger:0.0.7")
+    implementation("de.oliver.FancyAnalytics:logger:0.0.8")
 }
 
 paper {

plugins/fancydialogs/build.gradle.kts

@@ -55,8 +55,8 @@ dependencies {
     implementation(project(":libraries:jdb"))
     implementation(project(":libraries:config"))
     implementation("de.oliver.FancyAnalytics:java-sdk:0.0.4")
-    implementation("de.oliver.FancyAnalytics:mc-api:0.1.10")
+    implementation("de.oliver.FancyAnalytics:mc-api:0.1.11")
-    implementation("de.oliver.FancyAnalytics:logger:0.0.7")
+    implementation("de.oliver.FancyAnalytics:logger:0.0.8")
 
     compileOnly(project(":plugins:fancynpcs:fn-api"))
     compileOnly("org.lushplugins:ChatColorHandler:6.0.0")

plugins/fancydialogs/fd-api/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
     compileOnly("io.papermc.paper:paper-api:$minecraftVersion-R0.1-SNAPSHOT")
 
     compileOnly(project(":libraries:common"))
-    compileOnly("de.oliver.FancyAnalytics:logger:0.0.7")
+    compileOnly("de.oliver.FancyAnalytics:logger:0.0.8")
 
     implementation("org.lushplugins:ChatColorHandler:6.0.0")
 

plugins/fancyholograms-v2/api/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
     compileOnly("io.papermc.paper:paper-api:$minecraftVersion-R0.1-SNAPSHOT")
 
     compileOnly(project(":libraries:common"))
-    compileOnly("de.oliver.FancyAnalytics:logger:0.0.7")
+    compileOnly("de.oliver.FancyAnalytics:logger:0.0.8")
 
     implementation("org.lushplugins:ChatColorHandler:6.0.0")
 }

plugins/fancyholograms-v2/build.gradle.kts

@@ -73,8 +73,8 @@ dependencies {
     implementation(project(":libraries:jdb"))
     implementation(project(":libraries:config"))
     implementation("de.oliver.FancyAnalytics:java-sdk:0.0.4")
-    implementation("de.oliver.FancyAnalytics:mc-api:0.1.10")
+    implementation("de.oliver.FancyAnalytics:mc-api:0.1.11")
-    implementation("de.oliver.FancyAnalytics:logger:0.0.7")
+    implementation("de.oliver.FancyAnalytics:logger:0.0.8")
 
     compileOnly(project(":plugins:fancynpcs:fn-api"))
     compileOnly("org.lushplugins:ChatColorHandler:6.0.0")

plugins/fancyholograms/build.gradle.kts

@@ -64,8 +64,8 @@ dependencies {
     implementation(project(":libraries:packets"))
     implementation(project(":libraries:packets:packets-api"))
     implementation("de.oliver.FancyAnalytics:java-sdk:0.0.4")
-    implementation("de.oliver.FancyAnalytics:mc-api:0.1.10")
+    implementation("de.oliver.FancyAnalytics:mc-api:0.1.11")
-    implementation("de.oliver.FancyAnalytics:logger:0.0.7")
+    implementation("de.oliver.FancyAnalytics:logger:0.0.8")
 
     implementation("io.github.revxrsal:lamp.common:4.0.0-rc.12")
     implementation("io.github.revxrsal:lamp.bukkit:4.0.0-rc.12")

plugins/fancyholograms/fh-api/build.gradle.kts

@@ -11,7 +11,7 @@ dependencies {
 
     compileOnly(project(":libraries:common"))
     compileOnly(project(":libraries:jdb"))
-    compileOnly("de.oliver.FancyAnalytics:logger:0.0.7")
+    compileOnly("de.oliver.FancyAnalytics:logger:0.0.8")
 
     implementation("org.lushplugins:ChatColorHandler:6.0.0")
 }

plugins/fancynpcs/build.gradle.kts

@@ -76,8 +76,8 @@ dependencies {
     implementation(project(":libraries:config"))
     compileOnly("org.lushplugins:ChatColorHandler:6.0.0")
     implementation("de.oliver.FancyAnalytics:java-sdk:0.0.4")
-    implementation("de.oliver.FancyAnalytics:mc-api:0.1.10")
+    implementation("de.oliver.FancyAnalytics:mc-api:0.1.11")
-    implementation("de.oliver.FancyAnalytics:logger:0.0.7")
+    implementation("de.oliver.FancyAnalytics:logger:0.0.8")
     implementation("org.incendo:cloud-core:2.1.0-SNAPSHOT")
     implementation("org.incendo:cloud-paper:2.0.0-beta.11")
     implementation("org.incendo:cloud-annotations:2.1.0-SNAPSHOT")

plugins/fancynpcs/fn-api/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
     compileOnly("io.papermc.paper:paper-api:$minecraftVersion-R0.1-SNAPSHOT")
 
     compileOnly(project(":libraries:common"))
-    compileOnly("de.oliver.FancyAnalytics:logger:0.0.7")
+    compileOnly("de.oliver.FancyAnalytics:logger:0.0.8")
 
     implementation("org.lushplugins:ChatColorHandler:6.0.0")
 }

plugins/fancyvisuals/build.gradle.kts

@@ -37,8 +37,8 @@ dependencies {
     implementation(project(":libraries:packets"))
     implementation(project(":libraries:packets:packets-api"))
     implementation(project(":libraries:config"))
-    compileOnly("de.oliver.FancyAnalytics:mc-api:0.1.10") // loaded in FancyVisualLoader
+    compileOnly("de.oliver.FancyAnalytics:mc-api:0.1.11") // loaded in FancyVisualLoader
-    compileOnly("de.oliver.FancyAnalytics:logger:0.0.7") // loaded in FancyVisualLoader
+    compileOnly("de.oliver.FancyAnalytics:logger:0.0.8") // loaded in FancyVisualLoader
 
     implementation("org.lushplugins:ChatColorHandler:6.0.0")
     compileOnly("com.github.MilkBowl:VaultAPI:1.7.1")

plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/loaders/FancyVisualsLoader.java

@@ -16,8 +16,8 @@ public class FancyVisualsLoader implements PluginLoader {
         MavenLibraryResolver resolver = new MavenLibraryResolver();
         resolver.addRepository(new RemoteRepository.Builder("fancyinnovations", "default", "https://repo.fancyinnovations.com/releases").build());
 //        resolver.addRepository(new RemoteRepository.Builder("mavencentral", "default", "https://repo1.maven.org/maven2/").build());
-        resolver.addDependency(new Dependency(new DefaultArtifact("de.oliver.FancyAnalytics:mc-api:0.1.10"), "compile"));
+        resolver.addDependency(new Dependency(new DefaultArtifact("de.oliver.FancyAnalytics:mc-api:0.1.11"), "compile"));
-        resolver.addDependency(new Dependency(new DefaultArtifact("de.oliver.FancyAnalytics:logger:0.0.7"), "compile"));
+        resolver.addDependency(new Dependency(new DefaultArtifact("de.oliver.FancyAnalytics:logger:0.0.8"), "compile"));
 
         classpathBuilder.addLibrary(resolver);
     }

tools/deployment/build.gradle.kts

@@ -25,7 +25,7 @@ dependencies {
     implementation("org.jetbrains:annotations:26.0.2")
 
     implementation("de.oliver.FancyAnalytics:java-sdk:0.0.4")
-    implementation("de.oliver.FancyAnalytics:logger:0.0.7")
+    implementation("de.oliver.FancyAnalytics:logger:0.0.8")
 }
 
 tasks {

tools/quick-e2e/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
     implementation("org.jetbrains:annotations:26.0.2")
 
     implementation("de.oliver.FancyAnalytics:java-sdk:0.0.4")
-    implementation("de.oliver.FancyAnalytics:logger:0.0.7")
+    implementation("de.oliver.FancyAnalytics:logger:0.0.8")
 }
 
 tasks {