fix: bump HMCColor & implement API-changes

HibiscusMC · Jan 14, 2024 · 485f583 · 485f583
1 parent 442cddb
commit 485f583
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.hibiscusmc"
-version = "2.7.0"
+version = "2.7.1"
 
 allprojects {
     apply(plugin = "java")

diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java
@@ -113,9 +113,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
                         if (!textColor.contains("#") && Hooks.isActiveHook("HMCColor")) {
                             HMCColorConfig.Colors colors = HMCColorContextKt.getHmcColor().getConfig().getColors().get(textColor);
                             if (colors != null) {
-                                String hmccolor = colors.getBaseColor().getColor();
-                                if (hmccolor.contains("#")) color = HMCCServerUtils.hex2Rgb(hmccolor);
-                                else color = HMCCServerUtils.rgbToRgb(hmccolor);
+                                color = colors.getBaseColor().getColor();
                             }
                         } else {
                             color = HMCCServerUtils.hex2Rgb(textColor);

diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java
@@ -31,7 +31,7 @@ public static void openMenu(@NotNull CosmeticUser user, Cosmetic cosmetic) {
         ItemStack originalItem = user.getUserCosmeticItem(cosmetic);
         if (originalItem == null || !cosmetic.isDyable()) return;
 
-        Gui gui = HMCColorApi.INSTANCE.colorMenu(player);
+        Gui gui = HMCColorApi.createColorMenu(player);
         gui.updateTitle(Hooks.processPlaceholders(player, Settings.getDyeMenuName()));
         gui.setItem(Settings.getDyeMenuInputSlot(), new GuiItem(originalItem));
         gui.setDefaultTopClickAction(event -> {

diff --git a/lib/HMCColor-0.8.5-all.jar b/lib/HMCColor-0.8.5-all.jar
diff --git a/lib/HMCColor-0.8.6.jar b/lib/HMCColor-0.8.6.jar