From 8d394df1d60f91331c267706296c30dfd5690a04 Mon Sep 17 00:00:00 2001 From: ineanto Date: Sun, 8 Jun 2025 09:39:26 +0200 Subject: [PATCH] refactor: move prompt package --- .../nicko/gui/items/appearance/ChangeBothItem.java | 2 +- .../nicko/gui/items/appearance/ChangeNameItem.java | 2 +- .../nicko/gui/items/appearance/ChangeSkinItem.java | 2 +- .../java/xyz/ineanto/nicko/{gui => }/prompt/Prompt.java | 4 ++-- .../xyz/ineanto/nicko/{gui => }/prompt/PromptManager.java | 4 ++-- .../ineanto/nicko/{gui => }/prompt/anvil/AnvilPrompt.java | 8 ++++---- .../{gui => }/prompt/conversation/ConversationPrompt.java | 4 ++-- .../xyz/ineanto/nicko/storage/mariadb/MariaDBStorage.java | 1 - 8 files changed, 13 insertions(+), 14 deletions(-) rename src/main/java/xyz/ineanto/nicko/{gui => }/prompt/Prompt.java (97%) rename src/main/java/xyz/ineanto/nicko/{gui => }/prompt/PromptManager.java (81%) rename src/main/java/xyz/ineanto/nicko/{gui => }/prompt/anvil/AnvilPrompt.java (95%) rename src/main/java/xyz/ineanto/nicko/{gui => }/prompt/conversation/ConversationPrompt.java (96%) diff --git a/src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeBothItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeBothItem.java index 5a70c4f..730e667 100644 --- a/src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeBothItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeBothItem.java @@ -3,7 +3,7 @@ package xyz.ineanto.nicko.gui.items.appearance; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; -import xyz.ineanto.nicko.gui.prompt.PromptManager; +import xyz.ineanto.nicko.prompt.PromptManager; import xyz.ineanto.nicko.language.LanguageKey; import xyz.ineanto.nicko.language.PlayerLanguage; import xyz.xenondevs.invui.item.builder.ItemBuilder; diff --git a/src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeNameItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeNameItem.java index e18643a..c67b848 100644 --- a/src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeNameItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeNameItem.java @@ -3,7 +3,7 @@ package xyz.ineanto.nicko.gui.items.appearance; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; -import xyz.ineanto.nicko.gui.prompt.PromptManager; +import xyz.ineanto.nicko.prompt.PromptManager; import xyz.ineanto.nicko.language.LanguageKey; import xyz.ineanto.nicko.language.PlayerLanguage; import xyz.xenondevs.invui.item.builder.ItemBuilder; diff --git a/src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeSkinItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeSkinItem.java index 20c4a22..298e0ea 100644 --- a/src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeSkinItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeSkinItem.java @@ -4,7 +4,7 @@ import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import xyz.ineanto.nicko.Nicko; -import xyz.ineanto.nicko.gui.prompt.PromptManager; +import xyz.ineanto.nicko.prompt.PromptManager; import xyz.ineanto.nicko.language.LanguageKey; import xyz.ineanto.nicko.language.PlayerLanguage; import xyz.ineanto.nicko.storage.name.PlayerNameStore; diff --git a/src/main/java/xyz/ineanto/nicko/gui/prompt/Prompt.java b/src/main/java/xyz/ineanto/nicko/prompt/Prompt.java similarity index 97% rename from src/main/java/xyz/ineanto/nicko/gui/prompt/Prompt.java rename to src/main/java/xyz/ineanto/nicko/prompt/Prompt.java index e5a7267..5940993 100644 --- a/src/main/java/xyz/ineanto/nicko/gui/prompt/Prompt.java +++ b/src/main/java/xyz/ineanto/nicko/prompt/Prompt.java @@ -1,4 +1,4 @@ -package xyz.ineanto.nicko.gui.prompt; +package xyz.ineanto.nicko.prompt; import org.bukkit.Sound; import org.bukkit.entity.Player; @@ -50,7 +50,7 @@ public abstract class Prompt { final ActionResult actionResult = appearanceManager.update(skinChange); if (!actionResult.isError()) { player.sendMessage(playerLanguage.translateWithWhoosh(LanguageKey.Event.Appearance.Set.OK)); - player.playSound(player.getLocation(), Sound.BLOCK_WOODEN_BUTTON_CLICK_ON, 1, 1f); + player.playSound(player.getLocation(), Sound.BLOCK_WOODEN_BUTTON_CLICK_ON, 1f, 1f); } else { player.sendMessage( playerLanguage.translateWithOops( diff --git a/src/main/java/xyz/ineanto/nicko/gui/prompt/PromptManager.java b/src/main/java/xyz/ineanto/nicko/prompt/PromptManager.java similarity index 81% rename from src/main/java/xyz/ineanto/nicko/gui/prompt/PromptManager.java rename to src/main/java/xyz/ineanto/nicko/prompt/PromptManager.java index 323b51c..bbd5a9e 100644 --- a/src/main/java/xyz/ineanto/nicko/gui/prompt/PromptManager.java +++ b/src/main/java/xyz/ineanto/nicko/prompt/PromptManager.java @@ -1,7 +1,7 @@ -package xyz.ineanto.nicko.gui.prompt; +package xyz.ineanto.nicko.prompt; import org.bukkit.entity.Player; -import xyz.ineanto.nicko.gui.prompt.conversation.ConversationPrompt; +import xyz.ineanto.nicko.prompt.conversation.ConversationPrompt; public class PromptManager { private final Prompt prompt; diff --git a/src/main/java/xyz/ineanto/nicko/gui/prompt/anvil/AnvilPrompt.java b/src/main/java/xyz/ineanto/nicko/prompt/anvil/AnvilPrompt.java similarity index 95% rename from src/main/java/xyz/ineanto/nicko/gui/prompt/anvil/AnvilPrompt.java rename to src/main/java/xyz/ineanto/nicko/prompt/anvil/AnvilPrompt.java index 91d4e28..85e6d28 100644 --- a/src/main/java/xyz/ineanto/nicko/gui/prompt/anvil/AnvilPrompt.java +++ b/src/main/java/xyz/ineanto/nicko/prompt/anvil/AnvilPrompt.java @@ -1,4 +1,4 @@ -package xyz.ineanto.nicko.gui.prompt.anvil; +package xyz.ineanto.nicko.prompt.anvil; import net.kyori.adventure.text.Component; import net.wesjd.anvilgui.AnvilGUI; @@ -7,15 +7,15 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import xyz.ineanto.nicko.Nicko; -import xyz.ineanto.nicko.gui.prompt.Prompt; +import xyz.ineanto.nicko.prompt.Prompt; import xyz.ineanto.nicko.language.LanguageKey; import xyz.ineanto.nicko.mojang.MojangUtils; import java.util.Collections; /** - * This is currently unused, I'm waiting for AnvilGUI - * to be updated to compile with Paper mappings. + * This is currently unused, I'm waiting on AnvilGUI + * to be compiled against Paper mappings. */ // TODO (Ineanto, 16/05/2025): Do some validation on the inputs public class AnvilPrompt extends Prompt { diff --git a/src/main/java/xyz/ineanto/nicko/gui/prompt/conversation/ConversationPrompt.java b/src/main/java/xyz/ineanto/nicko/prompt/conversation/ConversationPrompt.java similarity index 96% rename from src/main/java/xyz/ineanto/nicko/gui/prompt/conversation/ConversationPrompt.java rename to src/main/java/xyz/ineanto/nicko/prompt/conversation/ConversationPrompt.java index 7106225..701ce6c 100644 --- a/src/main/java/xyz/ineanto/nicko/gui/prompt/conversation/ConversationPrompt.java +++ b/src/main/java/xyz/ineanto/nicko/prompt/conversation/ConversationPrompt.java @@ -1,4 +1,4 @@ -package xyz.ineanto.nicko.gui.prompt.conversation; +package xyz.ineanto.nicko.prompt.conversation; import org.bukkit.conversations.ConversationContext; import org.bukkit.conversations.ConversationFactory; @@ -7,7 +7,7 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import xyz.ineanto.nicko.Nicko; -import xyz.ineanto.nicko.gui.prompt.Prompt; +import xyz.ineanto.nicko.prompt.Prompt; import xyz.ineanto.nicko.language.LanguageKey; import java.util.Map; diff --git a/src/main/java/xyz/ineanto/nicko/storage/mariadb/MariaDBStorage.java b/src/main/java/xyz/ineanto/nicko/storage/mariadb/MariaDBStorage.java index 27fcc26..6bc9c43 100644 --- a/src/main/java/xyz/ineanto/nicko/storage/mariadb/MariaDBStorage.java +++ b/src/main/java/xyz/ineanto/nicko/storage/mariadb/MariaDBStorage.java @@ -100,7 +100,6 @@ public class MariaDBStorage extends Storage { favorites = gson.fromJson(resultSet.getString("favorites"), new TypeToken>() { }.getType()); } - // TODO (Ineanto, 17/05/2025): Retrieve favorites final NickoProfile profile = new NickoProfile(new Appearance(name, skin), Language.fromCode(locale), randomSkin, favorites); return Optional.of(profile); } catch (SQLException e) {