From e3fa70ec3bed0667187c44c62764fe04eb182395 Mon Sep 17 00:00:00 2001
From: DoKM <mcazzyman@gmail.com>
Date: Thu, 2 Sep 2021 21:57:34 +0200
Subject: Fix neuec not parsing correctly and 2 crashes when copying stuff

---
 .../github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java   | 4 ++--
 .../github/moulberry/notenoughupdates/miscgui/GuiInvButtonEditor.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java
index f9344a3a..4bbcdbdd 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java
@@ -67,7 +67,7 @@ public class GuiEnchantColour extends GuiScreen {
     public static int UNDERLINE_MODIFIER = 0b1000;
     public static int STRIKETHROUGH_MODIFIER = 0b10000;
     private Gson gson = new Gson();
-    private static final Pattern settingPattern = Pattern.compile(".*:[>=<]:[0-9]:[a-zA-Z0-9]:[0-9][0-9]?");
+    private static final Pattern settingPattern = Pattern.compile(".*:[>=<]:[0-9]+:[a-zA-Z0-9]+(:[a-zA-Z0-9])?");
 
     private List<String> getEnchantNamesPretty() {
         if(enchantNamesPretty == null) {
@@ -318,7 +318,7 @@ public class GuiEnchantColour extends GuiScreen {
             } catch (IllegalArgumentException e){
                 return false;
             }
-        } catch (HeadlessException | IOException | UnsupportedFlavorException e) {
+        } catch (HeadlessException | IOException | UnsupportedFlavorException | IllegalStateException e) {
             return false;
         }
     }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiInvButtonEditor.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiInvButtonEditor.java
index cfc51708..22a17c9f 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiInvButtonEditor.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiInvButtonEditor.java
@@ -495,7 +495,7 @@ public class GuiInvButtonEditor extends GuiScreen {
             } catch (IllegalArgumentException e){
                 return false;
             }
-        } catch (HeadlessException | IOException | UnsupportedFlavorException e) {
+        } catch (HeadlessException | IOException | UnsupportedFlavorException | IllegalStateException e) {
             return false;
         }
     }
-- 
cgit