ineanto/nicko
1
0
Fork 0
Code Issues Pull requests Activity

refactor: move prompt package

Browse source
This commit is contained in:
ineanto 2025-06-08 09:39:26 +02:00
parent 666c45735d
commit 8d394df1d6
Signed by: ineanto
GPG key ID: E511F9CAA2F9CE84
8 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeBothItem.java
View file

@ -3,7 +3,7 @@ package xyz.ineanto.nicko.gui.items.appearance;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType; 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.LanguageKey;
import xyz.ineanto.nicko.language.PlayerLanguage; import xyz.ineanto.nicko.language.PlayerLanguage;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;

2
src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeNameItem.java
View file

@ -3,7 +3,7 @@ package xyz.ineanto.nicko.gui.items.appearance;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType; 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.LanguageKey;
import xyz.ineanto.nicko.language.PlayerLanguage; import xyz.ineanto.nicko.language.PlayerLanguage;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;

2
src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeSkinItem.java
View file

@ -4,7 +4,7 @@ import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.ClickType;
import xyz.ineanto.nicko.Nicko; 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.LanguageKey;
import xyz.ineanto.nicko.language.PlayerLanguage; import xyz.ineanto.nicko.language.PlayerLanguage;
import xyz.ineanto.nicko.storage.name.PlayerNameStore; import xyz.ineanto.nicko.storage.name.PlayerNameStore;

4
src/main/java/xyz/ineanto/nicko/gui/prompt/Prompt.java → src/main/java/xyz/ineanto/nicko/prompt/Prompt.java
View file

@ -1,4 +1,4 @@
package xyz.ineanto.nicko.gui.prompt; package xyz.ineanto.nicko.prompt;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -50,7 +50,7 @@ public abstract class Prompt {
final ActionResult actionResult = appearanceManager.update(skinChange); final ActionResult actionResult = appearanceManager.update(skinChange);
if (!actionResult.isError()) { if (!actionResult.isError()) {
player.sendMessage(playerLanguage.translateWithWhoosh(LanguageKey.Event.Appearance.Set.OK)); 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 { } else {
player.sendMessage( player.sendMessage(
playerLanguage.translateWithOops( playerLanguage.translateWithOops(

4
src/main/java/xyz/ineanto/nicko/gui/prompt/PromptManager.java → src/main/java/xyz/ineanto/nicko/prompt/PromptManager.java
View file

@ -1,7 +1,7 @@
package xyz.ineanto.nicko.gui.prompt; package xyz.ineanto.nicko.prompt;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import xyz.ineanto.nicko.gui.prompt.conversation.ConversationPrompt; import xyz.ineanto.nicko.prompt.conversation.ConversationPrompt;
public class PromptManager { public class PromptManager {
private final Prompt prompt; private final Prompt prompt;

8
src/main/java/xyz/ineanto/nicko/gui/prompt/anvil/AnvilPrompt.java → src/main/java/xyz/ineanto/nicko/prompt/anvil/AnvilPrompt.java
View file

@ -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.kyori.adventure.text.Component;
import net.wesjd.anvilgui.AnvilGUI; import net.wesjd.anvilgui.AnvilGUI;
@ -7,15 +7,15 @@ import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import xyz.ineanto.nicko.Nicko; 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.language.LanguageKey;
import xyz.ineanto.nicko.mojang.MojangUtils; import xyz.ineanto.nicko.mojang.MojangUtils;
import java.util.Collections; import java.util.Collections;
/** /**
* This is currently unused, I'm waiting for AnvilGUI * This is currently unused, I'm waiting on AnvilGUI
* to be updated to compile with Paper mappings. * to be compiled against Paper mappings.
*/ */
// TODO (Ineanto, 16/05/2025): Do some validation on the inputs // TODO (Ineanto, 16/05/2025): Do some validation on the inputs
public class AnvilPrompt extends Prompt { public class AnvilPrompt extends Prompt {

4
src/main/java/xyz/ineanto/nicko/gui/prompt/conversation/ConversationPrompt.java → src/main/java/xyz/ineanto/nicko/prompt/conversation/ConversationPrompt.java
View file

@ -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.ConversationContext;
import org.bukkit.conversations.ConversationFactory; import org.bukkit.conversations.ConversationFactory;
@ -7,7 +7,7 @@ import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import xyz.ineanto.nicko.Nicko; 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.language.LanguageKey;
import java.util.Map; import java.util.Map;

1
src/main/java/xyz/ineanto/nicko/storage/mariadb/MariaDBStorage.java
View file

@ -100,7 +100,6 @@ public class MariaDBStorage extends Storage {
favorites = gson.fromJson(resultSet.getString("favorites"), new TypeToken<List<Appearance>>() { }.getType()); favorites = gson.fromJson(resultSet.getString("favorites"), new TypeToken<List<Appearance>>() { }.getType());
} }
// TODO (Ineanto, 17/05/2025): Retrieve favorites
final NickoProfile profile = new NickoProfile(new Appearance(name, skin), Language.fromCode(locale), randomSkin, favorites); final NickoProfile profile = new NickoProfile(new Appearance(name, skin), Language.fromCode(locale), randomSkin, favorites);
return Optional.of(profile); return Optional.of(profile);
} catch (SQLException e) { } catch (SQLException e) {