From 58ff94539f7e9fc092c2755bb9aba884abe7f5ee Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Wed, 22 Dec 2021 06:50:31 -0500
Subject: fix /locraw bug, bumped version (#37)

closes #35
---
 .../io/github/moulberry/notenoughupdates/NEUEventListener.java    | 2 +-
 .../io/github/moulberry/notenoughupdates/NotEnoughUpdates.java    | 8 ++++----
 .../io/github/moulberry/notenoughupdates/dungeons/DungeonWin.java | 4 ++--
 .../java/io/github/moulberry/notenoughupdates/util/SBInfo.java    | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java
index 09505c52..db610720 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java
@@ -131,7 +131,7 @@ public class NEUEventListener {
                     neu.displayLinks(o);
 
                     Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(""));
-                } else if (shouldPreUpdate && NotEnoughUpdates.VERSION.equalsIgnoreCase("2.0.0-REL")) {
+                } else if (shouldPreUpdate && NotEnoughUpdates.VERSION_ID == o.get("version").getAsInt()) {
                     String pre_update_msg = o.get("pre_update_msg").getAsString();
 
                     int first_len = -1;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
index c1e1cd0d..881e3d3c 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
@@ -44,10 +44,10 @@ import java.util.Set;
 @Mod(modid = NotEnoughUpdates.MODID, version = NotEnoughUpdates.VERSION, clientSideOnly = true)
 public class NotEnoughUpdates {
     public static final String MODID = "notenoughupdates";
-    public static final String VERSION = "2.0.0-REL";
-    public static final String PRE_VERSION = "30.2";
-    public static final int VERSION_ID = 20000;
-    public static final int PRE_VERSION_ID = 3002;
+    public static final String VERSION = "2.1.0-REL";
+    public static final String PRE_VERSION = "0.0";
+    public static final int VERSION_ID = 20100;
+    public static final int PRE_VERSION_ID = 0;
 
     public static NotEnoughUpdates INSTANCE = null;
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonWin.java b/src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonWin.java
index d79e9840..b92318e8 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonWin.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonWin.java
@@ -152,8 +152,8 @@ public class DungeonWin {
         long currentTime = System.currentTimeMillis();
         String unformatted = Utils.cleanColour(e.message.getUnformattedText());
 
-        //Added two more Resets, cant do Reset+Reset+Reset cause idk?
-        //hypixel please dont randomly add more
+        //Added two more Resets, can't do Reset+Reset+Reset cause idk?
+        //hypixel please don't randomly add more
 
         if (e.message.getFormattedText().startsWith(EnumChatFormatting.RESET + "" + EnumChatFormatting.RESET + "" + EnumChatFormatting.RESET + "   ")) {
             if (currentTime - lastDungeonFinish > 30000) {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java b/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java
index 6b901622..fab85dc7 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java
@@ -87,7 +87,7 @@ public class SBInfo {
         unloadedWorld = System.currentTimeMillis();
     }
 
-    private static final Pattern JSON_BRACKET_PATTERN = Pattern.compile("\\{.+}");
+    private static final Pattern JSON_BRACKET_PATTERN = Pattern.compile("^\\{.+}");
 
     public void onSendChatMessage(String msg) {
         if (msg.trim().startsWith("/locraw") || msg.trim().startsWith("/locraw ")) {
-- 
cgit