Update to 1.16.x (#83)

* Fix PlayerInteractEvent firing on inventory click * Translate BungeeCord format RGB colors * Update newest Minecraft version * Make Gui open delay 1.16+ exclusive * Fix typo
lucko · Aug 22, 2020 · d684db8 · d684db8
1 parent c4835fd
commit d684db8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/helper/src/main/java/me/lucko/helper/menu/Gui.java b/helper/src/main/java/me/lucko/helper/menu/Gui.java
@@ -31,6 +31,8 @@
 import me.lucko.helper.metadata.Metadata;
 import me.lucko.helper.metadata.MetadataKey;
 import me.lucko.helper.metadata.MetadataMap;
+import me.lucko.helper.reflect.MinecraftVersion;
+import me.lucko.helper.reflect.MinecraftVersions;
 import me.lucko.helper.terminable.TerminableConsumer;
 import me.lucko.helper.terminable.composite.CompositeTerminable;
 import me.lucko.helper.text.Text;
@@ -256,10 +258,23 @@ public void clearItems() {
     }
 
     public void open() {
+        if (MinecraftVersion.getRuntimeVersion().isAfterOrEq(MinecraftVersions.v1_16)) {
+            // delay by a tick in 1.16+ to prevent an unwanted PlayerInteractEvent interfering with inventory clicks
+            Schedulers.sync().runLater(() -> {
+                if (!this.player.isOnline()) {
+                    return;
+                }
+                handleOpen();
+            }, 1);
+        } else {
+            handleOpen();
+        }
+    }
+
+    private void handleOpen() {
         if (this.valid) {
             throw new IllegalStateException("Gui is already opened.");
         }
-
         this.firstDraw = true;
         this.invalidated = false;
         try {

diff --git a/helper/src/main/java/me/lucko/helper/reflect/MinecraftVersion.java b/helper/src/main/java/me/lucko/helper/reflect/MinecraftVersion.java
@@ -51,12 +51,12 @@ public final class MinecraftVersion implements Comparable<MinecraftVersion> {
     /**
      * The newest known version of Minecraft
      */
-    private static final String NEWEST_MINECRAFT_VERSION = "1.13.1";
+    private static final String NEWEST_MINECRAFT_VERSION = "1.16.2";
 
     /**
      * The date (with ISO 8601 or YYYY-MM-DD) when the most recent version was released.
      */
-    private static final String MINECRAFT_LAST_RELEASE_DATE = "2018-08-22";
+    private static final String MINECRAFT_LAST_RELEASE_DATE = "2020-08-11";
 
     /**
      * Gets the {@link MinecraftVersion} of the runtime server.

diff --git a/helper/src/main/java/me/lucko/helper/text3/Text.java b/helper/src/main/java/me/lucko/helper/text3/Text.java
@@ -87,7 +87,7 @@ public static String decolorize(String s) {
     public static String translateAlternateColorCodes(char from, char to, String textToTranslate) {
         char[] b = textToTranslate.toCharArray();
         for (int i = 0; i < b.length - 1; i++) {
-            if (b[i] == from && "0123456789AaBbCcDdEeFfKkLlMmNnOoRr".indexOf(b[i+1]) > -1) {
+            if (b[i] == from && "0123456789AaBbCcDdEeFfKkLlMmNnOoRrXx".indexOf(b[i+1]) > -1) {
                 b[i] = to;
                 b[i+1] = Character.toLowerCase(b[i+1]);
             }