Merge branch 'dev/0.3.x'

Author: Cubxity

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,5 +1,5 @@
 name: Bug Report
-description: Is something now working as it should?
+description: Is something not working as it should?
 labels: [bug]
 body:
 - type: checkboxes

api/build.gradle.kts

@@ -17,8 +17,8 @@
 
 dependencies {
     api(kotlin("stdlib"))
-    api("org.jetbrains.kotlinx", "kotlinx-coroutines-core", "1.5.2")
-    api("org.jetbrains.kotlinx", "kotlinx-serialization-core", "1.2.2")
+    api("org.jetbrains.kotlinx", "kotlinx-coroutines-core", "1.6.0")
+    api("org.jetbrains.kotlinx", "kotlinx-serialization-core", "1.3.2")
 }
 
 java {

build.gradle.kts

@@ -18,17 +18,17 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.5.31" apply false
-    kotlin("kapt") version "1.6.0-RC" apply false
-    id("org.jetbrains.kotlin.plugin.serialization") version "1.5.31" apply false
-    id("com.github.johnrengelman.shadow") version "7.0.0" apply false
+    kotlin("jvm") version "1.6.10" apply false
+    kotlin("kapt") version "1.6.10" apply false
+    kotlin("plugin.serialization") version "1.6.10" apply false
+    id("com.github.johnrengelman.shadow") version "7.1.2" apply false
     id("net.kyori.blossom") version "1.3.0" apply false
 }
 
 allprojects {
     group = "dev.cubxity.plugins"
     description = "Fully featured metrics collector agent for Minecraft servers."
-    version = "0.3.4"
+    version = "0.3.5"
 
     repositories {
         mavenCentral()

common/build.gradle.kts

@@ -19,5 +19,5 @@ apply(plugin = "kotlinx-serialization")
 
 dependencies {
     api(project(":unifiedmetrics-api"))
-    implementation("com.charleskorn.kaml", "kaml", "0.36.0")
+    implementation("com.charleskorn.kaml", "kaml", "0.40.0")
 }

drivers/influx/build.gradle.kts

@@ -19,5 +19,5 @@ apply(plugin = "kotlinx-serialization")
 
 dependencies {
     compileOnly(project(":unifiedmetrics-api"))
-    api("com.influxdb", "influxdb-client-java", "3.3.0")
+    api("com.influxdb", "influxdb-client-java", "4.2.0")
 }

drivers/prometheus/build.gradle.kts

@@ -19,6 +19,6 @@ apply(plugin = "kotlinx-serialization")
 
 dependencies {
     compileOnly(project(":unifiedmetrics-api"))
-    api("io.prometheus", "simpleclient_httpserver", "0.12.0")
-    api("io.prometheus", "simpleclient_pushgateway", "0.12.0")
+    api("io.prometheus", "simpleclient_httpserver", "0.14.1")
+    api("io.prometheus", "simpleclient_pushgateway", "0.14.1")
 }

platforms/fabric/build.gradle.kts

@@ -27,20 +27,20 @@ dependencies {
     modImplementation("net.fabricmc:fabric-loader:0.11.7")
 
     modImplementation("net.fabricmc.fabric-api:fabric-api:0.40.1+1.17")
-    modImplementation("net.fabricmc:fabric-language-kotlin:1.6.5+kotlin.1.5.31")
+    modImplementation("net.fabricmc:fabric-language-kotlin:1.7.1+kotlin.1.6.10")
 
     api(project(":unifiedmetrics-core"))
 
     include(project(":unifiedmetrics-core"))
     include(project(":unifiedmetrics-common"))
-    include("com.charleskorn.kaml:kaml:0.36.0")
-    include("com.charleskorn.kaml:kaml-jvm:0.36.0")
+    include("com.charleskorn.kaml:kaml:0.40.0")
+    include("com.charleskorn.kaml:kaml-jvm:0.40.0")
     include("org.snakeyaml:snakeyaml-engine:2.3")
     include(project(":unifiedmetrics-api"))
     include(project(":unifiedmetrics-driver-influx"))
-    include("com.influxdb:influxdb-client-java:3.3.0")
-    include("com.influxdb:influxdb-client-core:3.3.0")
-    include("com.influxdb:influxdb-client-utils:3.3.0")
+    include("com.influxdb:influxdb-client-java:4.1.0")
+    include("com.influxdb:influxdb-client-core:4.1.0")
+    include("com.influxdb:influxdb-client-utils:4.1.0")
     include("com.google.code.findbugs:jsr305:3.0.2")
     include("com.squareup.retrofit2:retrofit:2.9.0")
     include("com.squareup.okhttp3:okhttp:4.7.2")
@@ -54,13 +54,13 @@ dependencies {
     include("com.squareup.retrofit2:converter-scalars:2.9.0")
     include("com.squareup.retrofit2:converter-gson:2.9.0")
     include(project(":unifiedmetrics-driver-prometheus"))
-    include("io.prometheus:simpleclient_httpserver:0.12.0")
-    include("io.prometheus:simpleclient:0.12.0")
-    include("io.prometheus:simpleclient_tracer_otel:0.12.0")
-    include("io.prometheus:simpleclient_tracer_common:0.12.0")
-    include("io.prometheus:simpleclient_tracer_otel_agent:0.12.0")
-    include("io.prometheus:simpleclient_common:0.12.0")
-    include("io.prometheus:simpleclient_pushgateway:0.12.0")
+    include("io.prometheus:simpleclient_httpserver:0.14.1")
+    include("io.prometheus:simpleclient:0.14.1")
+    include("io.prometheus:simpleclient_tracer_otel:0.14.1")
+    include("io.prometheus:simpleclient_tracer_common:0.14.1")
+    include("io.prometheus:simpleclient_tracer_otel_agent:0.14.1")
+    include("io.prometheus:simpleclient_common:0.14.1")
+    include("io.prometheus:simpleclient_pushgateway:0.14.1")
 }
 
 loom {

platforms/minestom/build.gradle.kts

@@ -27,8 +27,8 @@ repositories {
 dependencies {
     api(project(":unifiedmetrics-core"))
 
-    compileOnly("com.github.Minestom:Minestom:a3ff3b25c4")
-    testImplementation("com.github.Minestom:Minestom:9152c40753")
+    compileOnly("com.github.Minestom:Minestom:2e02dfd4d8")
+    testImplementation("com.github.Minestom:Minestom:2e02dfd4d8")
 }
 
 java {

platforms/minestom/src/main/kotlin/dev/cubxity/plugins/metrics/minestom/metric/tick/TickCollection.kt

@@ -25,28 +25,28 @@ import dev.cubxity.plugins.metrics.api.metric.store.VolatileDoubleStore
 import dev.cubxity.plugins.metrics.api.metric.store.VolatileLongStore
 import dev.cubxity.plugins.metrics.common.metric.Metrics
 import net.minestom.server.MinecraftServer
-import net.minestom.server.monitoring.TickMonitor
-import java.util.function.Consumer
+import net.minestom.server.event.EventListener
+import net.minestom.server.event.server.ServerTickMonitorEvent
 
-class TickCollection : Consumer<TickMonitor>, CollectorCollection {
+class TickCollection : CollectorCollection {
     // The callback is called from a single thread
     private val tickDuration = Histogram(
         Metrics.Server.TickDurationSeconds,
         sumStoreFactory = VolatileDoubleStore,
         countStoreFactory = VolatileLongStore
     )
 
+    private val listener = EventListener.of(ServerTickMonitorEvent::class.java) { event ->
+        tickDuration += event.tickMonitor.tickTime / MILLISECONDS_PER_SECOND
+    }
+
     override val collectors: List<Collector> = listOf(tickDuration)
 
     override fun initialize() {
-        MinecraftServer.getUpdateManager().addTickMonitor(this)
+        MinecraftServer.getGlobalEventHandler().addListener(listener)
     }
 
     override fun dispose() {
-        MinecraftServer.getUpdateManager().removeTickMonitor(this)
-    }
-
-    override fun accept(monitor: TickMonitor) {
-        tickDuration += monitor.tickTime / MILLISECONDS_PER_SECOND
+        MinecraftServer.getGlobalEventHandler().removeListener(listener)
     }
 }