Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into cleanup-2

# Conflicts:
#	src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
#	src/main/java/de/hysky/skyblocker/utils/Http.java
#	src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java

Pull changes from upstream master

2 files changed, 16 insertions, 9 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/DungeonPlayerWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/DungeonPlayerWidget.java
index be1a3c6e..d71eb190 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/DungeonPlayerWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/DungeonPlayerWidget.java
@@ -27,7 +27,7 @@ public class DungeonPlayerWidget extends Widget {
     // group 3: level (or nothing, if pre dungeon start)
     // this regex filters out the ironman icon as well as rank prefixes and emblems
     // \[\d*\] (?:\[[A-Za-z]+\] )?(?<name>[A-Za-z0-9_]*) (?:.* )?\((?<class>\S*) ?(?<level>[LXVI]*)\)
-    private static final Pattern PLAYER_PATTERN = Pattern
+    public static final Pattern PLAYER_PATTERN = Pattern
             .compile("\\[\\d*\\] (?:\\[[A-Za-z]+\\] )?(?<name>[A-Za-z0-9_]*) (?:.* )?\\((?<class>\\S*) ?(?<level>[LXVI]*)\\)");
 
     private static final HashMap<String, ItemStack> ICOS = new HashMap<>();
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/GardenSkillsWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/GardenSkillsWidget.java
index e7058fd6..41eee8d6 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/GardenSkillsWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/GardenSkillsWidget.java
@@ -24,9 +24,11 @@ public class GardenSkillsWidget extends Widget {
     // group 1: skill name and level
     // group 2: progress to next level (without "%")
     private static final Pattern SKILL_PATTERN = Pattern
-            .compile("\\S*: (?<skill>[A-Za-z]* [0-9]*): (?<progress>\\S*)%");
-    // same, but with leading space
-    private static final Pattern MS_PATTERN = Pattern.compile("\\S*: (?<skill>[A-Za-z]* [0-9]*): (?<progress>\\S*)%");
+            .compile("Skills: (?<skill>[A-Za-z]* [0-9]*): (?<progress>[0-9.MAX]*)%?");
+
+    // same, more or less
+    private static final Pattern MS_PATTERN = Pattern
+            .compile("Milestone: (?<milestone>[A-Za-z ]* [0-9]*): (?<progress>[0-9.]*)%");
 
     public GardenSkillsWidget() {
         super(TITLE, Formatting.YELLOW.getColorValue());
@@ -43,9 +45,14 @@ public class GardenSkillsWidget extends Widget {
             String strpcnt = m.group("progress");
             String skill = m.group("skill");
 
-            float pcnt = Float.parseFloat(strpcnt);
-            pc = new ProgressComponent(Ico.LANTERN, Text.of(skill), pcnt,
-                    Formatting.GOLD.getColorValue());
+            if (strpcnt.equals("MAX")) {
+                pc = new ProgressComponent(Ico.LANTERN, Text.of(skill), Text.of("MAX"), 100f,
+                        Formatting.RED.getColorValue());
+            } else {
+                float pcnt = Float.parseFloat(strpcnt);
+                pc = new ProgressComponent(Ico.LANTERN, Text.of(skill), pcnt,
+                        Formatting.GOLD.getColorValue());
+            }
         }
 
         this.addComponent(pc);
@@ -66,10 +73,10 @@ public class GardenSkillsWidget extends Widget {
             pc2 = new ProgressComponent();
         } else {
             String strpcnt = m.group("progress");
-            String skill = m.group("skill");
+            String milestone = m.group("milestone");
 
             float pcnt = Float.parseFloat(strpcnt);
-            pc2 = new ProgressComponent(Ico.MILESTONE, Text.of(skill), pcnt,
+            pc2 = new ProgressComponent(Ico.MILESTONE, Text.of(milestone), pcnt,
                     Formatting.GREEN.getColorValue());
 
         }