adjust pattern matching to catch bookkeepers nop properly

FallingColors · Sep 30, 2024 · cab0f70 · cab0f70
1 parent edad136
commit cab0f70
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Common/src/main/java/at/petrak/hexcasting/interop/inline/HexPatternMatcher.java b/Common/src/main/java/at/petrak/hexcasting/interop/inline/HexPatternMatcher.java
@@ -26,7 +26,7 @@ public class HexPatternMatcher implements RegexMatcher {
     private static final MatcherInfo patternMatcherInfo = MatcherInfo.fromId(patternMatcherID);
 
     // thx kyra <3
-    private static final Pattern PATTERN_PATTERN_REGEX = Pattern.compile("(?<escaped>\\\\?)(?:HexPattern)?[<(\\[{]\\s*(?<direction>[a-z_-]+)(?:\\s*(?<sizemod>[,!+:; ])\\s*(?<pattern>[aqweds]+))?\\s*[>)\\]}]", Pattern.CASE_INSENSITIVE);
+    private static final Pattern PATTERN_PATTERN_REGEX = Pattern.compile("(?<escaped>\\\\?)(?:HexPattern)?[<(\\[{]\\s*(?<direction>[a-zA-Z_-]+)(?:\\s*(?<sizemod>[,!+:; ])\\s*(?<pattern>[aqwedsAQWEDS]+)?)\\s*[>)\\]}]", Pattern.CASE_INSENSITIVE);
 
     public static HexPatternMatcher INSTANCE = new HexPatternMatcher();
 
@@ -49,13 +49,16 @@ public Tuple<InlineMatch, Integer> getMatchAndGroup(MatchResult regexMatch, Matc
         if(dir == null)
             return new Tuple<>(null, 0);
         HexPattern pat;
+        if(angleSigs == null){
+            angleSigs = "";
+        }
         try{
-            pat = HexPattern.fromAngles(angleSigs, dir);
+            pat = HexPattern.fromAngles(angleSigs.toLowerCase(), dir);
             InlinePatternData patData = new InlinePatternData(pat);
             Style patDataStyle = patData.getExtraStyle();
-            if(sizeModString.equals("+"))
+            if(sizeModString != null && sizeModString.equals("+"))
                 patDataStyle = InlineAPI.INSTANCE.withSizeModifier(patDataStyle, 2);
-            if(sizeModString.equals("!")) 
+            if(sizeModString != null && sizeModString.equals("!"))
                 patDataStyle = InlineAPI.INSTANCE.withSizeModifier(patDataStyle, 1.5);
             return new Tuple<>(new InlineMatch.DataMatch(patData,patDataStyle ), 0);
         } catch (Exception e){