Fix plugin not loading correctly

eldoriarpg · Jun 30, 2024 · bd0a2ec · bd0a2ec
1 parent f22fc65
commit bd0a2ec
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/BloodNight-core/build.gradle.kts b/BloodNight-core/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 
 dependencies {
     implementation(project(":BloodNight-api"))
+    implementation("org.bstats", "bstats-bukkit", "3.0.2")
     bukkitLibrary(libs.bundles.eldoutil)
     bukkitLibrary("net.kyori", "adventure-platform-bukkit", "4.3.3")
     testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.10.3")
@@ -49,6 +50,7 @@ publishing {
 
 tasks {
     shadowJar {
+        relocate("org.bstats", "de.eldoria.bloodnight.libs.bstats")
         mergeServiceFiles()
         archiveBaseName.set(project.parent?.name)
     }

diff --git a/BloodNight-core/src/main/java/de/eldoria/bloodnight/core/BloodNight.java b/BloodNight-core/src/main/java/de/eldoria/bloodnight/core/BloodNight.java
@@ -42,9 +42,11 @@
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextDecoration;
 import net.kyori.adventure.text.minimessage.tag.Tag;
+import org.bstats.bukkit.Metrics;
 import org.bstats.charts.MultiLineChart;
 import org.bukkit.NamespacedKey;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
+import org.bukkit.configuration.serialization.ConfigurationSerialization;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -179,6 +181,7 @@ private void registerListener() {
 
     @Override
     public List<Class<? extends ConfigurationSerializable>> getConfigSerialization() {
+        ConfigurationSerialization.registerClass(MapEntry.class);
         return Arrays.asList(GeneralSettings.class, NightSelection.class, NightSettings.class, MobSettings.class,
                 MobSetting.class, VanillaMobSettings.class, WorldSettings.class, Drop.class, BossBarSettings.class,
                 MobSettings.MobTypes.class, SoundSettings.class, SoundEntry.class, PotionEffectSettings.class,
@@ -187,8 +190,8 @@ public List<Class<? extends ConfigurationSerializable>> getConfigSerialization()
     }
 
     private void enableMetrics() {
-        EldoMetrics metrics = new EldoMetrics(this, 9123);
-        if (metrics.isEnabled()) {
+        Metrics metrics = new Metrics(this, 9123);
+        if (EldoMetrics.isEnabled(this)) {
             logger().info("§2Metrics enabled. Thank you! (> ^_^ )>");
 
             metrics.addCustomChart(new MultiLineChart("update_settings", () -> {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -12,7 +12,7 @@ pluginManagement {
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
-            version("eldoutil", "2.0.10")
+            version("eldoutil", "2.0.11")
             library("eldoutil.core", "de.eldoria.util", "core").versionRef("eldoutil")
             library("eldoutil.updater", "de.eldoria.util", "updater").versionRef("eldoutil")
             library("eldoutil.messaging", "de.eldoria.util", "messaging").versionRef("eldoutil")