diff --git a/build.gradle.kts b/build.gradle.kts index e878b8db..0261da96 100644 --- 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 index 83f701c2..8de84420 100644 --- 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 class CosmeticCommand implements CommandExecutor { 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 index 03824bae..dfc50dd6 100644 --- 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 class DyeMenu { 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 deleted file mode 100644 index 2c3f3764..00000000 Binary files a/lib/HMCColor-0.8.5-all.jar and /dev/null differ diff --git a/lib/HMCColor-0.8.6.jar b/lib/HMCColor-0.8.6.jar new file mode 100644 index 00000000..a5e4b23a Binary files /dev/null and b/lib/HMCColor-0.8.6.jar differ