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

Add 1.16.5 in MinecraftVersion enum

Browse Source
This commit is contained in:
Marc Baloup 2021-02-07 17:35:10 +01:00
parent c597cb85c9
commit 861a41f6e0
Signed by: marcbal
GPG Key ID: BBC0FE3ABC30B893
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ public enum MinecraftVersion {
v1_16_1(736, "1.16.1"), v1_16_1(736, "1.16.1"),
v1_16_2(751, "1.16.2"), v1_16_2(751, "1.16.2"),
v1_16_3(753, "1.16.3"), v1_16_3(753, "1.16.3"),
v1_16_4(754, "1.16.4"); v1_16_4_to_1_16_5(754, "1.16.4", "1.16.5");
// IMPORTANT: don't forget to update the versionMergeDisplay value when adding a new version; // IMPORTANT: don't forget to update the versionMergeDisplay value when adding a new version;
private static Map<EnumSet<MinecraftVersion>, List<String>> versionMergeDisplay; private static Map<EnumSet<MinecraftVersion>, List<String>> versionMergeDisplay;
@ -108,26 +108,26 @@ public enum MinecraftVersion {
versionMergeDisplay.put(EnumSet.of(v1_15_1, v1_15_2), versionMergeDisplay.put(EnumSet.of(v1_15_1, v1_15_2),
ImmutableList.of("1.15.1", "1.15.2")); ImmutableList.of("1.15.1", "1.15.2"));
versionMergeDisplay.put(EnumSet.of(v1_16, v1_16_1, v1_16_2, v1_16_3, v1_16_4), versionMergeDisplay.put(EnumSet.of(v1_16, v1_16_1, v1_16_2, v1_16_3, v1_16_4_to_1_16_5),
ImmutableList.of("1.16.x")); ImmutableList.of("1.16.x"));
versionMergeDisplay.put(EnumSet.of(v1_16, v1_16_1, v1_16_2, v1_16_3), versionMergeDisplay.put(EnumSet.of(v1_16, v1_16_1, v1_16_2, v1_16_3),
ImmutableList.of("1.16-1.16.3")); ImmutableList.of("1.16-1.16.3"));
versionMergeDisplay.put(EnumSet.of(v1_16_1, v1_16_2, v1_16_3, v1_16_4), versionMergeDisplay.put(EnumSet.of(v1_16_1, v1_16_2, v1_16_3, v1_16_4_to_1_16_5),
ImmutableList.of("1.16.1-1.16.4")); ImmutableList.of("1.16.1-1.16.5"));
versionMergeDisplay.put(EnumSet.of(v1_16, v1_16_1, v1_16_2), versionMergeDisplay.put(EnumSet.of(v1_16, v1_16_1, v1_16_2),
ImmutableList.of("1.16-1.16.2")); ImmutableList.of("1.16-1.16.2"));
versionMergeDisplay.put(EnumSet.of(v1_16_1, v1_16_2, v1_16_3), versionMergeDisplay.put(EnumSet.of(v1_16_1, v1_16_2, v1_16_3),
ImmutableList.of("1.16.1-1.16.3")); ImmutableList.of("1.16.1-1.16.3"));
versionMergeDisplay.put(EnumSet.of(v1_16_2, v1_16_3, v1_16_4), versionMergeDisplay.put(EnumSet.of(v1_16_2, v1_16_3, v1_16_4_to_1_16_5),
ImmutableList.of("1.16.2-1.16.4")); ImmutableList.of("1.16.2-1.16.5"));
versionMergeDisplay.put(EnumSet.of(v1_16, v1_16_1), versionMergeDisplay.put(EnumSet.of(v1_16, v1_16_1),
ImmutableList.of("1.16", "1.16.1")); ImmutableList.of("1.16", "1.16.1"));
versionMergeDisplay.put(EnumSet.of(v1_16_1, v1_16_2), versionMergeDisplay.put(EnumSet.of(v1_16_1, v1_16_2),
ImmutableList.of("1.16.1", "1.16.2")); ImmutableList.of("1.16.1", "1.16.2"));
versionMergeDisplay.put(EnumSet.of(v1_16_2, v1_16_3), versionMergeDisplay.put(EnumSet.of(v1_16_2, v1_16_3),
ImmutableList.of("1.16.2", "1.16.3")); ImmutableList.of("1.16.2", "1.16.3"));
versionMergeDisplay.put(EnumSet.of(v1_16_3, v1_16_4), versionMergeDisplay.put(EnumSet.of(v1_16_3, v1_16_4_to_1_16_5),
ImmutableList.of("1.16.3", "1.16.4")); ImmutableList.of("1.16.3-1.16.5"));
} }
@ -158,7 +158,7 @@ public enum MinecraftVersion {
} }
public static String displayOptimizedListOfVersionsOr(List<MinecraftVersion> versions) { public static String displayOptimizedListOfVersionsOr(List<MinecraftVersion> versions) {
return StringUtil.joinGrammatically(", ", " et ", getVersionsDisplayList(versions)); return StringUtil.joinGrammatically(", ", " ou ", getVersionsDisplayList(versions));
} }