PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-25 14:14:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed page sorting

Browse source
This commit is contained in:
Sollace 2019-02-20 17:23:05 +02:00
parent 3b2ffc0671
commit 7439352c7c
1 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/main/java/com/minelittlepony/unicopia/enchanting/Pages.java
View file

@ -3,6 +3,7 @@ package com.minelittlepony.unicopia.enchanting;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -24,7 +25,7 @@ public class Pages {
} }
private final Map<ResourceLocation, PageInstance> pages = Maps.newHashMap(); private final Map<ResourceLocation, PageInstance> pages = Maps.newHashMap();
private final List<PageInstance> pagesByIndex = Lists.newArrayList(); private List<PageInstance> pagesByIndex = Lists.newArrayList();
private final Map<String, IConditionFactory> conditionFactories = Maps.newHashMap(); private final Map<String, IConditionFactory> conditionFactories = Maps.newHashMap();
@ -38,29 +39,39 @@ public class Pages {
public void load() { public void load() {
pages.clear(); pages.clear();
pagesByIndex.clear();
assets.walk(); assets.walk();
List<ResourceLocation> names = Lists.newArrayList(); pagesByIndex = pages.values().stream().sorted(this::comparePages).collect(Collectors.toList());
for (PageInstance page : pages.values()) { int i = 0;
if (page.parent != null) {
int i = names.indexOf(page.parent);
if (i != -1) {
names.add(i, page.name);
pagesByIndex.add(i, page);
continue; for (PageInstance page : pagesByIndex) {
page.index = i++;
} }
} }
names.add(page.name); protected int comparePages(PageInstance a, PageInstance b) {
pagesByIndex.add(page); if (a.parent == null && b.parent == null) {
return 0;
} }
for (int i = 0; i < pagesByIndex.size(); i++) { if (a.parent == null) {
pagesByIndex.get(i).index = i; return -1;
} }
if (b.parent == null) {
return 1;
}
if (a.parent.equals(b.name)) {
return 1;
}
if (b.parent.equals(a.name)) {
return -1;
}
return a.name.compareTo(b.name);
} }
void addPage(ResourceLocation id, JsonObject json) throws JsonParseException { void addPage(ResourceLocation id, JsonObject json) throws JsonParseException {