feat(commands): add toggle autocomplete aliases
This commit is contained in:
@@ -1,12 +1,16 @@
|
||||
package games.dmg.spigotbase;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.command.TabCompleter;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
final class BaseFlightCommand implements CommandExecutor {
|
||||
final class BaseFlightCommand implements CommandExecutor, TabCompleter {
|
||||
private static final List<String> MODES = List.of("on", "off");
|
||||
private final BaseStateManager stateManager;
|
||||
private final BaseFlightController controller;
|
||||
|
||||
@@ -26,10 +30,17 @@ final class BaseFlightCommand implements CommandExecutor {
|
||||
player.sendMessage(ChatColor.RED + "Base flight is still locked.");
|
||||
return true;
|
||||
}
|
||||
final boolean enabled;
|
||||
try {
|
||||
enabled = TogglePreference.resolve(state.flightEnabled(), arguments);
|
||||
} catch (IllegalArgumentException exception) {
|
||||
player.sendMessage(ChatColor.RED + "Usage: /baseflight [on|off]");
|
||||
return true;
|
||||
}
|
||||
state = stateManager.update(
|
||||
player.getUniqueId(),
|
||||
player.getName(),
|
||||
current -> current.withFlightEnabled(!current.flightEnabled())
|
||||
current -> current.withFlightEnabled(enabled)
|
||||
);
|
||||
if (!state.flightEnabled()) {
|
||||
controller.removeGrantedFlight(player);
|
||||
@@ -40,4 +51,18 @@ final class BaseFlightCommand implements CommandExecutor {
|
||||
+ ChatColor.YELLOW + ".");
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> onTabComplete(
|
||||
CommandSender sender,
|
||||
Command command,
|
||||
String alias,
|
||||
String[] arguments
|
||||
) {
|
||||
if (arguments.length != 1) {
|
||||
return List.of();
|
||||
}
|
||||
String prefix = arguments[0].toLowerCase(Locale.ROOT);
|
||||
return MODES.stream().filter(mode -> mode.startsWith(prefix)).toList();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ final class BaseNavigationCommand implements CommandExecutor, TabCompleter {
|
||||
}
|
||||
final boolean enabled;
|
||||
try {
|
||||
enabled = NavigationPreference.resolve(state.navigationEnabled(), arguments);
|
||||
enabled = TogglePreference.resolve(state.navigationEnabled(), arguments);
|
||||
} catch (IllegalArgumentException exception) {
|
||||
player.sendMessage(ChatColor.RED + "Usage: /basenavigation [on|off]");
|
||||
return true;
|
||||
|
||||
@@ -1,12 +1,16 @@
|
||||
package games.dmg.spigotbase;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.command.TabCompleter;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
final class BaseVisitorsCommand implements CommandExecutor {
|
||||
final class BaseVisitorsCommand implements CommandExecutor, TabCompleter {
|
||||
private static final List<String> MODES = List.of("on", "off");
|
||||
private final BaseStateManager stateManager;
|
||||
|
||||
BaseVisitorsCommand(BaseStateManager stateManager) {
|
||||
@@ -24,10 +28,17 @@ final class BaseVisitorsCommand implements CommandExecutor {
|
||||
player.sendMessage(ChatColor.RED + "Base IV visitor access is still locked.");
|
||||
return true;
|
||||
}
|
||||
final boolean enabled;
|
||||
try {
|
||||
enabled = TogglePreference.resolve(state.visitorsEnabled(), arguments);
|
||||
} catch (IllegalArgumentException exception) {
|
||||
player.sendMessage(ChatColor.RED + "Usage: /basevisitors [on|off]");
|
||||
return true;
|
||||
}
|
||||
state = stateManager.update(
|
||||
player.getUniqueId(),
|
||||
player.getName(),
|
||||
current -> current.withVisitorsEnabled(!current.visitorsEnabled())
|
||||
current -> current.withVisitorsEnabled(enabled)
|
||||
);
|
||||
stateManager.saveIfDirty();
|
||||
player.sendMessage(ChatColor.YELLOW + "Visitor teleports are now "
|
||||
@@ -35,4 +46,18 @@ final class BaseVisitorsCommand implements CommandExecutor {
|
||||
+ ChatColor.YELLOW + ".");
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> onTabComplete(
|
||||
CommandSender sender,
|
||||
Command command,
|
||||
String alias,
|
||||
String[] arguments
|
||||
) {
|
||||
if (arguments.length != 1) {
|
||||
return List.of();
|
||||
}
|
||||
String prefix = arguments[0].toLowerCase(Locale.ROOT);
|
||||
return MODES.stream().filter(mode -> mode.startsWith(prefix)).toList();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,8 +74,12 @@ public final class SpigotBasePlugin extends JavaPlugin {
|
||||
BaseNavigationCommand navigationCommand = new BaseNavigationCommand(stateManager);
|
||||
command("basenavigation").setExecutor(navigationCommand);
|
||||
command("basenavigation").setTabCompleter(navigationCommand);
|
||||
command("baseflight").setExecutor(new BaseFlightCommand(stateManager, flightController));
|
||||
command("basevisitors").setExecutor(new BaseVisitorsCommand(stateManager));
|
||||
BaseFlightCommand flightCommand = new BaseFlightCommand(stateManager, flightController);
|
||||
command("baseflight").setExecutor(flightCommand);
|
||||
command("baseflight").setTabCompleter(flightCommand);
|
||||
BaseVisitorsCommand visitorsCommand = new BaseVisitorsCommand(stateManager);
|
||||
command("basevisitors").setExecutor(visitorsCommand);
|
||||
command("basevisitors").setTabCompleter(visitorsCommand);
|
||||
GoToBaseCommand goToBaseCommand = new GoToBaseCommand(stateManager, teleportManager);
|
||||
command("gotobase").setExecutor(goToBaseCommand);
|
||||
command("gotobase").setTabCompleter(goToBaseCommand);
|
||||
|
||||
+2
-2
@@ -2,8 +2,8 @@ package games.dmg.spigotbase;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
final class NavigationPreference {
|
||||
private NavigationPreference() {
|
||||
final class TogglePreference {
|
||||
private TogglePreference() {
|
||||
}
|
||||
|
||||
static boolean resolve(boolean current, String[] arguments) {
|
||||
@@ -16,12 +16,15 @@ commands:
|
||||
basenavigation:
|
||||
description: Toggle particle navigation toward your base.
|
||||
usage: /basenavigation [on|off]
|
||||
aliases: [homenavigation]
|
||||
baseflight:
|
||||
description: Toggle flight within your base.
|
||||
usage: /baseflight
|
||||
usage: /baseflight [on|off]
|
||||
aliases: [homeflight]
|
||||
basevisitors:
|
||||
description: Toggle visitor access to your base.
|
||||
usage: /basevisitors
|
||||
usage: /basevisitors [on|off]
|
||||
aliases: [homevisitors]
|
||||
gotobase:
|
||||
description: Visit an available player base.
|
||||
usage: /gotobase <player>
|
||||
|
||||
Reference in New Issue
Block a user