From 861a41f6e0b10851f5c0f3248d5d15f742ffee3e Mon Sep 17 00:00:00 2001 From: Marc Baloup Date: Sun, 7 Feb 2021 17:35:10 +0100 Subject: [PATCH] Add 1.16.5 in MinecraftVersion enum --- .../fr/pandacube/util/MinecraftVersion.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/fr/pandacube/util/MinecraftVersion.java b/src/main/java/fr/pandacube/util/MinecraftVersion.java index 0d508f0..050351e 100644 --- a/src/main/java/fr/pandacube/util/MinecraftVersion.java +++ b/src/main/java/fr/pandacube/util/MinecraftVersion.java @@ -39,7 +39,7 @@ public enum MinecraftVersion { v1_16_1(736, "1.16.1"), v1_16_2(751, "1.16.2"), 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; private static Map, List> versionMergeDisplay; @@ -108,26 +108,26 @@ public enum MinecraftVersion { versionMergeDisplay.put(EnumSet.of(v1_15_1, v1_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")); versionMergeDisplay.put(EnumSet.of(v1_16, v1_16_1, v1_16_2, v1_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), - ImmutableList.of("1.16.1-1.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.5")); versionMergeDisplay.put(EnumSet.of(v1_16, v1_16_1, v1_16_2), ImmutableList.of("1.16-1.16.2")); versionMergeDisplay.put(EnumSet.of(v1_16_1, v1_16_2, v1_16_3), ImmutableList.of("1.16.1-1.16.3")); - versionMergeDisplay.put(EnumSet.of(v1_16_2, v1_16_3, v1_16_4), - ImmutableList.of("1.16.2-1.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.5")); versionMergeDisplay.put(EnumSet.of(v1_16, v1_16_1), ImmutableList.of("1.16", "1.16.1")); versionMergeDisplay.put(EnumSet.of(v1_16_1, v1_16_2), ImmutableList.of("1.16.1", "1.16.2")); versionMergeDisplay.put(EnumSet.of(v1_16_2, v1_16_3), ImmutableList.of("1.16.2", "1.16.3")); - versionMergeDisplay.put(EnumSet.of(v1_16_3, v1_16_4), - ImmutableList.of("1.16.3", "1.16.4")); + versionMergeDisplay.put(EnumSet.of(v1_16_3, v1_16_4_to_1_16_5), + ImmutableList.of("1.16.3-1.16.5")); } @@ -158,7 +158,7 @@ public enum MinecraftVersion { } public static String displayOptimizedListOfVersionsOr(List versions) { - return StringUtil.joinGrammatically(", ", " et ", getVersionsDisplayList(versions)); + return StringUtil.joinGrammatically(", ", " ou ", getVersionsDisplayList(versions)); }