Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-10-22 20:30:34 +02:00
Code Issues Projects Releases Wiki Activity

Export users & tracks in a consistent order

Browse Source
This commit is contained in:
Luck 2020-03-03 11:03:30 +00:00
parent 9f3395f256
commit d475ace76c
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/src/main/java/me/lucko/luckperms/common/backup/Exporter.java
View File

@ -50,12 +50,13 @@ import java.nio.file.Path;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.TreeMap;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
@ -123,10 +124,10 @@ public class Exporter implements Runnable {
private JsonObject exportGroups() { private JsonObject exportGroups() {
JsonObject out = new JsonObject(); JsonObject out = new JsonObject();
List<Group> groups = this.plugin.getGroupManager().getAll().values().stream() List<Group> groups = this.plugin.getGroupManager().getAll().values().stream()
.sorted((o1, o2) -> { .sorted(Comparator.<Group>comparingInt(o -> o.getWeight().orElse(0)).reversed()
int i = Integer.compare(o2.getWeight().orElse(0), o1.getWeight().orElse(0)); .thenComparing(Group::getName)
return i != 0 ? i : o1.getName().compareToIgnoreCase(o2.getName()); )
}).collect(Collectors.toList()); .collect(Collectors.toList());
for (Group group : groups) { for (Group group : groups) {
out.add(group.getName(), new JObject() out.add(group.getName(), new JObject()
@ -138,7 +139,9 @@ public class Exporter implements Runnable {
private JsonObject exportTracks() { private JsonObject exportTracks() {
JsonObject out = new JsonObject(); JsonObject out = new JsonObject();
Collection<? extends Track> tracks = this.plugin.getTrackManager().getAll().values(); Collection<Track> tracks = this.plugin.getTrackManager().getAll().values().stream()
.sorted(Comparator.comparing(Track::getName))
.collect(Collectors.toList());
for (Track track : tracks) { for (Track track : tracks) {
out.add(track.getName(), new JObject() out.add(track.getName(), new JObject()
@ -167,7 +170,7 @@ public class Exporter implements Runnable {
Set<CompletableFuture<Void>> futures = new HashSet<>(); Set<CompletableFuture<Void>> futures = new HashSet<>();
AtomicInteger userCount = new AtomicInteger(0); AtomicInteger userCount = new AtomicInteger(0);
Map<UUID, JsonObject> out = Collections.synchronizedMap(new HashMap<>()); Map<UUID, JsonObject> out = Collections.synchronizedMap(new TreeMap<>());
// iterate through each user. // iterate through each user.
for (UUID uuid : users) { for (UUID uuid : users) {