Add ArgumentMap

This commit is contained in:
LeoDog896 2021-04-06 22:07:38 -04:00
parent 2606f2b291
commit 0e4168ba45
4 changed files with 73 additions and 28 deletions

View File

@ -0,0 +1,10 @@
package net.minestom.server.command.builder;
import net.minestom.server.command.builder.exception.ArgumentSyntaxException;
@FunctionalInterface
public interface ArgumentMapper<I, O> {
O accept(I i) throws ArgumentSyntaxException;
}

View File

@ -1,10 +1,7 @@
package net.minestom.server.command.builder.arguments;
import com.google.common.annotations.Beta;
import net.minestom.server.command.builder.ArgumentCallback;
import net.minestom.server.command.builder.Command;
import net.minestom.server.command.builder.CommandExecutor;
import net.minestom.server.command.builder.NodeMaker;
import net.minestom.server.command.builder.*;
import net.minestom.server.command.builder.exception.ArgumentSyntaxException;
import net.minestom.server.command.builder.suggestion.SuggestionCallback;
import net.minestom.server.network.packet.server.play.DeclareCommandsPacket;
@ -220,6 +217,10 @@ public abstract class Argument<T> {
return suggestionCallback != null;
}
public <O> ArgumentMap<T, O> map(ArgumentMapper<T, O> mapper) {
return new ArgumentMap<>(this, mapper);
}
@Override
public boolean equals(Object o) {
if (this == o) return true;

View File

@ -0,0 +1,34 @@
package net.minestom.server.command.builder.arguments;
import net.minestom.server.command.builder.ArgumentMapper;
import net.minestom.server.command.builder.NodeMaker;
import net.minestom.server.command.builder.exception.ArgumentSyntaxException;
import org.jetbrains.annotations.NotNull;
/**
* Represents an argument that maps an existing argument to a vlaue.
* @param <I> The input (any object)
* @param <O> The output (any object)
*/
public class ArgumentMap<I, O> extends Argument<O> {
final Argument<I> argument;
final ArgumentMapper<I, O> mapper;
public ArgumentMap(Argument<I> argument, ArgumentMapper<I, O> mapper) {
super(argument.getId());
this.argument = argument;
this.mapper = mapper;
}
@Override
public @NotNull O parse(@NotNull String input) throws ArgumentSyntaxException {
return mapper.accept(argument.parse(input));
}
@Override
public void processNodes(@NotNull NodeMaker nodeMaker, boolean executable) {
argument.processNodes(nodeMaker, executable);
}
}

View File

@ -5,13 +5,11 @@ import net.minestom.server.MinecraftServer;
import net.minestom.server.command.CommandSender;
import net.minestom.server.command.builder.Command;
import net.minestom.server.command.builder.CommandContext;
import net.minestom.server.command.builder.arguments.Argument;
import net.minestom.server.command.builder.arguments.ArgumentString;
import net.minestom.server.command.builder.arguments.ArgumentMap;
import net.minestom.server.command.builder.arguments.ArgumentType;
import net.minestom.server.command.builder.exception.ArgumentSyntaxException;
import net.minestom.server.extensions.Extension;
import net.minestom.server.extensions.ExtensionManager;
import org.apache.commons.lang3.StringUtils;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@ -20,14 +18,20 @@ import java.nio.charset.StandardCharsets;
public class UnloadExtensionCommand extends Command {
private final ArgumentString extensionName;
private final ArgumentMap<String, Extension> extensionName;
public UnloadExtensionCommand() {
super("unload");
setDefaultExecutor(this::usage);
extensionName = ArgumentType.String("extensionName");
extensionName = ArgumentType.String("extensionName").map((input) -> {
Extension extension = MinecraftServer.getExtensionManager().getExtension(input);
if (extension == null) throw new ArgumentSyntaxException("The specified extension was not found", input, 1);
return extension;
});
setArgumentCallback(this::extensionCallback, extensionName);
@ -39,29 +43,25 @@ public class UnloadExtensionCommand extends Command {
}
private void execute(CommandSender sender, CommandContext context) {
final String name = context.get(extensionName);
sender.sendMessage(Component.text("extensionName = " + name + "...."));
final Extension ext = context.get(extensionName);
sender.sendMessage(Component.text("extensionName = " + ext.getOrigin().getName() + "...."));
ExtensionManager extensionManager = MinecraftServer.getExtensionManager();
Extension ext = extensionManager.getExtension(name);
if (ext != null) {
try {
extensionManager.unloadExtension(ext.getOrigin().getName());
} catch (Throwable t) {
try {
extensionManager.unloadExtension(name);
} catch (Throwable t) {
try {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
t.printStackTrace();
t.printStackTrace(new PrintStream(baos));
baos.flush();
baos.close();
String contents = baos.toString(StandardCharsets.UTF_8);
contents.lines().map(Component::text).forEach(sender::sendMessage);
} catch (IOException e) {
e.printStackTrace();
}
ByteArrayOutputStream baos = new ByteArrayOutputStream();
t.printStackTrace();
t.printStackTrace(new PrintStream(baos));
baos.flush();
baos.close();
String contents = baos.toString(StandardCharsets.UTF_8);
contents.lines().map(Component::text).forEach(sender::sendMessage);
} catch (IOException e) {
e.printStackTrace();
}
} else {
sender.sendMessage(Component.text("Extension '" + name + "' does not exist."));
}
}