From f114baebd6d4448ae91a003dec36a2eacf60a445 Mon Sep 17 00:00:00 2001 From: dfsek Date: Sun, 10 Jan 2021 14:37:44 -0700 Subject: [PATCH] better tab completion, fix testWithPaper task --- platforms/bukkit/build.gradle.kts | 2 +- .../bukkit/command/command/structure/load/LoadFullCommand.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platforms/bukkit/build.gradle.kts b/platforms/bukkit/build.gradle.kts index 2a04443bf..8de466339 100644 --- a/platforms/bukkit/build.gradle.kts +++ b/platforms/bukkit/build.gradle.kts @@ -84,7 +84,7 @@ val testWithPaper = task(name = "testWithPaper") { // Copy Terra into dir doFirst { copy { - from("${buildDir}/libs/bukkit-${version}-shaded.jar") + from("${buildDir}/libs/Terra-bukkit-${version}-shaded.jar") into("${testDir}/plugins/") } } diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadFullCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadFullCommand.java index 3e7a1a35e..f1569a2b9 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadFullCommand.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadFullCommand.java @@ -76,7 +76,7 @@ public class LoadFullCommand extends LoadCommand implements DebugCommand { if(!TerraWorld.isTerraWorld(w)) return Collections.emptyList(); switch(args.length) { case 1: - return getMain().getWorld(w).getConfig().getScriptRegistry().entries().stream().map(StructureScript::getId).collect(Collectors.toList()); + return getMain().getWorld(w).getConfig().getScriptRegistry().entries().stream().map(StructureScript::getId).filter(id -> id.startsWith(args[0])).sorted().collect(Collectors.toList()); case 2: return Stream.of("0", "90", "180", "270").filter(string -> string.toUpperCase().startsWith(args[1].toUpperCase())).collect(Collectors.toList()); }