diff --git a/src/main/java/xyz/ineanto/nicko/Nicko.java b/src/main/java/xyz/ineanto/nicko/Nicko.java index 8b96749..6899229 100644 --- a/src/main/java/xyz/ineanto/nicko/Nicko.java +++ b/src/main/java/xyz/ineanto/nicko/Nicko.java @@ -47,9 +47,9 @@ public class Nicko extends JavaPlugin { dataStore = new PlayerDataStore(mojangAPI, getNickoConfig()); - if (!MinecraftVersion.v1_21_5.atOrAbove()) { + if (!MinecraftVersion.TRAILS_AND_TAILS.atOrAbove()) { getLogger().severe("This version (" + MinecraftVersion.getCurrentVersion().getVersion() + ") is not supported by Nicko!"); - getLogger().severe("As of version 1.2.0, Nicko only supports the latest Minecraft version. (Currently 1.21.5)"); + getLogger().severe("As of version 1.2.0, Nicko only supports the latest Minecraft version. (Currently 1.21.4)"); dataStore.getStorage().setError(true); Bukkit.getPluginManager().disablePlugin(this); } diff --git a/src/main/java/xyz/ineanto/nicko/command/NickoCommand.java b/src/main/java/xyz/ineanto/nicko/command/NickoCommand.java index 053edbc..6665761 100644 --- a/src/main/java/xyz/ineanto/nicko/command/NickoCommand.java +++ b/src/main/java/xyz/ineanto/nicko/command/NickoCommand.java @@ -8,7 +8,6 @@ import org.bukkit.entity.Player; import org.jspecify.annotations.Nullable; import xyz.ineanto.nicko.gui.HomeGUI; -@SuppressWarnings("UnstableApiUsage") public class NickoCommand implements BasicCommand { @Override public void execute(CommandSourceStack stack, String[] strings) { diff --git a/src/main/java/xyz/ineanto/nicko/gui/prompt/conversation/ConversationPrompt.java b/src/main/java/xyz/ineanto/nicko/gui/prompt/conversation/ConversationPrompt.java index 7106225..7fe5848 100644 --- a/src/main/java/xyz/ineanto/nicko/gui/prompt/conversation/ConversationPrompt.java +++ b/src/main/java/xyz/ineanto/nicko/gui/prompt/conversation/ConversationPrompt.java @@ -8,20 +8,14 @@ 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.language.LanguageKey; import java.util.Map; import java.util.Objects; public class ConversationPrompt extends Prompt { + private final ConversationFactory conversationFactory = new ConversationFactory(Nicko.getInstance()); private final String changeBothTag = "changeBoth"; private final Player player; - private final ConversationFactory conversationFactory = new ConversationFactory(Nicko.getInstance()) - .withTimeout(30) - .withModality(false) - .withEscapeSequence("EXIT") - .withLocalEcho(false) - .thatExcludesNonPlayersWithMessage("Player only"); private String name; @@ -30,11 +24,17 @@ public class ConversationPrompt extends Prompt { this.player = player; } + @Override public void displayNameThenSkinPrompt() { conversationFactory + .thatExcludesNonPlayersWithMessage("Player only") + .withTimeout(30) + .withModality(false) .withFirstPrompt(new ChangeNameConversation()) + .withEscapeSequence("EXIT") .withInitialSessionData(Map.of(changeBothTag, true)) + .withLocalEcho(false) .buildConversation(player) .begin(); } @@ -42,7 +42,12 @@ public class ConversationPrompt extends Prompt { @Override public void displaySkinPrompt() { conversationFactory + .thatExcludesNonPlayersWithMessage("Player only") + .withModality(false) + .withTimeout(30) .withFirstPrompt(new ChangeSkinConversation()) + .withEscapeSequence("EXIT") + .withLocalEcho(false) .buildConversation(player) .begin(); } @@ -50,7 +55,12 @@ public class ConversationPrompt extends Prompt { @Override public void displayNamePrompt() { conversationFactory + .thatExcludesNonPlayersWithMessage("Player only") + .withModality(false) + .withTimeout(30) .withFirstPrompt(new ChangeNameConversation()) + .withEscapeSequence("EXIT") + .withLocalEcho(false) .buildConversation(player) .begin(); } @@ -58,7 +68,7 @@ public class ConversationPrompt extends Prompt { private class ChangeNameConversation extends StringPrompt { @Override public @NotNull String getPromptText(@NotNull ConversationContext context) { - return playerLanguage.translate(LanguageKey.Event.Appearance.Set.CHAT_PROMPT_NAME, true); + return "Enter your new name"; } @Override @@ -76,7 +86,7 @@ public class ConversationPrompt extends Prompt { private class ChangeSkinConversation extends StringPrompt { @Override public @NotNull String getPromptText(@NotNull ConversationContext context) { - return playerLanguage.translate(LanguageKey.Event.Appearance.Set.CHAT_PROMPT_SKIN, true); + return "Enter your new skin"; } @Override diff --git a/src/main/java/xyz/ineanto/nicko/language/LanguageKey.java b/src/main/java/xyz/ineanto/nicko/language/LanguageKey.java index d8f9ef5..713d253 100644 --- a/src/main/java/xyz/ineanto/nicko/language/LanguageKey.java +++ b/src/main/java/xyz/ineanto/nicko/language/LanguageKey.java @@ -49,8 +49,7 @@ public class LanguageKey { public static final String OK = SET_KEY + "ok"; public static final String ERROR = SET_KEY + "error"; - public static final String CHAT_PROMPT_NAME = SET_KEY + "chat_prompt_name"; - public static final String CHAT_PROMPT_SKIN = SET_KEY + "chat_prompt_skin"; + public static final String CHAT_PROMPT = SET_KEY + "chat_prompt"; } public static class Remove { diff --git a/src/main/java/xyz/ineanto/nicko/loader/NickoPluginLoader.java b/src/main/java/xyz/ineanto/nicko/loader/NickoPluginLoader.java index 11762da..ceea6ec 100644 --- a/src/main/java/xyz/ineanto/nicko/loader/NickoPluginLoader.java +++ b/src/main/java/xyz/ineanto/nicko/loader/NickoPluginLoader.java @@ -7,7 +7,6 @@ import org.eclipse.aether.artifact.DefaultArtifact; import org.eclipse.aether.graph.Dependency; import org.eclipse.aether.repository.RemoteRepository; -@SuppressWarnings("UnstableApiUsage") public class NickoPluginLoader implements PluginLoader { @Override public void classloader(PluginClasspathBuilder pluginClasspathBuilder) { diff --git a/src/main/resources/en.yml b/src/main/resources/en.yml index ca18fb9..3b78607 100644 --- a/src/main/resources/en.yml +++ b/src/main/resources/en.yml @@ -20,8 +20,7 @@ event: set: error: "Wasn''t able to apply your disguise! ({0})" ok: "You''re now disguised." - chat_prompt_name: "Please enter your new name in chat (type \"EXIT\" to cancel)." - chat_prompt_skin: "Please enter your new skin in chat (type \"EXIT\" to cancel)." + chat_prompt: "Please enter your new {0} in chat." restore: error: "Wasn''t able to apply the previous disguise! ({0})" ok: "Previous disguise restored." diff --git a/src/main/resources/fr.yml b/src/main/resources/fr.yml index a2e7472..68df92e 100644 --- a/src/main/resources/fr.yml +++ b/src/main/resources/fr.yml @@ -20,8 +20,6 @@ event: set: error: "Impossible d''appliquer votre déguisement ! ({0})" ok: "Déguisement appliqué avec succès." - chat_prompt_name: "Veuillez entrer votre nouveau pseudo (saisissez \"EXIT\" pour arrêter)." - chat_prompt_skin: "Veuillez entrer votre nouveau skin (saisissez \"EXIT\" pour arrêter)." restore: error: "Impossible d''appliquer le précédent déguisement ! ({0})" ok: "Votre précédent déguisement a été appliqué."