GabrielTofvesson/SpigotInvTweaks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up tab completion implementation

Browse Source
This commit is contained in:
Gabriel Tofvesson 2021-05-20 00:17:23 +02:00
parent 5540b4332d
commit 4eb5892517
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dev/w1zzrd/invtweaks/listener/TabCompletionListener.java
View File

@ -10,6 +10,7 @@ import org.bukkit.event.server.TabCompleteEvent;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -21,7 +22,7 @@ public class TabCompletionListener implements Listener {
private static final List<NamespacedKey> materialTypes = Arrays.stream(Material.values()) private static final List<NamespacedKey> materialTypes = Arrays.stream(Material.values())
.map(Material::getKey) .map(Material::getKey)
.sorted(Comparator.comparing(NamespacedKey::toString)) .sorted(Comparator.comparing(NamespacedKey::toString))
.collect(Collectors.toUnmodifiableList()); .toList();
/** /**
* Whether or not there are namespaces other than the default "minecraft" * Whether or not there are namespaces other than the default "minecraft"
@ -40,7 +41,6 @@ public class TabCompletionListener implements Listener {
} }
multiNS = ns == null; multiNS = ns == null;
} }
@ -62,7 +62,7 @@ public class TabCompletionListener implements Listener {
completions.addAll(getMatching(split[1]).collect(Collectors.toList())); completions.addAll(getMatching(split[1]).collect(Collectors.toList()));
} else { } else {
completions.clear(); completions.clear();
completions.addAll(materialTypes.stream().map(it -> multiNS ? it.toString() : it.getKey()).collect(Collectors.toList())); completions.addAll(materialTypes.stream().map(TabCompletionListener::toUniqueNSString).collect(Collectors.toList()));
} }
} else if (buffer.startsWith("/magnet ")) { } else if (buffer.startsWith("/magnet ")) {
completions.clear(); completions.clear();
@ -72,6 +72,9 @@ public class TabCompletionListener implements Listener {
} }
} }
public static String toUniqueNSString(final NamespacedKey key) {
return multiNS ? key.toString() : key.getKey();
}
/** /**
* Get all material namespace names which fuzzy-match the given string * Get all material namespace names which fuzzy-match the given string