Fork/Velocitab
2
0
Fork 0
forked from Upstream/Velocitab
Code Pull Requests Actions Releases Activity

Fix parsing of enums in sortable element list in config file

Browse Source
This commit is contained in:
William 2023-03-16 20:00:49 +00:00
parent 829ab42e2e
commit 8a4651fb5f
No known key found for this signature in database
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/william278/velocitab/config/Settings.java
View File

@ -58,9 +58,9 @@ public class Settings {
@YamlKey("sort_players_by") @YamlKey("sort_players_by")
@YamlComment("Ordered list of elements by which players should be sorted. (ROLE_WEIGHT, ROLE_NAME and SERVER are supported)") @YamlComment("Ordered list of elements by which players should be sorted. (ROLE_WEIGHT, ROLE_NAME and SERVER are supported)")
private List<TabPlayer.SortableElement> sortPlayersBy = List.of( private List<String> sortPlayersBy = List.of(
TabPlayer.SortableElement.ROLE_WEIGHT, TabPlayer.SortableElement.ROLE_WEIGHT.name(),
TabPlayer.SortableElement.ROLE_NAME TabPlayer.SortableElement.ROLE_NAME.name()
); );
@YamlKey("update_rate") @YamlKey("update_rate")
@ -118,7 +118,10 @@ public class Settings {
@NotNull @NotNull
public List<TabPlayer.SortableElement> getSortingElementList() { public List<TabPlayer.SortableElement> getSortingElementList() {
return sortPlayersBy; return sortPlayersBy.stream()
.map(p -> TabPlayer.SortableElement.parse(p).orElseThrow(() ->
new IllegalArgumentException("Invalid sorting element set in config file: " + p)))
.toList();
} }
public int getUpdateRate() { public int getUpdateRate() {

6
src/main/java/net/william278/velocitab/player/TabPlayer.java
View File

@ -7,6 +7,8 @@ import net.william278.velocitab.config.Placeholder;
import net.william278.velocitab.tab.PlayerTabList; import net.william278.velocitab.tab.PlayerTabList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.Arrays;
import java.util.Optional;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -94,6 +96,10 @@ public final class TabPlayer implements Comparable<TabPlayer> {
private String resolve(@NotNull TabPlayer tabPlayer, @NotNull Velocitab plugin) { private String resolve(@NotNull TabPlayer tabPlayer, @NotNull Velocitab plugin) {
return elementResolver.apply(tabPlayer, plugin); return elementResolver.apply(tabPlayer, plugin);
} }
public static Optional<SortableElement> parse(@NotNull String s) {
return Arrays.stream(values()).filter(element -> element.name().equalsIgnoreCase(s)).findFirst();
}
} }
} }