add slash server aliases

This commit is contained in:
ajgeiss0702
2021-09-25 16:48:21 -07:00
parent 7bc08885da
commit d9a5142d48
8 changed files with 167 additions and 15 deletions
@@ -11,6 +11,7 @@ import net.md_5.bungee.event.EventHandler;
import org.bstats.bungeecord.Metrics;
import org.bstats.charts.SimplePie;
import org.checkerframework.checker.nullness.qual.NonNull;
import us.ajg0702.queue.api.Implementation;
import us.ajg0702.queue.api.commands.IBaseCommand;
import us.ajg0702.queue.api.util.QueueLogger;
import us.ajg0702.queue.commands.BaseCommand;
@@ -25,14 +26,18 @@ import us.ajg0702.queue.platforms.bungeecord.server.BungeeServer;
import java.io.File;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class BungeeQueue extends Plugin implements Listener {
public class BungeeQueue extends Plugin implements Listener, Implementation {
private QueueMain main;
List<IBaseCommand> commands;
Map<String, BungeeCommand> commandMap;
@Override
public void onEnable() {
QueueLogger logger = new BungeeLogger(getLogger());
@@ -41,6 +46,7 @@ public class BungeeQueue extends Plugin implements Listener {
adventure = BungeeAudiences.create(this);
main = new QueueMain(
this,
logger,
new BungeeMethods(this, getProxy(), logger),
dataFolder
@@ -56,9 +62,10 @@ public class BungeeQueue extends Plugin implements Listener {
new ManageCommand(main)
);
commandMap = new HashMap<>();
for(IBaseCommand command : commands) {
getProxy().getPluginManager()
.registerCommand(this, new BungeeCommand((BaseCommand) command));
registerCommand(command);
}
getProxy().getPluginManager().registerListener(this, this);
@@ -129,4 +136,20 @@ public class BungeeQueue extends Plugin implements Listener {
false
);
}
@Override
public void unregisterCommand(String name) {
BungeeCommand bungeeCommand = commandMap.get(name);
if(bungeeCommand == null) return;
getProxy().getPluginManager().unregisterCommand(bungeeCommand);
commandMap.remove(name);
}
@Override
public void registerCommand(IBaseCommand command) {
BungeeCommand bungeeCommand = new BungeeCommand((BaseCommand) command);
commandMap.put(command.getName(), bungeeCommand);
getProxy().getPluginManager()
.registerCommand(this, bungeeCommand);
}
}
@@ -18,6 +18,7 @@ import net.kyori.adventure.text.Component;
import org.bstats.charts.SimplePie;
import org.bstats.velocity.Metrics;
import org.slf4j.Logger;
import us.ajg0702.queue.api.Implementation;
import us.ajg0702.queue.api.commands.IBaseCommand;
import us.ajg0702.queue.commands.BaseCommand;
import us.ajg0702.queue.commands.commands.leavequeue.LeaveCommand;
@@ -44,7 +45,7 @@ import java.util.Optional;
authors = {"ajgeiss0702"}
)
public class VelocityQueue {
public class VelocityQueue implements Implementation {
final ProxyServer proxyServer;
final VelocityLogger logger;
@@ -66,9 +67,12 @@ public class VelocityQueue {
List<IBaseCommand> commands;
CommandManager commandManager;
@Subscribe
public void onProxyInit(ProxyInitializeEvent e) {
main = new QueueMain(
this,
logger,
new VelocityMethods(this, proxyServer, logger),
dataFolder
@@ -81,7 +85,7 @@ public class VelocityQueue {
new ManageCommand(main)
);
CommandManager commandManager = proxyServer.getCommandManager();
commandManager = proxyServer.getCommandManager();
proxyServer.getChannelRegistrar().register(MinecraftChannelIdentifier.create("ajqueue", "tospigot"));
@@ -89,12 +93,7 @@ public class VelocityQueue {
for(IBaseCommand command : commands) {
commandManager.register(
commandManager.metaBuilder(command.getName())
.aliases(command.getAliases().toArray(new String[]{}))
.build(),
new VelocityCommand(main, (BaseCommand) command)
);
registerCommand(command);
}
@@ -138,7 +137,6 @@ public class VelocityQueue {
main.getEventHandler().onPlayerLeave(new VelocityPlayer(e.getPlayer()));
}
@SuppressWarnings("SimplifyOptionalCallChains")
@Subscribe
public void onKick(KickedFromServerEvent e) {
if(!e.getPlayer().getCurrentServer().isPresent()) return; // if the player is kicked on initial join, we dont care
@@ -152,4 +150,18 @@ public class VelocityQueue {
);
}
@Override
public void unregisterCommand(String name) {
commandManager.unregister(name);
}
@Override
public void registerCommand(IBaseCommand command) {
commandManager.register(
commandManager.metaBuilder(command.getName())
.aliases(command.getAliases().toArray(new String[]{}))
.build(),
new VelocityCommand(main, (BaseCommand) command)
);
}
}