Skip to content

Commit

Permalink
Remove test commands
Browse files Browse the repository at this point in the history
  • Loading branch information
@willkroboth
willkroboth committed Sep 1, 2024
1 parent 1bc6e7a commit ad5f426
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 195 deletions.
121 changes: 0 additions & 121 deletions ...pi-bukkit/commandapi-bukkit-plugin/src/main/java/dev/jorel/commandapi/CommandAPIMain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,13 @@
package dev.jorel.commandapi;

import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;

import dev.jorel.commandapi.arguments.*;
import dev.jorel.commandapi.executors.CommandArguments;
import dev.jorel.commandapi.wrappers.IntegerRange;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.plugin.InvalidPluginException;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;
Expand Down Expand Up @@ -137,121 +132,5 @@ private JavaPlugin getAndValidatePlugin(String pluginName) {
@Override
public void onEnable() {
CommandAPI.onEnable();

List<String> tags = new ArrayList<>();
tags.add("hello");
tags.add("world");

new CommandTree("servertag")
.then(
new LiteralArgument("add").then(
new StringArgument("tag").executes(info -> {
String tag = info.args().getUnchecked("tag");

tags.add(tag);
})
)
)
.then(
new LiteralArgument("tag").then(
new DynamicMultiLiteralArgument("tag", sender -> {
if (sender instanceof Player player) {
List<String> addPlayer = new ArrayList<>(tags);
addPlayer.add(player.getName());
return addPlayer;
} else {
return tags;
}
}).then(new IntegerArgument("extra").replaceSafeSuggestions(SafeSuggestions.suggest(1, 2, 3))
.executes(info -> {
String tag = info.args().getUnchecked("tag");
int extra = info.args().getUnchecked("extra");

info.sender().sendMessage(tag + " " + extra);
}
)
))
)
.register();

new CommandAPICommand("updateCommands")
.executes(info -> {
for (Player player : Bukkit.getOnlinePlayers()) {
CommandAPI.updateRequirements(player);
}
})
.register();

// example from https://github.com/JorelAli/CommandAPI/issues/483
new CommandAPICommand("serverFlag")
.withArguments(
new FlagsArgument("filters")
.loopingBranch(
new LiteralArgument("filter", "sort").setListed(true),
new MultiLiteralArgument("sortType", "furthest", "nearest", "random")
)
.loopingBranch(
new LiteralArgument("filter", "limit").setListed(true),
new IntegerArgument("limitAmount", 0)
)
.loopingBranch(
new LiteralArgument("filter", "distance").setListed(true),
new IntegerRangeArgument("range")
)
)
.executes(info -> {
for (CommandArguments branch : info.args().<List<CommandArguments>>getUnchecked("filters")) {
String filterType = branch.getUnchecked("filter");
info.sender().sendMessage(switch (filterType) {
case "sort" -> "Sort " + branch.<String>getUnchecked("sortType");
case "limit" -> "Limit " + branch.<Integer>getUnchecked("limitAmount");
case "distance" -> "Distance " + branch.<IntegerRange>getUnchecked("range");
default -> "Unknown branch " + filterType;
});
}
})
.register();

List<String> keys = new ArrayList<>();
List<String> values = new ArrayList<>();
new CommandTree("dynamicMap")
.then(
new LiteralArgument("add").then(
new MultiLiteralArgument("type", "key", "value").then(
new StringArgument("item").executes(info -> {
List<String> choice = (info.args().getUnchecked("type").equals("key")) ?
keys :
values;

String item = info.args().getUnchecked("item");
choice.add(item);
})
)
)
)
.then(
new CustomArgument<>(
new FlagsArgument("map").loopingBranch(
new DynamicMultiLiteralArgument("key", sender -> keys),
new LiteralArgument("->"), // Haha! Multi-character delimiter :P
new DynamicMultiLiteralArgument("value", sender -> values)
),
info -> {
Map<String, String> result = new HashMap<>();
for (CommandArguments args : (List<CommandArguments>) info.currentInput()) {
String key = args.getUnchecked("key");
String value = args.getUnchecked("value");

if (result.put(key, value) != null)
throw CustomArgument.CustomArgumentException.fromString("Duplicate key \"" + key + "\"");
}
return result;
}
).executes(info -> {
Map<String, String> result = info.args().getUnchecked("map");
info.sender().sendMessage(result.toString());
})
)
.register();
}
}
74 changes: 0 additions & 74 deletions ...elocity/commandapi-velocity-plugin/src/main/java/dev/jorel/commandapi/CommandAPIMain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@
import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
import com.velocitypowered.api.plugin.Plugin;
import com.velocitypowered.api.plugin.annotation.DataDirectory;
import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.proxy.ProxyServer;
import dev.jorel.commandapi.arguments.*;
import dev.jorel.commandapi.executors.CommandArguments;
import net.kyori.adventure.text.Component;
import ninja.leaping.configurate.ConfigurationNode;
import ninja.leaping.configurate.yaml.YAMLConfigurationLoader;

Expand All @@ -20,8 +16,6 @@
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;

/**
Expand Down Expand Up @@ -79,74 +73,6 @@ public CommandAPIMain(ProxyServer server, Logger logger, @DataDirectory Path dat
public void onProxyInitialization(ProxyInitializeEvent event) {
// Enable
CommandAPI.onEnable();

List<String> tags = new ArrayList<>();
tags.add("hello");
tags.add("world");

new CommandTree("proxytag")
.then(
new LiteralArgument("add").then(
new StringArgument("tag").executes(info -> {
String tag = info.args().getUnchecked("tag");

tags.add(tag);
})
)
)
.then(
new LiteralArgument("tag").then(
new DynamicMultiLiteralArgument("tag", sender -> {
if (sender instanceof Player player) {
List<String> addPlayer = new ArrayList<>(tags);
addPlayer.add(player.getUsername());
return addPlayer;
} else {
return tags;
}
}).then(new IntegerArgument("extra").replaceSafeSuggestions(SafeSuggestions.suggest(1, 2, 3))
.executes(info -> {
String tag = info.args().getUnchecked("tag");
int extra = info.args().getUnchecked("extra");

info.sender().sendMessage(Component.text(tag + " " + extra));
})
)
)
)
.register();

// example from https://github.com/JorelAli/CommandAPI/issues/483
new CommandAPICommand("proxyflag")
.withArguments(
new FlagsArgument("filters")
.loopingBranch(
new LiteralArgument("filter", "sort").setListed(true),
new MultiLiteralArgument("sortType", "furthest", "nearest", "random")
)
.loopingBranch(
new LiteralArgument("filter", "limit").setListed(true),
new IntegerArgument("limitAmount", 0)
)
.loopingBranch(
new LiteralArgument("filter", "distance").setListed(true),
new IntegerArgument("low"),
new IntegerArgument("high")
)
)
.executes(info -> {
for (CommandArguments branch : info.args().<List<CommandArguments>>getUnchecked("filters")) {
String filterType = branch.getUnchecked("filter");
info.sender().sendMessage(Component.text(switch (filterType) {
case "sort" -> "Sort " + branch.<String>getUnchecked("sortType");
case "limit" -> "Limit " + branch.<Integer>getUnchecked("limitAmount");
case "distance" -> "Distance " + branch.<Integer>getUnchecked("low")
+ " to " + branch.<Integer>getUnchecked("high");
default -> "Unknown branch " + filterType;
}));
}
})
.register();
}

@Subscribe
Expand Down

0 comments on commit ad5f426

Please sign in to comment.