From 7a9a002e2575b0f3be762ad7308b4609f39a3abc Mon Sep 17 00:00:00 2001 From: Boy Date: Wed, 15 Feb 2023 12:55:49 +0100 Subject: [PATCH 1/4] make dye menu slots configurable --- .../java/com/hibiscusmc/hmccosmetics/config/Settings.java | 8 ++++++++ .../com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java | 6 +++--- common/src/main/resources/config.yml | 4 +++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Settings.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Settings.java index 60a54443..fb31b4a0 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Settings.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Settings.java @@ -25,6 +25,8 @@ public class Settings { private static final String PARTICLE_COUNT = "particle-count"; private static final String DYE_MENU_PATH = "dye-menu"; private static final String DYE_MENU_NAME = "title"; + private static final String DYE_MENU_INPUT_SLOT = "input-slot"; + private static final String DYE_MENU_OUTPUT_SLOT = "output-slot"; private static final String DEBUG_ENABLE_PETH = "debug-mode"; private static final String TICK_PERIOD_PATH = "tick-period"; private static final String UNAPPLY_DEATH_PATH = "unapply-on-death"; @@ -33,6 +35,8 @@ public class Settings { private static String defaultMenu; private static String dyeMenuName; + private static int dyeMenuInputSlot; + private static int dyeMenuOutputSlot; private static int configVersion; private static boolean requireEmptyHelmet; private static boolean requireEmptyOffHand; @@ -85,6 +89,8 @@ public class Settings { ConfigurationNode dyeMenuSettings = source.node(DYE_MENU_PATH); dyeMenuName = dyeMenuSettings.node(DYE_MENU_NAME).getString("Dye Menu"); + dyeMenuInputSlot = dyeMenuSettings.node(DYE_MENU_INPUT_SLOT).getInt(19); + dyeMenuOutputSlot = dyeMenuSettings.node(DYE_MENU_OUTPUT_SLOT).getInt(25); } private static Vector loadVector(final ConfigurationNode config) { @@ -178,6 +184,8 @@ public class Settings { public static String getDyeMenuName() { return dyeMenuName; } + public static int getDyeMenuInputSlot() { return dyeMenuInputSlot; } + public static int getDyeMenuOutputSlot() { return dyeMenuOutputSlot; } public static boolean isDebugEnabled() { return debugMode; 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 e395e1e6..2ea1681c 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 @@ -30,10 +30,10 @@ public class DyeMenu { Player player = user.getPlayer(); Gui gui = HMCColorApi.INSTANCE.colorMenu(); gui.updateTitle(Placeholder.applyPapiPlaceholders(player, Settings.getDyeMenuName())); - gui.setItem(19, new GuiItem(originalItem)); + gui.setItem(Settings.getDyeMenuInputSlot(), new GuiItem(originalItem)); gui.setDefaultTopClickAction(event -> { - if (event.getSlot() == 25) { - ItemStack item = event.getInventory().getItem(25); + if (event.getSlot() == Settings.getDyeMenuOutputSlot()) { + ItemStack item = event.getInventory().getItem(Settings.getDyeMenuOutputSlot()); if (item == null) return; ItemMeta meta = item.getItemMeta(); if (meta == null) return; diff --git a/common/src/main/resources/config.yml b/common/src/main/resources/config.yml index 95f31134..bf181d14 100644 --- a/common/src/main/resources/config.yml +++ b/common/src/main/resources/config.yml @@ -38,6 +38,8 @@ dye-menu: # If you use ItemsAdder, set this to "§f:offset_-8::cosmetics_gui:" # If you use Oraxen, set this to "" title: "§f" + input-slot: 19 + output-slot: 25 wardrobe: # spawn static wardrobe if in this radius of wardrobe-location static-radius: 10 @@ -81,4 +83,4 @@ wardrobe: y: 5 z: 5 yaw: 0 - pitch: 0 \ No newline at end of file + pitch: 0 From 63a0bdd0d50312134936ea5c10ceca49f509a56e Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Wed, 15 Feb 2023 16:58:47 -0600 Subject: [PATCH 2/4] Fix for PAPI in menus --- .../main/java/com/hibiscusmc/hmccosmetics/hooks/Hooks.java | 5 +++-- .../hmccosmetics/hooks/placeholders/HookPlaceholderAPI.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/Hooks.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/Hooks.java index adc55a12..b3da5227 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/Hooks.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/Hooks.java @@ -66,7 +66,8 @@ public class Hooks { } public static boolean isActiveHook(String id) { - if (!hooks.containsKey(getHook(id))) return false; - return hooks.get(getHook(id)).getActive(); + Hook hook = getHook(id); + if (hook == null) return false; + return hook.getActive(); } } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HookPlaceholderAPI.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HookPlaceholderAPI.java index 94e3f739..00606171 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HookPlaceholderAPI.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HookPlaceholderAPI.java @@ -5,7 +5,7 @@ import com.hibiscusmc.hmccosmetics.hooks.Hook; public class HookPlaceholderAPI extends Hook { public HookPlaceholderAPI() { - super("placeholderapi"); + super("PlaceholderAPI"); } @Override From f589696d1988750829e5c83fd07168242fcdbe4b Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Thu, 16 Feb 2023 14:43:28 -0600 Subject: [PATCH 3/4] update paper userdev --- common/settings.gradle.kts | 7 ------- settings.gradle.kts | 6 ------ v1_17_R1/build.gradle.kts | 2 +- v1_18_R2/build.gradle.kts | 2 +- v1_19_R1/build.gradle.kts | 2 +- v1_19_R2/build.gradle.kts | 2 +- 6 files changed, 4 insertions(+), 17 deletions(-) diff --git a/common/settings.gradle.kts b/common/settings.gradle.kts index eaf251fb..47f1ba50 100644 --- a/common/settings.gradle.kts +++ b/common/settings.gradle.kts @@ -1,8 +1 @@ -pluginManagement { - repositories { - gradlePluginPortal() - maven("https://repo.papermc.io/repository/maven-public/") - } -} - rootProject.name = "HMCCosmetics" \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index d9de656a..fe603d7c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,9 +1,3 @@ -pluginManagement { - repositories { - gradlePluginPortal() - maven("https://repo.papermc.io/repository/maven-public/") - } -} rootProject.name = "HMCCosmetics" include( "common", diff --git a/v1_17_R1/build.gradle.kts b/v1_17_R1/build.gradle.kts index d81b64be..765d00ad 100644 --- a/v1_17_R1/build.gradle.kts +++ b/v1_17_R1/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("java") - id("io.papermc.paperweight.userdev") version "1.3.8" + id("io.papermc.paperweight.userdev") version "1.5.1" } dependencies { diff --git a/v1_18_R2/build.gradle.kts b/v1_18_R2/build.gradle.kts index 90085440..46f076c6 100644 --- a/v1_18_R2/build.gradle.kts +++ b/v1_18_R2/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("java") - id("io.papermc.paperweight.userdev") version "1.3.8" + id("io.papermc.paperweight.userdev") version "1.5.1" } dependencies { diff --git a/v1_19_R1/build.gradle.kts b/v1_19_R1/build.gradle.kts index bbb69606..88a2994c 100644 --- a/v1_19_R1/build.gradle.kts +++ b/v1_19_R1/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("java") - id("io.papermc.paperweight.userdev") version "1.3.8" + id("io.papermc.paperweight.userdev") version "1.5.1" } dependencies { diff --git a/v1_19_R2/build.gradle.kts b/v1_19_R2/build.gradle.kts index 37d9fadb..ee619fa8 100644 --- a/v1_19_R2/build.gradle.kts +++ b/v1_19_R2/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("java") - id("io.papermc.paperweight.userdev") version "1.3.8" + id("io.papermc.paperweight.userdev") version "1.5.1" } dependencies { From 17179cbe353176afe4d8e2af37864d19a2d18d12 Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Thu, 16 Feb 2023 14:44:54 -0600 Subject: [PATCH 4/4] version bump (2.2.1) --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index e1461c49..1359f24d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "com.hibiscusmc" -version = "2.2.0" +version = "2.2.1" allprojects { apply(plugin = "java")