From bd22453f76b88d4d55a6886efe2adf7ca10a51de Mon Sep 17 00:00:00 2001 From: Pyrbu Date: Wed, 10 May 2023 14:42:23 +0100 Subject: [PATCH] command changes --- .../lol/pyr/znpcsplus/commands/CreateCommand.java | 15 ++++----------- .../lol/pyr/znpcsplus/commands/DeleteCommand.java | 8 +++----- .../commands/{ => hologram}/HoloAddCommand.java | 2 +- .../{ => hologram}/HoloDeleteCommand.java | 2 +- .../commands/{ => hologram}/HoloInfoCommand.java | 2 +- .../{ => hologram}/HoloInsertCommand.java | 2 +- .../commands/{ => hologram}/HoloSetCommand.java | 2 +- 7 files changed, 12 insertions(+), 21 deletions(-) rename plugin/src/main/java/lol/pyr/znpcsplus/commands/{ => hologram}/HoloAddCommand.java (97%) rename plugin/src/main/java/lol/pyr/znpcsplus/commands/{ => hologram}/HoloDeleteCommand.java (98%) rename plugin/src/main/java/lol/pyr/znpcsplus/commands/{ => hologram}/HoloInfoCommand.java (98%) rename plugin/src/main/java/lol/pyr/znpcsplus/commands/{ => hologram}/HoloInsertCommand.java (98%) rename plugin/src/main/java/lol/pyr/znpcsplus/commands/{ => hologram}/HoloSetCommand.java (98%) diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/commands/CreateCommand.java b/plugin/src/main/java/lol/pyr/znpcsplus/commands/CreateCommand.java index cfe31a5..860b3a5 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/commands/CreateCommand.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/commands/CreateCommand.java @@ -15,8 +15,8 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.entity.Player; +import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; public class CreateCommand implements CommandHandler { @Override @@ -58,15 +58,8 @@ public class CreateCommand implements CommandHandler { @Override public List suggest(CommandContext context) throws CommandExecutionException { - if (context.argSize() == 1) { - return context.suggestLiteral(""); - } - if (context.argSize() == 2) { - return context.suggestCollection(NpcTypeImpl.values().stream().map(NpcTypeImpl::getName).collect(Collectors.toList())); - } - if (context.argSize() == 3) { - return context.suggestLiteral(""); - } - return CommandHandler.super.suggest(context); + if (context.argSize() == 1) return context.suggestCollection(NpcRegistryImpl.get().modifiableIds()); + if (context.argSize() == 2) return context.suggestStream(NpcTypeImpl.values().stream().map(NpcTypeImpl::getName)); + return Collections.emptyList(); } } diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/commands/DeleteCommand.java b/plugin/src/main/java/lol/pyr/znpcsplus/commands/DeleteCommand.java index 27a3519..d750128 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/commands/DeleteCommand.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/commands/DeleteCommand.java @@ -9,8 +9,8 @@ import lol.pyr.znpcsplus.npc.NpcRegistryImpl; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; +import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; public class DeleteCommand implements CommandHandler { @Override @@ -31,9 +31,7 @@ public class DeleteCommand implements CommandHandler { @Override public List suggest(CommandContext context) throws CommandExecutionException { - if (context.argSize() == 1) { - return context.suggestCollection(NpcRegistryImpl.get().ids().stream().filter(s -> !s.startsWith(ZNpcsPlus.DEBUG_NPC_PREFIX)).collect(Collectors.toList())); - } - return CommandHandler.super.suggest(context); + if (context.argSize() == 1) return context.suggestCollection(NpcRegistryImpl.get().modifiableIds()); + return Collections.emptyList(); } } diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/commands/HoloAddCommand.java b/plugin/src/main/java/lol/pyr/znpcsplus/commands/hologram/HoloAddCommand.java similarity index 97% rename from plugin/src/main/java/lol/pyr/znpcsplus/commands/HoloAddCommand.java rename to plugin/src/main/java/lol/pyr/znpcsplus/commands/hologram/HoloAddCommand.java index 1ca10dc..500ebb3 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/commands/HoloAddCommand.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/commands/hologram/HoloAddCommand.java @@ -1,4 +1,4 @@ -package lol.pyr.znpcsplus.commands; +package lol.pyr.znpcsplus.commands.hologram; import lol.pyr.director.adventure.command.CommandContext; import lol.pyr.director.adventure.command.CommandHandler; diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/commands/HoloDeleteCommand.java b/plugin/src/main/java/lol/pyr/znpcsplus/commands/hologram/HoloDeleteCommand.java similarity index 98% rename from plugin/src/main/java/lol/pyr/znpcsplus/commands/HoloDeleteCommand.java rename to plugin/src/main/java/lol/pyr/znpcsplus/commands/hologram/HoloDeleteCommand.java index c61f45a..bc5d553 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/commands/HoloDeleteCommand.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/commands/hologram/HoloDeleteCommand.java @@ -1,4 +1,4 @@ -package lol.pyr.znpcsplus.commands; +package lol.pyr.znpcsplus.commands.hologram; import lol.pyr.director.adventure.command.CommandContext; import lol.pyr.director.adventure.command.CommandHandler; diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/commands/HoloInfoCommand.java b/plugin/src/main/java/lol/pyr/znpcsplus/commands/hologram/HoloInfoCommand.java similarity index 98% rename from plugin/src/main/java/lol/pyr/znpcsplus/commands/HoloInfoCommand.java rename to plugin/src/main/java/lol/pyr/znpcsplus/commands/hologram/HoloInfoCommand.java index 50e660c..5f43b04 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/commands/HoloInfoCommand.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/commands/hologram/HoloInfoCommand.java @@ -1,4 +1,4 @@ -package lol.pyr.znpcsplus.commands; +package lol.pyr.znpcsplus.commands.hologram; import lol.pyr.director.adventure.command.CommandContext; import lol.pyr.director.adventure.command.CommandHandler; diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/commands/HoloInsertCommand.java b/plugin/src/main/java/lol/pyr/znpcsplus/commands/hologram/HoloInsertCommand.java similarity index 98% rename from plugin/src/main/java/lol/pyr/znpcsplus/commands/HoloInsertCommand.java rename to plugin/src/main/java/lol/pyr/znpcsplus/commands/hologram/HoloInsertCommand.java index c5622bd..64da8f4 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/commands/HoloInsertCommand.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/commands/hologram/HoloInsertCommand.java @@ -1,4 +1,4 @@ -package lol.pyr.znpcsplus.commands; +package lol.pyr.znpcsplus.commands.hologram; import lol.pyr.director.adventure.command.CommandContext; import lol.pyr.director.adventure.command.CommandHandler; diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/commands/HoloSetCommand.java b/plugin/src/main/java/lol/pyr/znpcsplus/commands/hologram/HoloSetCommand.java similarity index 98% rename from plugin/src/main/java/lol/pyr/znpcsplus/commands/HoloSetCommand.java rename to plugin/src/main/java/lol/pyr/znpcsplus/commands/hologram/HoloSetCommand.java index add49e3..6b1b429 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/commands/HoloSetCommand.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/commands/hologram/HoloSetCommand.java @@ -1,4 +1,4 @@ -package lol.pyr.znpcsplus.commands; +package lol.pyr.znpcsplus.commands.hologram; import lol.pyr.director.adventure.command.CommandContext; import lol.pyr.director.adventure.command.CommandHandler;