mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2025-03-01 13:36:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't suggest default namespaces.

Browse Source 
This just ends adding a lot of `minecraft:` to otherwise short commands.
This commit is contained in:
wizjany 2020-04-10 12:20:43 -04:00
parent 8c83fd6223
commit d260185183
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
worldedit-core/src/main/java/com/sk89q/worldedit/command/util/SuggestionHelper.java
View File

@ -149,7 +149,8 @@ public static <V extends Keyed> Stream<String> getNamespacedRegistrySuggestions(
if (input.isEmpty() || input.equals(":")) {
final Set<String> namespaces = registry.getKnownNamespaces();
if (namespaces.size() == 1) {
return registry.keySet().stream();
int def = namespaces.iterator().next().length() + 1; // default namespace length + ':'
return registry.keySet().stream().map(s -> s.substring(def));
} else {
return namespaces.stream().map(s -> s + ":");
}
@ -164,7 +165,8 @@ public static <V extends Keyed> Stream<String> getNamespacedRegistrySuggestions(
// don't yet have namespace - search namespaces + default
final String lowerSearch = input.toLowerCase(Locale.ROOT);
String defKey = registry.getDefaultNamespace() + ":" + lowerSearch;
return Stream.concat(registry.keySet().stream().filter(s -> s.startsWith(defKey)),
int defLength = registry.getDefaultNamespace().length() + 1;
return Stream.concat(registry.keySet().stream().filter(s -> s.startsWith(defKey)).map(s -> s.substring(defLength)),
registry.getKnownNamespaces().stream().filter(n -> n.startsWith(lowerSearch)).map(n -> n + ":"));
}
// have a namespace - search that