From b2b645a89b7d6afa8d5f7da0394adfbc59459992 Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Fri, 9 Dec 2022 10:01:43 -0600 Subject: [PATCH] Dyeable Menu Title configurable --- .../com/hibiscusmc/hmccosmetics/config/Settings.java | 11 +++++++++++ .../hibiscusmc/hmccosmetics/gui/special/DyeMenu.java | 11 ++--------- common/src/main/resources/config.yml | 4 +++- 3 files changed, 16 insertions(+), 10 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 52a59c6e..28799f12 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Settings.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Settings.java @@ -21,8 +21,11 @@ public class Settings { private static final transient String LOOK_DOWN_PITCH_PATH = "look-down-backpack-remove"; private static final String VIEW_DISTANCE_PATH = "view-distance"; 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 String defaultMenu; + private static String dyeMenuName; private static int configVersion; private static boolean requireEmptyHelmet; private static boolean requireEmptyOffHand; @@ -61,6 +64,10 @@ public class Settings { final var balloonSection = cosmeticSettings.node(BALLOON_OFFSET); balloonOffset = loadVector(balloonSection); + + ConfigurationNode dyeMenuSettings = source.node(DYE_MENU_PATH); + + dyeMenuName = dyeMenuSettings.node(DYE_MENU_NAME).getString("Dye Menu"); } private static Vector loadVector(final ConfigurationNode config) { @@ -108,4 +115,8 @@ public class Settings { public static int getConfigVersion() { return configVersion; } + + public static String getDyeMenuName() { + return dyeMenuName; + } } 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 b36e04a7..1b9b165e 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 @@ -3,15 +3,10 @@ package com.hibiscusmc.hmccosmetics.gui.special; import com.hibiscusmc.hmccolor.HMCColorApi; import com.hibiscusmc.hmccolor.gui.guis.Gui; import com.hibiscusmc.hmccolor.gui.guis.GuiItem; +import com.hibiscusmc.hmccosmetics.config.Settings; import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic; -import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType; -import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; -import com.hibiscusmc.hmccosmetics.user.CosmeticUsers; -import com.hibiscusmc.hmccosmetics.util.misc.Adventure; import com.hibiscusmc.hmccosmetics.util.misc.Placeholder; -import dev.triumphteam.gui.builder.item.ItemBuilder; -import net.kyori.adventure.text.Component; import org.bukkit.Color; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -19,8 +14,6 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.LeatherArmorMeta; import org.bukkit.inventory.meta.PotionMeta; -import java.util.Objects; - public class DyeMenu { // Yes, I do know how tacted on this feels. @@ -34,7 +27,7 @@ public class DyeMenu { Player player = user.getPlayer(); HMCColorApi hmcColorApi = new HMCColorApi(); Gui gui = hmcColorApi.getColorMenu(); - gui.updateTitle(Placeholder.applyPapiPlaceholders(player, "Dyeing Menu")); + gui.updateTitle(Placeholder.applyPapiPlaceholders(player, Settings.getDyeMenuName())); gui.setItem(19, new GuiItem(originalItem)); gui.setDefaultTopClickAction(event -> { if (event.getSlot() == 25) { diff --git a/common/src/main/resources/config.yml b/common/src/main/resources/config.yml index b7955a06..860b0fc4 100644 --- a/common/src/main/resources/config.yml +++ b/common/src/main/resources/config.yml @@ -3,7 +3,7 @@ # config-version: 1 -default-menu: main +default-menu: examplemenu database-settings: type: INTERNAL # INTERNAL, MYSQL mysql: @@ -28,6 +28,8 @@ cosmetic-settings: x: 0.5 y: 3 z: 0.5 +dye-menu: + title: "Dye menu" wardrobe: # spawn static wardrobe if in this radius of wardrobe-location static-radius: 10