Adjust JSON formatting for None macro type

UnderminersTeam · Jul 20, 2024 · 3eb5d6a · 3eb5d6a
1 parent 13b1fee
commit 3eb5d6a
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/Underanalyzer/Decompiler/GameSpecific/Json/IMacroTypeConverter.cs b/Underanalyzer/Decompiler/GameSpecific/Json/IMacroTypeConverter.cs
@@ -25,8 +25,13 @@ internal class IMacroTypeConverter(GameSpecificRegistry registry) : JsonConverte
 
         if (reader.TokenType == JsonTokenType.String)
         {
-            // Read type name - access registry
-            return Registry.FindType(reader.GetString() ?? throw new JsonException());
+            // Read type name - access registry (or None to use none)
+            string typeName = reader.GetString() ?? throw new JsonException();
+            if (typeName == "None")
+            {
+                return NoneMacroType.ReusableInstance;
+            }
+            return Registry.FindType(typeName);
         }
 
         if (reader.TokenType == JsonTokenType.StartArray)
@@ -79,6 +84,11 @@ internal class IMacroTypeConverter(GameSpecificRegistry registry) : JsonConverte
                 case "MatchNot":
                     return MatchNotMacroTypeConverter.ReadContents(ref reader, this, options);
                 case "None":
+                    reader.Read();
+                    if (reader.TokenType != JsonTokenType.EndObject)
+                    {
+                        throw new JsonException();
+                    }
                     return NoneMacroType.ReusableInstance;
             }
         }