diff --git a/libraries/common/build.gradle.kts b/libraries/common/build.gradle.kts index 7f19ea9d..8b84188e 100644 --- a/libraries/common/build.gradle.kts +++ b/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") diff --git a/libraries/common/src/main/java/de/oliver/fancylib/logging/PluginMiddleware.java b/libraries/common/src/main/java/de/oliver/fancylib/logging/PluginMiddleware.java new file mode 100644 index 00000000..d976bd18 --- /dev/null +++ b/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; + } + +} diff --git a/libraries/config/build.gradle.kts b/libraries/config/build.gradle.kts index cf2304df..f2f016c9 100644 --- a/libraries/config/build.gradle.kts +++ b/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") diff --git a/libraries/packets/build.gradle.kts b/libraries/packets/build.gradle.kts index 51feab45..070eb2b2 100644 --- a/libraries/packets/build.gradle.kts +++ b/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 { diff --git a/libraries/packets/packets-api/build.gradle.kts b/libraries/packets/packets-api/build.gradle.kts index 944e4ec9..3656e60b 100644 --- a/libraries/packets/packets-api/build.gradle.kts +++ b/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 { diff --git a/libraries/packets/test-plugin/build.gradle.kts b/libraries/packets/test-plugin/build.gradle.kts index 442b13ae..b39f6d71 100644 --- a/libraries/packets/test-plugin/build.gradle.kts +++ b/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 { diff --git a/plugins/fancydialogs/build.gradle.kts b/plugins/fancydialogs/build.gradle.kts index 72d8d9cc..823a391b 100644 --- a/plugins/fancydialogs/build.gradle.kts +++ b/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:logger:0.0.7") + implementation("de.oliver.FancyAnalytics:mc-api:0.1.11") + implementation("de.oliver.FancyAnalytics:logger:0.0.8") compileOnly(project(":plugins:fancynpcs:fn-api")) compileOnly("org.lushplugins:ChatColorHandler:6.0.0") diff --git a/plugins/fancydialogs/fd-api/build.gradle.kts b/plugins/fancydialogs/fd-api/build.gradle.kts index c1d327d9..4d5b6bcc 100644 --- a/plugins/fancydialogs/fd-api/build.gradle.kts +++ b/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") diff --git a/plugins/fancyholograms-v2/api/build.gradle.kts b/plugins/fancyholograms-v2/api/build.gradle.kts index c347bf5c..9eed58fb 100644 --- a/plugins/fancyholograms-v2/api/build.gradle.kts +++ b/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") } diff --git a/plugins/fancyholograms-v2/build.gradle.kts b/plugins/fancyholograms-v2/build.gradle.kts index 96e2fc46..ed3b12bd 100644 --- a/plugins/fancyholograms-v2/build.gradle.kts +++ b/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:logger:0.0.7") + implementation("de.oliver.FancyAnalytics:mc-api:0.1.11") + implementation("de.oliver.FancyAnalytics:logger:0.0.8") compileOnly(project(":plugins:fancynpcs:fn-api")) compileOnly("org.lushplugins:ChatColorHandler:6.0.0") diff --git a/plugins/fancyholograms/build.gradle.kts b/plugins/fancyholograms/build.gradle.kts index b2a17e03..76165b1b 100644 --- a/plugins/fancyholograms/build.gradle.kts +++ b/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:logger:0.0.7") + implementation("de.oliver.FancyAnalytics:mc-api:0.1.11") + 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") diff --git a/plugins/fancyholograms/fh-api/build.gradle.kts b/plugins/fancyholograms/fh-api/build.gradle.kts index c09c31fd..73475050 100644 --- a/plugins/fancyholograms/fh-api/build.gradle.kts +++ b/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") } diff --git a/plugins/fancynpcs/build.gradle.kts b/plugins/fancynpcs/build.gradle.kts index 78cd0f94..c6a054d2 100644 --- a/plugins/fancynpcs/build.gradle.kts +++ b/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:logger:0.0.7") + implementation("de.oliver.FancyAnalytics:mc-api:0.1.11") + 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") diff --git a/plugins/fancynpcs/fn-api/build.gradle.kts b/plugins/fancynpcs/fn-api/build.gradle.kts index 264665c4..906fffb3 100644 --- a/plugins/fancynpcs/fn-api/build.gradle.kts +++ b/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") } diff --git a/plugins/fancyvisuals/build.gradle.kts b/plugins/fancyvisuals/build.gradle.kts index 09ed5a2e..8ef57b0e 100644 --- a/plugins/fancyvisuals/build.gradle.kts +++ b/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:logger:0.0.7") // loaded in FancyVisualLoader + compileOnly("de.oliver.FancyAnalytics:mc-api:0.1.11") // 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") diff --git a/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/loaders/FancyVisualsLoader.java b/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/loaders/FancyVisualsLoader.java index 13517061..d9edaf25 100644 --- a/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/loaders/FancyVisualsLoader.java +++ b/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:logger:0.0.7"), "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.8"), "compile")); classpathBuilder.addLibrary(resolver); } diff --git a/tools/deployment/build.gradle.kts b/tools/deployment/build.gradle.kts index a84995a6..f6bf6f79 100644 --- a/tools/deployment/build.gradle.kts +++ b/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 { diff --git a/tools/quick-e2e/build.gradle.kts b/tools/quick-e2e/build.gradle.kts index f9875fb0..2c10e3e3 100644 --- a/tools/quick-e2e/build.gradle.kts +++ b/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 {