i think i added mithril gourmand support or smth

3 files changed, 27 insertions, 4 deletions

diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java b/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java
index a469ebb..28e9cc6 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java
@@ -4,9 +4,10 @@ public enum Locations {
     //ERROR LOCATIONS
     DEFAULT("unknown", "Somewhere on Skyblock...", LocationCategory.ERROR),
     NONE("none", "Unknown", LocationCategory.ERROR),
-    //ISLAND
+    //PRIVATE ISLAND
     YOURISLAND("yourisland", "Your Island", LocationCategory.ISLAND),
     GUESTISLAND("guestisland", "Guest Island", LocationCategory.ISLAND),
+    MOULBERRYSISLAND("moulberryisland", "Cool Dude Hub", LocationCategory.ISLAND),
     //HUB
     VILLAGE("village", "Village", LocationCategory.HUB),
     AUCTIONHOUSE("auctionhouse", "Auction House", LocationCategory.HUB),
@@ -34,6 +35,7 @@ public enum Locations {
     BLACKSMITH("blacksmith", "Blacksmith", LocationCategory.HUB),
     FARMHOUSE("farmhouse", "Farmhouse", LocationCategory.HUB),
     WIZARDTOWER("wizardtower", "Wizard Tower", LocationCategory.HUB),
+    THAUMATURGIST("thaumaturgist","Thaumaturgist",LocationCategory.HUB),
     //THE BARN
     THEBARN("thebarn", "The Barn", LocationCategory.BARN),
     WINDMILL("windmill", "Windmill", LocationCategory.BARN),
@@ -84,8 +86,10 @@ public enum Locations {
     DRAGONTAIL("dragontail", "Dragontail", LocationCategory.CRIMSON),
     DRAGONTAILTOWNSQUARE("dragontailtownsquare", "Dragontail Townsquare", LocationCategory.CRIMSON),
     DRAGONTAILAUCTIONHOUS("dragontailauctionhous", "Dragontail AH", LocationCategory.CRIMSON),
+    DRAGONTAILBAZAAR("dragontailbazaar", "Dragontail BZ", LocationCategory.CRIMSON),
     DRAGONTAILBANK("dragontailbank", "Dragontail Bank", LocationCategory.CRIMSON),
-    MINIONSHOP("minionshop", "Minion Shop", LocationCategory.CRIMSON),
+    DRAGONTAILBLACKSMITH("dragontailblacksmith", "Dragontail Blacksmith", LocationCategory.CRIMSON),
+    DRAGONTAILMINIONSHOP("dragontailminionshop", "Dragontail Minion Shop", LocationCategory.CRIMSON),
     CHIEFSHUT("chiefshut", "Chief's Hut", LocationCategory.CRIMSON),
     FORGOTTENSKULL("forgottenskull", "Forgotten Skull", LocationCategory.CRIMSON),
     KUUDRASEND("kuudrasend", "Kuudra's End", LocationCategory.CRIMSON),
@@ -94,6 +98,12 @@ public enum Locations {
     ODGERSHUT("odgershut", "Odger's Hut", LocationCategory.CRIMSON),
     RUINSOFASHFANG("ruinsofashfang", "Ruins of Ashfang", LocationCategory.CRIMSON),
     SCARLETON("scarleton", "Scarleton", LocationCategory.CRIMSON),
+    SCARLETONPLAZA("scarletonplaza", "Scarleton Plaza", LocationCategory.CRIMSON),
+    SCARLETONAUCTIONHOUS("scarletonauctionhous", "Scarleton AH", LocationCategory.CRIMSON),
+    SCARLETONBAZAAR("scarletonbazaar", "Scarleton BZ", LocationCategory.CRIMSON),
+    SCARLETONBANK("scarletonbank", "Scarleton Bank", LocationCategory.CRIMSON),
+    SCARLETONBLACKSMITH("scarletonblacksmith", "Scarleton Blacksmith", LocationCategory.CRIMSON),
+    SCARLETONMINIONSHOP("scarletonminionshop", "Scarleton Minion Shop", LocationCategory.CRIMSON),
     STRONGHOLD("stronghold", "Stronghold", LocationCategory.CRIMSON),
     THEWASTELAND("thewasteland", "The Wasteland", LocationCategory.CRIMSON),
     MATRIARCHSLAIR("matriarchslair", "Matriarch's Lair", LocationCategory.CRIMSON),
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/MinesHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/location/MinesHandler.java
index ebde7db..1410385 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/location/MinesHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/location/MinesHandler.java
@@ -21,7 +21,8 @@ public class MinesHandler {
         TICKET(107, "Raffle", true, true),
         GOBLIN(99, "Goblin Raid", true, true),
         WIND(0, "Gone With The Wind", false, false),
-        TOGETHER(171, "Better Together", false, true);
+        TOGETHER(171, "Better Together", false, true),
+        GOURMAND(179, "Mithril Gourmand", true, true);
 
         public int x;
         public String displayName;
@@ -104,6 +105,8 @@ public class MinesHandler {
                 MinesHandler.currentEvent = Event.TICKET;
             } else if (event.formattedLine.toLowerCase().contains("goblin raid")) {
                 MinesHandler.currentEvent = Event.GOBLIN;
+            } else if (event.formattedLine.toLowerCase().contains("mithril gourmand")) {
+                MinesHandler.currentEvent = Event.GOURMAND;
             }
         }
         if (event.formattedLine.equalsIgnoreCase("wind compass")) {
@@ -137,6 +140,16 @@ public class MinesHandler {
                         eventProgress = Integer.parseInt(event.formattedLine.toLowerCase().replace("your kills:", "").trim());
                     } catch (Exception ignored) {}
                 }
+            } else if (MinesHandler.currentEvent == Event.GOURMAND) {
+                if (event.formattedLine.toLowerCase().contains("remaining:")) {
+                    try {
+                        eventMax = Integer.parseInt(event.formattedLine.toLowerCase().replace("tasty mithril", "").replace("remaining:", "").trim());
+                    } catch (Exception ignored) {}
+                } else if (event.formattedLine.toLowerCase().contains("your tasty mithril:") && !event.formattedLine.toLowerCase().contains("(")) {
+                    try {
+                        eventProgress = Integer.parseInt(event.formattedLine.toLowerCase().replace("tasty mithril:", "").trim());
+                    } catch (Exception ignored) {}
+                }
             }
         }
     }
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/playerstats/ActionBarParsing.java b/src/main/java/com/thatgravyboat/skyblockhud/playerstats/ActionBarParsing.java
index f82c2f2..b84ef2c 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/playerstats/ActionBarParsing.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/playerstats/ActionBarParsing.java
@@ -26,7 +26,7 @@ public class ActionBarParsing {
     private static final Pattern ManaOverflowRegex = Pattern.compile("([0-9]+)/([0-9]+)\u270E ([0-9]+)\u02AC");
     private static final Pattern ManaDecreaseRegex = Pattern.compile("-([0-9]+) Mana \\(");
     private static final Pattern DrillFuelRegex = Pattern.compile("([0-9,]+)/([0-9,]+k) Drill Fuel");
-    private static final Pattern XpGainRegex = Pattern.compile("\\+(\\d*\\.?\\d*) (Farming|Mining|Combat|Foraging|Fishing|Enchanting|Alchemy|Carpentry|Runecrafting) \\((\\d*\\.?\\d*)%\\)");
+    private static final Pattern XpGainRegex = Pattern.compile("\\+(\\d*\\.?\\d*) (Farming|Mining|Combat|Foraging|Fishing|Enchanting|Alchemy|Carpentry|Runecrafting|Social) \\((\\d*\\.?\\d*)%\\)");
 
     private static final Pattern HealthReplaceRegex = Pattern.compile("\u00A7c([0-9]+)/([0-9]+)\u2764");
     private static final Pattern HealingReplaceRegex = Pattern.compile("\\+\u00A7c([0-9]+)[\u2586\u2585\u2584\u2583\u2582\u2581]");