From 21d7572b32451cff0b5c88cac0a37e74ca481852 Mon Sep 17 00:00:00 2001 From: nea Date: Wed, 22 Feb 2023 00:39:31 +0100 Subject: fix nopos concerns --- .../notenoughupdates/commands/dev/SimpleDevCommands.kt | 2 +- .../moulberry/notenoughupdates/commands/help/LinksCommand.kt | 2 -- .../moulberry/notenoughupdates/commands/misc/MiscCommands.kt | 12 ++++++------ 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/SimpleDevCommands.kt b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/SimpleDevCommands.kt index c8c9c1e0..95a6500e 100644 --- a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/SimpleDevCommands.kt +++ b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/SimpleDevCommands.kt @@ -42,7 +42,7 @@ class SimpleDevCommands { event.command("neureloadrepo") { thenExecute { NotEnoughUpdates.INSTANCE.manager.reloadRepository() - reply("§e[NEU] Reloaded repository.") + reply("Reloaded repository.") } }.withHelp("Reload the NEU data repository from disk (not from network)") event.command("neudungeonwintest") { diff --git a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/help/LinksCommand.kt b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/help/LinksCommand.kt index 7f5bf913..957948ae 100644 --- a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/help/LinksCommand.kt +++ b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/help/LinksCommand.kt @@ -42,9 +42,7 @@ class LinksCommand { } try { val updateJson = manager.getJsonFromFile(updateJsonFile) - reply("") NotEnoughUpdates.INSTANCE.displayLinks(updateJson, 0) - reply("") } catch (_: Exception) { Utils.showOutdatedRepoNotification() } diff --git a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/misc/MiscCommands.kt b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/misc/MiscCommands.kt index b28ca978..c86eb4fe 100644 --- a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/misc/MiscCommands.kt +++ b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/misc/MiscCommands.kt @@ -106,14 +106,14 @@ class MiscCommands { } }.withHelp("Customize your items") event.command("neupronouns", "neuliberals") { - thenArgument("platform", string()) { platform -> - suggestsList(listOf("minecraft", "discord", "twitch", "twitter", "github")) - thenArgumentExecute("user", string()) { user -> + thenArgument("user", string()) {user-> + suggestsList { Minecraft.getMinecraft().theWorld.playerEntities.map { it.name } } + thenArgumentExecute("platform", string()) { platform -> fetchPronouns(this[platform], this[user]) }.withHelp("Look up someones pronouns using their username on a platform") - } - thenArgumentExecute("user", string()) { user -> - fetchPronouns("minecraft", this[user]) + thenExecute { + fetchPronouns("minecraft", this[user]) + } }.withHelp("Look up someones pronouns using their minecraft username") } event.command("neuupdate", "neuupdates", "enoughupdates") { -- cgit