PandacubeFr/PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better display of multiple minecraft version

Browse Source
This commit is contained in:
Marc Baloup 2019-01-18 18:12:02 +01:00
parent 6636b8fd4d
commit c1778634ad
1 changed files with 81 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
src/main/java/fr/pandacube/java/util/MinecraftVersion.java
View File

@ -1,8 +1,14 @@
package fr.pandacube.java.util;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.google.common.collect.ImmutableList;
public enum MinecraftVersion {
v1_7_2_to_1_7_5(4, "1.7.2-1.7.5"),
@ -11,32 +17,75 @@ public enum MinecraftVersion {
v1_9(107, "1.9"),
v1_9_1(108, "1.9.1"),
v1_9_2(109, "1.9.2"),
v1_9_3_to_1_9_4(110, "1.9.3-1.9.4"),
v1_9_3_to_1_9_4(110, "1.9.3", "1.9.4"),
v1_10(210, "1.10.x"),
v1_11(315, "1.11"),
v1_11_1_to_1_11_2(316, "1.11.1-1.11.2"),
v1_11_1_to_1_11_2(316, "1.11.1", "1.11.2"),
v1_12(335, "1.12"),
v1_12_1(338, "1.12.1"),
v1_12_2(340, "1.12.2"),
v1_13(393, "1.13"),
v1_13_1(401, "1.13.1"),
v1_13_2(404, "1.13.2");
// IMPORTANT: don't forget to update the versionMergeDisplay value when adding a new version;
private static Map<EnumSet<MinecraftVersion>, List<String>> versionMergeDisplay;
static {
versionMergeDisplay = new HashMap<>();
versionMergeDisplay.put(EnumSet.of(v1_7_2_to_1_7_5, v1_7_6_to_1_7_10),
ImmutableList.of("1.7.2-1.7.10"));
versionMergeDisplay.put(EnumSet.of(v1_9, v1_9_1, v1_9_2, v1_9_3_to_1_9_4),
ImmutableList.of("1.9.x"));
versionMergeDisplay.put(EnumSet.of(v1_9, v1_9_1, v1_9_2),
ImmutableList.of("1.9-1.9.2"));
versionMergeDisplay.put(EnumSet.of(v1_9, v1_9_1),
ImmutableList.of("1.9", "1.9.1"));
versionMergeDisplay.put(EnumSet.of(v1_9_1, v1_9_2, v1_9_3_to_1_9_4),
ImmutableList.of("1.9.1-1.9.4"));
versionMergeDisplay.put(EnumSet.of(v1_9_1, v1_9_2),
ImmutableList.of("1.9.1", "1.9.2"));
versionMergeDisplay.put(EnumSet.of(v1_9_2, v1_9_3_to_1_9_4),
ImmutableList.of("1.9.2-1.9.4"));
versionMergeDisplay.put(EnumSet.of(v1_11, v1_11_1_to_1_11_2),
ImmutableList.of("1.11.x"));
versionMergeDisplay.put(EnumSet.of(v1_12, v1_12_1, v1_12_2),
ImmutableList.of("1.12.x"));
versionMergeDisplay.put(EnumSet.of(v1_12, v1_12_1),
ImmutableList.of("1.12", "1.12.1"));
versionMergeDisplay.put(EnumSet.of(v1_12_1, v1_12_2),
ImmutableList.of("1.12.1", "1.12.2"));
versionMergeDisplay.put(EnumSet.of(v1_13, v1_13_1, v1_13_2),
ImmutableList.of("1.13.x"));
versionMergeDisplay.put(EnumSet.of(v1_13, v1_13_1),
ImmutableList.of("1.13", "1.13.1"));
versionMergeDisplay.put(EnumSet.of(v1_13_1, v1_13_2),
ImmutableList.of("1.13.1", "1.13.2"));
}
public final int versionNumber;
public final String versionDisplay;
public final List<String> versionDisplay;
private MinecraftVersion(int v, String d) {
private MinecraftVersion(int v, String... d) {
versionNumber = v;
versionDisplay = d;
versionDisplay = Arrays.asList(d);
}
@Override
public String toString() {
return versionDisplay;
return StringUtil.joinGrammatically(", ", " et ", versionDisplay);
}
public static MinecraftVersion getVersion(int v) {
for (MinecraftVersion mcV : MinecraftVersion.values())
for (MinecraftVersion mcV : values())
if (mcV.versionNumber == v) return mcV;
return null;
@ -45,64 +94,37 @@ public enum MinecraftVersion {
public static String displayOptimizedListOfVersions(List<MinecraftVersion> versions) {
return String.join(", ", getVersionsDisplayList(versions));
return StringUtil.joinGrammatically(", ", " et ", getVersionsDisplayList(versions));
}
public static final List<String> getVersionsDisplayList(List<MinecraftVersion> versions) {
versions = new ArrayList<>(new HashSet<>(versions));
versions.sort((a, b) -> Integer.compare(a.versionNumber, b.versionNumber));
public static final List<String> getVersionsDisplayList(List<MinecraftVersion> vList) {
Set<MinecraftVersion> vSet = EnumSet.copyOf(vList);
List<String> ret = new ArrayList<>();
// grouping 1.7 versions
if (versions.contains(v1_7_2_to_1_7_5) && versions.contains(v1_7_6_to_1_7_10)) {
versions.remove(v1_7_2_to_1_7_5);
versions.remove(v1_7_6_to_1_7_10);
ret.add("1.7");
for (int i = 0; i < values().length; i++) {
if (!vSet.contains(values()[i]))
continue;
EnumSet<MinecraftVersion> vSubSet = EnumSet.of(values()[i]);
while (i + 1 < values().length && vSet.contains(values()[i + 1])) {
i++;
vSubSet.add(values()[i]);
if (!versionMergeDisplay.containsKey(vSubSet)) {
vSubSet.remove(values()[i]);
i--;
break;
}
}
if (vSubSet.size() == 1) {
ret.addAll(values()[i].versionDisplay);
}
else {
ret.addAll(versionMergeDisplay.get(vSubSet));
}
}
// grouping 1.8 versions
if (versions.contains(v1_8)) {
versions.remove(v1_8);
ret.add("1.8");
}
// grouping 1.9 versions
if (versions.contains(v1_9) && versions.contains(v1_9_1) && versions.contains(v1_9_2)
&& versions.contains(v1_9_3_to_1_9_4)) {
versions.remove(v1_9);
versions.remove(v1_9_1);
versions.remove(v1_9_2);
versions.remove(v1_9_3_to_1_9_4);
ret.add("1.9");
}
// grouping 1.10 versions
if (versions.contains(v1_10)) {
versions.remove(v1_10);
ret.add("1.10");
}
// grouping 1.11 versions
if (versions.contains(v1_11) && versions.contains(v1_11_1_to_1_11_2)) {
versions.remove(v1_11);
versions.remove(v1_11_1_to_1_11_2);
ret.add("1.11");
}
// grouping 1.12 versions
if (versions.contains(v1_12) && versions.contains(v1_12_1) && versions.contains(v1_12_2)) {
versions.remove(v1_12);
versions.remove(v1_12_1);
versions.remove(v1_12_2);
ret.add("1.12");
}
// grouping 1.13 versions
if (versions.contains(v1_13) && versions.contains(v1_13_1) && versions.contains(v1_13_2)) {
versions.remove(v1_13);
versions.remove(v1_13_1);
versions.remove(v1_13_2);
ret.add("1.13");
}
for (MinecraftVersion v : versions)
ret.add(v.versionDisplay);
return ret;