mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2026-08-30 05:40:34 +00:00
remove old main commands
This commit is contained in:
dfsek
@@ -48,7 +48,6 @@ import com.dfsek.terra.addon.EphemeralAddon;
|
|||||||
import com.dfsek.terra.addon.InternalAddon;
|
import com.dfsek.terra.addon.InternalAddon;
|
||||||
import com.dfsek.terra.api.Platform;
|
import com.dfsek.terra.api.Platform;
|
||||||
import com.dfsek.terra.api.addon.BaseAddon;
|
import com.dfsek.terra.api.addon.BaseAddon;
|
||||||
import com.dfsek.terra.api.command.CommandManager;
|
|
||||||
import com.dfsek.terra.api.config.ConfigPack;
|
import com.dfsek.terra.api.config.ConfigPack;
|
||||||
import com.dfsek.terra.api.config.PluginConfig;
|
import com.dfsek.terra.api.config.PluginConfig;
|
||||||
import com.dfsek.terra.api.event.EventManager;
|
import com.dfsek.terra.api.event.EventManager;
|
||||||
@@ -61,7 +60,6 @@ import com.dfsek.terra.api.registry.CheckedRegistry;
|
|||||||
import com.dfsek.terra.api.registry.Registry;
|
import com.dfsek.terra.api.registry.Registry;
|
||||||
import com.dfsek.terra.api.util.StringIdentifiable;
|
import com.dfsek.terra.api.util.StringIdentifiable;
|
||||||
import com.dfsek.terra.api.util.mutable.MutableBoolean;
|
import com.dfsek.terra.api.util.mutable.MutableBoolean;
|
||||||
import com.dfsek.terra.commands.TerraCommandManager;
|
|
||||||
import com.dfsek.terra.config.GenericLoaders;
|
import com.dfsek.terra.config.GenericLoaders;
|
||||||
import com.dfsek.terra.config.PluginConfigImpl;
|
import com.dfsek.terra.config.PluginConfigImpl;
|
||||||
import com.dfsek.terra.event.EventManagerImpl;
|
import com.dfsek.terra.event.EventManagerImpl;
|
||||||
@@ -92,8 +90,6 @@ public abstract class AbstractPlatform implements Platform {
|
|||||||
|
|
||||||
private final PluginConfigImpl config = new PluginConfigImpl();
|
private final PluginConfigImpl config = new PluginConfigImpl();
|
||||||
|
|
||||||
private final CommandManager manager = new TerraCommandManager(this);
|
|
||||||
|
|
||||||
private final CheckedRegistry<BaseAddon> addonRegistry = new CheckedRegistryImpl<>(new OpenRegistryImpl<>(TypeKey.of(BaseAddon.class)));
|
private final CheckedRegistry<BaseAddon> addonRegistry = new CheckedRegistryImpl<>(new OpenRegistryImpl<>(TypeKey.of(BaseAddon.class)));
|
||||||
|
|
||||||
private final Registry<BaseAddon> lockedAddonRegistry = new LockedRegistryImpl<>(addonRegistry);
|
private final Registry<BaseAddon> lockedAddonRegistry = new LockedRegistryImpl<>(addonRegistry);
|
||||||
@@ -102,10 +98,6 @@ public abstract class AbstractPlatform implements Platform {
|
|||||||
return configRegistry;
|
return configRegistry;
|
||||||
}
|
}
|
||||||
|
|
||||||
public CommandManager getManager() {
|
|
||||||
return manager;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected Iterable<BaseAddon> platformAddon() {
|
protected Iterable<BaseAddon> platformAddon() {
|
||||||
return Collections.emptySet();
|
return Collections.emptySet();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,39 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of Terra.
|
|
||||||
*
|
|
||||||
* Terra is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Terra is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.dfsek.terra.commands;
|
|
||||||
|
|
||||||
import com.dfsek.terra.api.Platform;
|
|
||||||
import com.dfsek.terra.api.command.CommandTemplate;
|
|
||||||
import com.dfsek.terra.api.command.annotation.Command;
|
|
||||||
import com.dfsek.terra.api.entity.CommandSender;
|
|
||||||
import com.dfsek.terra.api.inject.annotations.Inject;
|
|
||||||
|
|
||||||
|
|
||||||
@Command(
|
|
||||||
usage = "/terra addons"
|
|
||||||
)
|
|
||||||
public class AddonsCommand implements CommandTemplate {
|
|
||||||
@Inject
|
|
||||||
private Platform platform;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute(CommandSender sender) {
|
|
||||||
sender.sendMessage("Installed Addons:");
|
|
||||||
platform.getAddons().forEach(addon -> sender.sendMessage(" - " + addon.getID()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of Terra.
|
|
||||||
*
|
|
||||||
* Terra is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Terra is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.dfsek.terra.commands;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
import com.dfsek.terra.api.entity.CommandSender;
|
|
||||||
|
|
||||||
|
|
||||||
public final class ExecutionState {
|
|
||||||
private final Set<String> switches = new HashSet<>();
|
|
||||||
private final Map<String, String> args = new HashMap<>();
|
|
||||||
private final CommandSender sender;
|
|
||||||
|
|
||||||
public ExecutionState(CommandSender sender) {
|
|
||||||
this.sender = sender;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void addSwitch(String flag) {
|
|
||||||
switches.add(flag);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void addArgument(String arg, String value) {
|
|
||||||
args.put(arg, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getArgument(String argument) {
|
|
||||||
return args.get(argument);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean hasSwitch(String flag) {
|
|
||||||
return switches.contains(flag);
|
|
||||||
}
|
|
||||||
|
|
||||||
public CommandSender getSender() {
|
|
||||||
return sender;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-46
@@ -1,46 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of Terra.
|
|
||||||
*
|
|
||||||
* Terra is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Terra is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.dfsek.terra.commands;
|
|
||||||
|
|
||||||
import com.dfsek.terra.api.Platform;
|
|
||||||
import com.dfsek.terra.api.command.CommandTemplate;
|
|
||||||
import com.dfsek.terra.api.command.annotation.Command;
|
|
||||||
import com.dfsek.terra.api.command.annotation.type.DebugCommand;
|
|
||||||
import com.dfsek.terra.api.command.annotation.type.PlayerCommand;
|
|
||||||
import com.dfsek.terra.api.command.annotation.type.WorldCommand;
|
|
||||||
import com.dfsek.terra.api.entity.CommandSender;
|
|
||||||
import com.dfsek.terra.api.entity.Player;
|
|
||||||
import com.dfsek.terra.api.inject.annotations.Inject;
|
|
||||||
|
|
||||||
|
|
||||||
@WorldCommand
|
|
||||||
@DebugCommand
|
|
||||||
@PlayerCommand
|
|
||||||
@Command(
|
|
||||||
usage = "/terra getblock"
|
|
||||||
)
|
|
||||||
public class GetBlockCommand implements CommandTemplate {
|
|
||||||
@Inject
|
|
||||||
private Platform platform;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute(CommandSender sender) {
|
|
||||||
Player player = (Player) sender;
|
|
||||||
sender.sendMessage("Block: " + player.world().getGenerator().getBlock(player.world(), player.position()).getAsString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of Terra.
|
|
||||||
*
|
|
||||||
* Terra is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Terra is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.dfsek.terra.commands;
|
|
||||||
|
|
||||||
import com.dfsek.terra.api.Platform;
|
|
||||||
import com.dfsek.terra.api.command.CommandTemplate;
|
|
||||||
import com.dfsek.terra.api.command.annotation.Command;
|
|
||||||
import com.dfsek.terra.api.config.ConfigPack;
|
|
||||||
import com.dfsek.terra.api.entity.CommandSender;
|
|
||||||
import com.dfsek.terra.api.inject.annotations.Inject;
|
|
||||||
import com.dfsek.terra.api.registry.CheckedRegistry;
|
|
||||||
|
|
||||||
|
|
||||||
@Command(
|
|
||||||
usage = "/terra packs"
|
|
||||||
)
|
|
||||||
public class PacksCommand implements CommandTemplate {
|
|
||||||
@Inject
|
|
||||||
private Platform platform;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute(CommandSender sender) {
|
|
||||||
CheckedRegistry<ConfigPack> registry = platform.getConfigRegistry();
|
|
||||||
|
|
||||||
if(registry.entries().isEmpty()) {
|
|
||||||
sender.sendMessage("No packs installed");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
registry.entries().forEach(configPack -> sender.sendMessage(" - " + configPack.getID() + "@" + configPack.getVersion().getFormatted()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of Terra.
|
|
||||||
*
|
|
||||||
* Terra is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Terra is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.dfsek.terra.commands;
|
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
import com.dfsek.terra.api.Platform;
|
|
||||||
import com.dfsek.terra.api.command.CommandTemplate;
|
|
||||||
import com.dfsek.terra.api.command.annotation.Command;
|
|
||||||
import com.dfsek.terra.api.entity.CommandSender;
|
|
||||||
import com.dfsek.terra.api.inject.annotations.Inject;
|
|
||||||
|
|
||||||
|
|
||||||
@Command(
|
|
||||||
usage = "/terra reload"
|
|
||||||
)
|
|
||||||
public class ReloadCommand implements CommandTemplate {
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ReloadCommand.class);
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
private Platform platform;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute(CommandSender sender) {
|
|
||||||
logger.info("Reloading Terra...");
|
|
||||||
if(platform.reload()) {
|
|
||||||
logger.info("Terra reloaded successfully.");
|
|
||||||
sender.sendMessage("Terra reloaded successfully.");
|
|
||||||
} else {
|
|
||||||
logger.error("Terra failed to reload.");
|
|
||||||
sender.sendMessage("Terra failed to reload. See logs for more information.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-311
@@ -1,311 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of Terra.
|
|
||||||
*
|
|
||||||
* Terra is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Terra is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.dfsek.terra.commands;
|
|
||||||
|
|
||||||
import net.jafama.FastMath;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import com.dfsek.terra.api.Platform;
|
|
||||||
import com.dfsek.terra.api.command.CommandManager;
|
|
||||||
import com.dfsek.terra.api.command.CommandTemplate;
|
|
||||||
import com.dfsek.terra.api.command.annotation.Argument;
|
|
||||||
import com.dfsek.terra.api.command.annotation.Command;
|
|
||||||
import com.dfsek.terra.api.command.annotation.Subcommand;
|
|
||||||
import com.dfsek.terra.api.command.annotation.Switch;
|
|
||||||
import com.dfsek.terra.api.command.annotation.inject.ArgumentTarget;
|
|
||||||
import com.dfsek.terra.api.command.annotation.inject.SwitchTarget;
|
|
||||||
import com.dfsek.terra.api.command.annotation.type.DebugCommand;
|
|
||||||
import com.dfsek.terra.api.command.annotation.type.PlayerCommand;
|
|
||||||
import com.dfsek.terra.api.command.annotation.type.WorldCommand;
|
|
||||||
import com.dfsek.terra.api.command.arg.ArgumentParser;
|
|
||||||
import com.dfsek.terra.api.command.exception.CommandException;
|
|
||||||
import com.dfsek.terra.api.command.exception.ExecutionException;
|
|
||||||
import com.dfsek.terra.api.command.exception.InvalidArgumentsException;
|
|
||||||
import com.dfsek.terra.api.command.exception.MalformedCommandException;
|
|
||||||
import com.dfsek.terra.api.command.exception.SwitchFormatException;
|
|
||||||
import com.dfsek.terra.api.command.tab.TabCompleter;
|
|
||||||
import com.dfsek.terra.api.entity.CommandSender;
|
|
||||||
import com.dfsek.terra.api.entity.Player;
|
|
||||||
import com.dfsek.terra.api.inject.exception.InjectionException;
|
|
||||||
import com.dfsek.terra.api.inject.impl.InjectorImpl;
|
|
||||||
import com.dfsek.terra.api.util.reflection.ReflectionUtil;
|
|
||||||
|
|
||||||
|
|
||||||
public class TerraCommandManager implements CommandManager {
|
|
||||||
private final Map<String, CommandHolder> commands = new HashMap<>();
|
|
||||||
private final InjectorImpl<Platform> pluginInjector;
|
|
||||||
private final Platform platform;
|
|
||||||
|
|
||||||
public TerraCommandManager(Platform platform) {
|
|
||||||
this.platform = platform;
|
|
||||||
this.pluginInjector = new InjectorImpl<>(platform);
|
|
||||||
pluginInjector.addExplicitTarget(Platform.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute(String commandName, CommandSender sender, List<String> argsIn) throws CommandException {
|
|
||||||
if(!commands.containsKey(commandName)) throw new InvalidArgumentsException("No such command \"" + commandName + "\"");
|
|
||||||
execute(commands.get(commandName), sender, new ArrayList<>(argsIn));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void register(String name, Class<? extends CommandTemplate> clazz) throws MalformedCommandException {
|
|
||||||
commands.put(name, new CommandHolder(clazz));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<String> tabComplete(String command, CommandSender sender, List<String> args) throws CommandException {
|
|
||||||
if(args.isEmpty()) return new ArrayList<>(commands.keySet()).stream().sorted(String::compareTo).collect(Collectors.toList());
|
|
||||||
if(!commands.containsKey(command)) return Collections.emptyList();
|
|
||||||
return tabComplete(commands.get(command), sender, new ArrayList<>(args)).stream().filter(
|
|
||||||
s -> s.toLowerCase().startsWith(args.get(args.size() - 1).toLowerCase())).sorted(String::compareTo).collect(
|
|
||||||
Collectors.toList());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getMaxArgumentDepth() {
|
|
||||||
int max = 0;
|
|
||||||
for(CommandHolder value : commands.values()) {
|
|
||||||
max = FastMath.max(getMaxArgumentDepth(value), max);
|
|
||||||
}
|
|
||||||
return max;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void execute(CommandHolder commandHolder, CommandSender sender, List<String> args) throws CommandException {
|
|
||||||
Class<? extends CommandTemplate> commandClass = commandHolder.clazz;
|
|
||||||
|
|
||||||
if(commandClass.isAnnotationPresent(DebugCommand.class) && !platform.getTerraConfig().isDebugCommands()) {
|
|
||||||
sender.sendMessage("Command must be executed with debug commands enabled.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(commandClass.isAnnotationPresent(PlayerCommand.class) && !(sender instanceof Player)) {
|
|
||||||
sender.sendMessage("Command must be executed by player.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(commandClass.isAnnotationPresent(WorldCommand.class) && (!(sender instanceof Player))) {
|
|
||||||
sender.sendMessage("Command must be executed in a Terra world.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
List<String> ogArgs = new ArrayList<>(args);
|
|
||||||
|
|
||||||
ExecutionState state = new ExecutionState(sender);
|
|
||||||
|
|
||||||
if(!commandClass.isAnnotationPresent(Command.class)) {
|
|
||||||
invoke(commandClass, state, commandHolder);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Command command = commandClass.getAnnotation(Command.class);
|
|
||||||
|
|
||||||
if(command.arguments().length == 0 && command.subcommands().length == 0) {
|
|
||||||
if(args.isEmpty()) {
|
|
||||||
invoke(commandClass, state, commandHolder);
|
|
||||||
return;
|
|
||||||
} else throw new InvalidArgumentsException("Expected 0 arguments, found " + args.size());
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!args.isEmpty() && commandHolder.subcommands.containsKey(args.get(0))) {
|
|
||||||
String c = args.get(0);
|
|
||||||
args.remove(0);
|
|
||||||
execute(commandHolder.subcommands.get(c), sender, args);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean req = true;
|
|
||||||
for(Argument argument : command.arguments()) {
|
|
||||||
if(!req && argument.required()) {
|
|
||||||
throw new MalformedCommandException(
|
|
||||||
"Required arguments must come first! Arguments: " + Arrays.toString(command.arguments()));
|
|
||||||
}
|
|
||||||
req = argument.required();
|
|
||||||
|
|
||||||
if(args.isEmpty()) {
|
|
||||||
if(req) throw new InvalidArgumentsException("Invalid arguments: " + ogArgs + ", usage: " + command.usage());
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
String arg = args.get(0);
|
|
||||||
|
|
||||||
if(arg.startsWith("-")) { // switches have started.
|
|
||||||
if(req) throw new InvalidArgumentsException("Switches must come after arguments.");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
state.addArgument(argument.value(), args.remove(0));
|
|
||||||
}
|
|
||||||
|
|
||||||
while(!args.isEmpty()) {
|
|
||||||
String aSwitch = args.remove(0);
|
|
||||||
if(!aSwitch.startsWith("-")) throw new SwitchFormatException("Invalid switch \"" + aSwitch + "\"");
|
|
||||||
|
|
||||||
String val = aSwitch.substring(1); // remove dash
|
|
||||||
|
|
||||||
if(!commandHolder.switches.containsKey(val)) throw new SwitchFormatException("No such switch \"" + aSwitch + "\"");
|
|
||||||
|
|
||||||
state.addSwitch(commandHolder.switches.get(val));
|
|
||||||
}
|
|
||||||
|
|
||||||
invoke(commandClass, state, commandHolder);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void invoke(Class<? extends CommandTemplate> clazz, ExecutionState state, CommandHolder holder) throws CommandException {
|
|
||||||
try {
|
|
||||||
CommandTemplate template = clazz.getConstructor().newInstance();
|
|
||||||
|
|
||||||
pluginInjector.inject(template);
|
|
||||||
|
|
||||||
for(Field field : ReflectionUtil.getFields(clazz)) {
|
|
||||||
if(field.isAnnotationPresent(ArgumentTarget.class)) {
|
|
||||||
ArgumentTarget argumentTarget = field.getAnnotation(ArgumentTarget.class);
|
|
||||||
if(!holder.argumentMap.containsKey(argumentTarget.value())) {
|
|
||||||
throw new MalformedCommandException(
|
|
||||||
"Argument Target specifies nonexistent argument \"" + argumentTarget.value() + "\"");
|
|
||||||
}
|
|
||||||
|
|
||||||
String argument = argumentTarget.value();
|
|
||||||
|
|
||||||
ArgumentParser<?> argumentParser = holder.argumentMap.get(argumentTarget.value())
|
|
||||||
.argumentParser()
|
|
||||||
.getConstructor()
|
|
||||||
.newInstance();
|
|
||||||
|
|
||||||
pluginInjector.inject(argumentParser);
|
|
||||||
|
|
||||||
field.setAccessible(true);
|
|
||||||
String value = state.getArgument(argument);
|
|
||||||
|
|
||||||
if(value == null) value = holder.argumentMap.get(argumentTarget.value()).defaultValue();
|
|
||||||
|
|
||||||
field.set(template, argumentParser.parse(state.getSender(), value));
|
|
||||||
}
|
|
||||||
if(field.isAnnotationPresent(SwitchTarget.class)) {
|
|
||||||
SwitchTarget switchTarget = field.getAnnotation(SwitchTarget.class);
|
|
||||||
if(!holder.switches.containsValue(switchTarget.value())) {
|
|
||||||
throw new MalformedCommandException("Switch Target specifies nonexistent switch \"" + switchTarget.value() + "\"");
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!(field.getType() == boolean.class)) {
|
|
||||||
throw new MalformedCommandException("Switch Target must be of type boolean.");
|
|
||||||
}
|
|
||||||
|
|
||||||
field.setAccessible(true);
|
|
||||||
field.setBoolean(template, state.hasSwitch(switchTarget.value()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
template.execute(state.getSender());
|
|
||||||
} catch(Throwable e) {
|
|
||||||
throw new ExecutionException("Failed to execute command: " + e.getMessage(), e);
|
|
||||||
}
|
|
||||||
} catch(InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | InjectionException e) {
|
|
||||||
throw new MalformedCommandException("Unable to reflectively instantiate command: ", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<String> tabComplete(CommandHolder holder, CommandSender sender, List<String> args) throws CommandException {
|
|
||||||
if(args.isEmpty()) return Collections.emptyList();
|
|
||||||
List<String> completions = new ArrayList<>();
|
|
||||||
|
|
||||||
if(args.size() == 1) {
|
|
||||||
completions.addAll(holder.subcommands.keySet());
|
|
||||||
}
|
|
||||||
|
|
||||||
if(holder.subcommands.containsKey(args.get(0))) {
|
|
||||||
List<String> newArgs = new ArrayList<>(args);
|
|
||||||
newArgs.remove(0);
|
|
||||||
completions.addAll(tabComplete(holder.subcommands.get(args.get(0)), sender, newArgs));
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
if(args.size() <= holder.arguments.size()) {
|
|
||||||
TabCompleter completer = holder.arguments.get(args.size() - 1).tabCompleter().getConstructor().newInstance();
|
|
||||||
pluginInjector.inject(completer);
|
|
||||||
completions.addAll(completer.complete(sender));
|
|
||||||
}
|
|
||||||
} catch(InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | InjectionException e) {
|
|
||||||
throw new MalformedCommandException("Unable to reflectively instantiate tab-completer: ", e);
|
|
||||||
}
|
|
||||||
return completions;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getMaxArgumentDepth(CommandHolder holder) {
|
|
||||||
int max = 0;
|
|
||||||
max = FastMath.max(holder.arguments.size() + holder.switchList.size(), max);
|
|
||||||
for(CommandHolder value : holder.subcommands.values()) {
|
|
||||||
max = FastMath.max(max, getMaxArgumentDepth(value) + 1);
|
|
||||||
}
|
|
||||||
return max;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Pre-processes command metadata.
|
|
||||||
*/
|
|
||||||
private static final class CommandHolder {
|
|
||||||
private final Class<? extends CommandTemplate> clazz;
|
|
||||||
private final Map<String, CommandHolder> subcommands = new HashMap<>();
|
|
||||||
private final Map<String, String> switches = new HashMap<>();
|
|
||||||
private final List<Argument> arguments;
|
|
||||||
private final List<Switch> switchList;
|
|
||||||
private final Map<String, Argument> argumentMap = new HashMap<>();
|
|
||||||
|
|
||||||
private CommandHolder(Class<? extends CommandTemplate> clazz) throws MalformedCommandException {
|
|
||||||
this.clazz = clazz;
|
|
||||||
if(clazz.isAnnotationPresent(Command.class)) {
|
|
||||||
Command command = clazz.getAnnotation(Command.class);
|
|
||||||
for(Subcommand subcommand : command.subcommands()) {
|
|
||||||
if(subcommands.containsKey(subcommand.value()))
|
|
||||||
throw new MalformedCommandException("Duplicate subcommand: " + subcommand);
|
|
||||||
CommandHolder holder = new CommandHolder(subcommand.clazz());
|
|
||||||
subcommands.put(subcommand.value(), holder);
|
|
||||||
for(String alias : subcommand.aliases()) {
|
|
||||||
subcommands.put(alias, holder);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for(Switch aSwitch : command.switches()) {
|
|
||||||
if(switches.containsKey(aSwitch.value())) throw new MalformedCommandException("Duplicate switch: " + aSwitch);
|
|
||||||
switches.put(aSwitch.value(), aSwitch.value());
|
|
||||||
for(String alias : aSwitch.aliases()) {
|
|
||||||
switches.put(alias, aSwitch.value());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for(Argument argument : command.arguments()) {
|
|
||||||
if(argumentMap.containsKey(argument.value())) throw new MalformedCommandException("Duplicate argument: " + argument);
|
|
||||||
argumentMap.put(argument.value(), argument);
|
|
||||||
}
|
|
||||||
arguments = Arrays.asList(command.arguments());
|
|
||||||
switchList = Arrays.asList(command.switches());
|
|
||||||
} else {
|
|
||||||
arguments = Collections.emptyList();
|
|
||||||
switchList = Collections.emptyList();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of Terra.
|
|
||||||
*
|
|
||||||
* Terra is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Terra is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.dfsek.terra.commands;
|
|
||||||
|
|
||||||
import com.dfsek.terra.api.Platform;
|
|
||||||
import com.dfsek.terra.api.command.CommandTemplate;
|
|
||||||
import com.dfsek.terra.api.command.annotation.Command;
|
|
||||||
import com.dfsek.terra.api.entity.CommandSender;
|
|
||||||
import com.dfsek.terra.api.inject.annotations.Inject;
|
|
||||||
|
|
||||||
|
|
||||||
@Command(
|
|
||||||
usage = "/terra version"
|
|
||||||
)
|
|
||||||
public class VersionCommand implements CommandTemplate {
|
|
||||||
@Inject
|
|
||||||
private Platform platform;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute(CommandSender sender) {
|
|
||||||
String terraVersion = platform.getVersion();
|
|
||||||
sender.sendMessage("Running Terra version " + terraVersion);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-51
@@ -1,51 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of Terra.
|
|
||||||
*
|
|
||||||
* Terra is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Terra is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.dfsek.terra.commands.profiler;
|
|
||||||
|
|
||||||
import com.dfsek.terra.api.command.CommandTemplate;
|
|
||||||
import com.dfsek.terra.api.command.annotation.Command;
|
|
||||||
import com.dfsek.terra.api.command.annotation.Subcommand;
|
|
||||||
import com.dfsek.terra.api.command.annotation.type.DebugCommand;
|
|
||||||
import com.dfsek.terra.api.command.annotation.type.PlayerCommand;
|
|
||||||
import com.dfsek.terra.api.command.annotation.type.WorldCommand;
|
|
||||||
import com.dfsek.terra.api.entity.CommandSender;
|
|
||||||
|
|
||||||
|
|
||||||
@Command(
|
|
||||||
subcommands = {
|
|
||||||
@Subcommand(value = "query", aliases = "q", clazz = ProfileQueryCommand.class),
|
|
||||||
@Subcommand(value = "start", aliases = "s", clazz = ProfileStartCommand.class),
|
|
||||||
@Subcommand(value = "stop", aliases = "st", clazz = ProfileStopCommand.class),
|
|
||||||
@Subcommand(value = "reset", aliases = "r", clazz = ProfileResetCommand.class)
|
|
||||||
},
|
|
||||||
usage = "Commands to enable/disable/query/reset the profiler."
|
|
||||||
)
|
|
||||||
@WorldCommand
|
|
||||||
@PlayerCommand
|
|
||||||
@DebugCommand
|
|
||||||
public class ProfileCommand implements CommandTemplate {
|
|
||||||
@Override
|
|
||||||
public void execute(CommandSender sender) {
|
|
||||||
sender.sendMessage("""
|
|
||||||
---------------Terra/profile---------------"
|
|
||||||
- "start - Starts the profiler"
|
|
||||||
- "stop - Stops the profiler"
|
|
||||||
- "query - Fetches profiler data"
|
|
||||||
- "reset - Resets profiler data""");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-46
@@ -1,46 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of Terra.
|
|
||||||
*
|
|
||||||
* Terra is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Terra is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.dfsek.terra.commands.profiler;
|
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
import com.dfsek.terra.api.Platform;
|
|
||||||
import com.dfsek.terra.api.command.CommandTemplate;
|
|
||||||
import com.dfsek.terra.api.command.annotation.Command;
|
|
||||||
import com.dfsek.terra.api.command.annotation.type.DebugCommand;
|
|
||||||
import com.dfsek.terra.api.entity.CommandSender;
|
|
||||||
import com.dfsek.terra.api.inject.annotations.Inject;
|
|
||||||
|
|
||||||
|
|
||||||
@Command
|
|
||||||
@DebugCommand
|
|
||||||
public class ProfileQueryCommand implements CommandTemplate {
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ProfileQueryCommand.class);
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
private Platform platform;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute(CommandSender sender) {
|
|
||||||
StringBuilder data = new StringBuilder("Terra Profiler data dump: \n");
|
|
||||||
platform.getProfiler().getTimings().forEach((id, timings) -> data.append(id).append(": ").append(timings.toString()).append('\n'));
|
|
||||||
logger.info(data.toString());
|
|
||||||
sender.sendMessage("Profiler data dumped to console.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-39
@@ -1,39 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of Terra.
|
|
||||||
*
|
|
||||||
* Terra is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Terra is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.dfsek.terra.commands.profiler;
|
|
||||||
|
|
||||||
import com.dfsek.terra.api.Platform;
|
|
||||||
import com.dfsek.terra.api.command.CommandTemplate;
|
|
||||||
import com.dfsek.terra.api.command.annotation.Command;
|
|
||||||
import com.dfsek.terra.api.command.annotation.type.DebugCommand;
|
|
||||||
import com.dfsek.terra.api.entity.CommandSender;
|
|
||||||
import com.dfsek.terra.api.inject.annotations.Inject;
|
|
||||||
|
|
||||||
|
|
||||||
@Command
|
|
||||||
@DebugCommand
|
|
||||||
public class ProfileResetCommand implements CommandTemplate {
|
|
||||||
@Inject
|
|
||||||
private Platform platform;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute(CommandSender sender) {
|
|
||||||
platform.getProfiler().reset();
|
|
||||||
sender.sendMessage("Profiler reset.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-39
@@ -1,39 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of Terra.
|
|
||||||
*
|
|
||||||
* Terra is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Terra is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.dfsek.terra.commands.profiler;
|
|
||||||
|
|
||||||
import com.dfsek.terra.api.Platform;
|
|
||||||
import com.dfsek.terra.api.command.CommandTemplate;
|
|
||||||
import com.dfsek.terra.api.command.annotation.Command;
|
|
||||||
import com.dfsek.terra.api.command.annotation.type.DebugCommand;
|
|
||||||
import com.dfsek.terra.api.entity.CommandSender;
|
|
||||||
import com.dfsek.terra.api.inject.annotations.Inject;
|
|
||||||
|
|
||||||
|
|
||||||
@Command
|
|
||||||
@DebugCommand
|
|
||||||
public class ProfileStartCommand implements CommandTemplate {
|
|
||||||
@Inject
|
|
||||||
private Platform platform;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute(CommandSender sender) {
|
|
||||||
platform.getProfiler().start();
|
|
||||||
sender.sendMessage("Profiling enabled.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-39
@@ -1,39 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of Terra.
|
|
||||||
*
|
|
||||||
* Terra is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Terra is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.dfsek.terra.commands.profiler;
|
|
||||||
|
|
||||||
import com.dfsek.terra.api.Platform;
|
|
||||||
import com.dfsek.terra.api.command.CommandTemplate;
|
|
||||||
import com.dfsek.terra.api.command.annotation.Command;
|
|
||||||
import com.dfsek.terra.api.command.annotation.type.DebugCommand;
|
|
||||||
import com.dfsek.terra.api.entity.CommandSender;
|
|
||||||
import com.dfsek.terra.api.inject.annotations.Inject;
|
|
||||||
|
|
||||||
|
|
||||||
@Command
|
|
||||||
@DebugCommand
|
|
||||||
public class ProfileStopCommand implements CommandTemplate {
|
|
||||||
@Inject
|
|
||||||
private Platform platform;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute(CommandSender sender) {
|
|
||||||
platform.getProfiler().stop();
|
|
||||||
sender.sendMessage("Profiling disabled.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user