carm/EasyPlugin
carm/EasyPlugin
1
Fork 0
mirror of https://github.com/CarmJos/EasyPlugin.git synced 2024-09-19 19:25:45 +00:00
Code Issues Releases Activity

fix(command): 修复SimpleCompleter使用异常

Browse Source
This commit is contained in:
Carm Jos 2022-05-23 00:48:32 +08:00
parent be798a981a
commit c7190274d7
10 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/command/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.4.2</version>
<version>1.4.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

19
base/command/src/main/java/cc/carm/lib/easyplugin/command/SimpleCompleter.java
View File

@ -13,6 +13,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream;
public class SimpleCompleter {
@ -21,9 +22,13 @@ public class SimpleCompleter {
}
public static @NotNull List<String> objects(@NotNull String input, int limit, List<?> objects) {
return objects.stream().filter(Objects::nonNull).map(Object::toString)
return objects(input, limit, objects.stream());
}
public static @NotNull List<String> objects(@NotNull String input, int limit, Stream<?> stream) {
return stream.filter(Objects::nonNull).map(Object::toString)
.filter(s -> StringUtil.startsWithIgnoreCase(s, input))
.limit(Math.min(0, limit)).collect(Collectors.toList());
.limit(Math.max(0, limit)).collect(Collectors.toList());
}
public static @NotNull List<String> text(@NotNull String input, String... texts) {
@ -47,7 +52,7 @@ public class SimpleCompleter {
}
public static @NotNull List<String> onlinePlayers(@NotNull String input, int limit) {
return text(input, limit, Bukkit.getOnlinePlayers().stream().map(HumanEntity::getName).collect(Collectors.toList()));
return objects(input, limit, Bukkit.getOnlinePlayers().stream().map(HumanEntity::getName));
}
public static @NotNull List<String> allPlayers(@NotNull String input) {
@ -55,7 +60,7 @@ public class SimpleCompleter {
}
public static @NotNull List<String> allPlayers(@NotNull String input, int limit) {
return text(input, limit, Arrays.stream(Bukkit.getOfflinePlayers()).map(OfflinePlayer::getName).collect(Collectors.toList()));
return objects(input, limit, Arrays.stream(Bukkit.getOfflinePlayers()).map(OfflinePlayer::getName));
}
public static @NotNull List<String> worlds(@NotNull String input) {
@ -63,7 +68,7 @@ public class SimpleCompleter {
}
public static @NotNull List<String> worlds(@NotNull String input, int limit) {
return text(input, limit, Bukkit.getWorlds().stream().map(World::getName).collect(Collectors.toList()));
return objects(input, limit, Bukkit.getWorlds().stream().map(World::getName));
}
public static @NotNull List<String> materials(@NotNull String input) {
@ -71,7 +76,7 @@ public class SimpleCompleter {
}
public static @NotNull List<String> materials(@NotNull String input, int limit) {
return text(input, limit, Arrays.stream(Material.values()).map(Enum::name).collect(Collectors.toList()));
return objects(input, limit, Arrays.stream(Material.values()).map(Enum::name));
}
public static @NotNull List<String> effects(@NotNull String input) {
@ -79,7 +84,7 @@ public class SimpleCompleter {
}
public static @NotNull List<String> effects(@NotNull String input, int limit) {
return text(input, limit, Arrays.stream(PotionEffectType.values()).map(PotionEffectType::getName).collect(Collectors.toList()));
return objects(input, limit, Arrays.stream(PotionEffectType.values()).map(PotionEffectType::getName));
}
}

2
base/gui/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.4.2</version>
<version>1.4.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
base/main/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.4.2</version>
<version>1.4.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
collection/all/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.4.2</version>
<version>1.4.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
collection/bom/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.4.2</version>
<version>1.4.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
collection/common/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.4.2</version>
<version>1.4.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
extension/papi/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.4.2</version>
<version>1.4.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
extension/vault/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.4.2</version>
<version>1.4.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
pom.xml
View File

@ -15,7 +15,7 @@
<groupId>cc.carm.lib</groupId>
<artifactId>easyplugin-parent</artifactId>
<packaging>pom</packaging>
<version>1.4.2</version>
<version>1.4.3</version>
<modules>
<module>base/main</module>