fix: Fix config load issues with \r newlines

TwelveIterationMods · Jun 24, 2024 · 921ca16 · 921ca16
1 parent 40c6b92
commit 921ca16
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/fabric/src/main/java/net/blay09/mods/balm/fabric/config/notoml/NotomlParserState.java b/fabric/src/main/java/net/blay09/mods/balm/fabric/config/notoml/NotomlParserState.java
@@ -30,7 +30,7 @@ void next(NotomlStateMachine state, NotomlParseBuffer buffer, NotomlTokenConsume
     Comment {
         @Override
         void next(NotomlStateMachine state, NotomlParseBuffer buffer, NotomlTokenConsumer consumer) {
-            String comment = buffer.readUntilConsume("\n", "\r\n").trim();
+            String comment = buffer.readUntilConsume("\n", "\r\n", "\r").trim();
             consumer.emitComment(comment);
             state.transition(None);
         }
@@ -40,7 +40,7 @@ void next(NotomlStateMachine state, NotomlParseBuffer buffer, NotomlTokenConsume
 
         @Override
         void next(NotomlStateMachine state, NotomlParseBuffer buffer, NotomlTokenConsumer consumer) {
-            String property = buffer.readUntilConsume("=", "\n", "\r\n").trim();
+            String property = buffer.readUntilConsume("=", "\n", "\r\n", "\r").trim();
             if (!PROPERTY_KEY_PATTERN.matcher(property).matches()) {
                 throw new IllegalStateException("Invalid property key '" + property + "' (properties may only contain letters, numbers, dashes and underscores)");
             }
@@ -63,7 +63,7 @@ void next(NotomlStateMachine state, NotomlParseBuffer buffer, NotomlTokenConsume
                 consumer.emitListStart();
                 state.transition(List);
             } else {
-                String value = buffer.readUntilConsume("\n", "\r\n");
+                String value = buffer.readUntilConsume("\n", "\r\n", "\r");
                 consumer.emitPropertyValue(value);
                 state.transition(None);
             }