From 1212ab2025da5f78723d35aa14fd6b98e8b47a80 Mon Sep 17 00:00:00 2001 From: lojosho Date: Tue, 18 Mar 2025 20:42:23 -0500 Subject: [PATCH] chore: update to latest HibiscusCommons; getNMSVersion api adjusted to new enums --- build.gradle.kts | 2 +- .../com/hibiscusmc/hmccosmetics/api/HMCCosmeticsAPI.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8757c67a..d943eb68 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -86,7 +86,7 @@ allprojects { compileOnly("io.github.toxicity188:BetterCommand:1.3") //BetterCommand library //compileOnly("it.unimi.dsi:fastutil:8.5.14") compileOnly("org.projectlombok:lombok:1.18.34") - compileOnly("me.lojosho:HibiscusCommons:0.6.0-85d65299") + compileOnly("me.lojosho:HibiscusCommons:0.6.2-d21ebed8") // Handled by Spigot Library Loader compileOnly("net.kyori:adventure-api:4.19.0") diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/HMCCosmeticsAPI.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/HMCCosmeticsAPI.java index cada36ac..97b8e090 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/HMCCosmeticsAPI.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/HMCCosmeticsAPI.java @@ -10,6 +10,7 @@ import com.hibiscusmc.hmccosmetics.gui.Menus; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.user.CosmeticUserProvider; import com.hibiscusmc.hmccosmetics.user.CosmeticUsers; +import me.lojosho.hibiscuscommons.nms.MinecraftVersion; import me.lojosho.hibiscuscommons.nms.NMSHandlers; import me.lojosho.shaded.configurate.ConfigurationNode; import org.bukkit.Color; @@ -200,7 +201,9 @@ public final class HMCCosmeticsAPI { * @return the NMS version of the server in string format, or {@code null} if setup is not complete. */ public static @Nullable String getNMSVersion() { - return NMSHandlers.getVersion(); + MinecraftVersion version = NMSHandlers.getVersion(); + if (version == null) return null; + return version.toVersionString(); } /**