From e719e837d48995d7c72de52bb0fdb978b3d589b5 Mon Sep 17 00:00:00 2001 From: Tim203 Date: Sat, 24 Aug 2024 17:58:18 +0200 Subject: [PATCH] We don't have to relocate bstats --- core/common/build.gradle.kts | 3 --- .../main/java/org/geysermc/floodgate/core/util/Metrics.java | 3 ++- gradle/libs.versions.toml | 2 +- settings.gradle.kts | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts index 0276e63c..ec4940bd 100644 --- a/core/common/build.gradle.kts +++ b/core/common/build.gradle.kts @@ -40,9 +40,6 @@ dependencies { providedDependency(libs.slf4j) -// we're isolated but bstats doesn't know that -relocate("org.bstats") - tasks { templateSources { replaceToken("fullVersion", fullVersion()) diff --git a/core/common/src/main/java/org/geysermc/floodgate/core/util/Metrics.java b/core/common/src/main/java/org/geysermc/floodgate/core/util/Metrics.java index 349deca7..7931cf3e 100644 --- a/core/common/src/main/java/org/geysermc/floodgate/core/util/Metrics.java +++ b/core/common/src/main/java/org/geysermc/floodgate/core/util/Metrics.java @@ -74,7 +74,8 @@ public final class Metrics { logger::info, Constants.DEBUG_MODE, Constants.DEBUG_MODE, - Constants.DEBUG_MODE + Constants.DEBUG_MODE, + true // we're running isolated. No need to check for relocation ); metricsBase.addCustomChart( diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3077f7dc..d5417270 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,7 @@ database-utils = "1.0-SNAPSHOT" fastutil = "8.5.3" cloud = "2.0.0-beta.2" snakeyaml = "2.0" -bstats = "3.0.2" +bstats = "3.0.3" adventure = "4.16.0" adventure-platform = "4.3.2" diff --git a/settings.gradle.kts b/settings.gradle.kts index c535d997..802bb272 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -55,7 +55,6 @@ rootProject.name = "floodgate-parent" include(":api") include(":universal") -//include(":database") include(":isolation") arrayOf("common", "netty4").forEach {