Merge pull request #10 from SuperTavor/master

Custom function dictionaries

Author: onepiecefreak3

FunctionDictionary.json

@@ -0,0 +1,10 @@
+{
+  
+    "sub20": "Call",
+    "sub30": "Jump1",
+    "sub31": "Jump2",
+    "sub33": "JumpParameter",
+    "sub130": "Compare",
+    "sub501": "printf"
+   
+}

XtractQuery/Parsers/FunctionDictionaryParser.cs

@@ -0,0 +1,58 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.RegularExpressions;
+
+namespace XtractQuery.Parsers
+{
+    public class FunctionDictionaryParser
+    {
+        public static Dictionary<int, string> ParseDictionary()
+        {
+            string filePath = "FunctionDictionary.json";
+
+            if (!File.Exists(filePath))
+            {
+                Console.WriteLine("File not found: " + filePath);
+                return new Dictionary<int, string>();
+            }
+
+            string json = File.ReadAllText(filePath);
+            var jsonData = JsonConvert.DeserializeObject<Dictionary<string, string>>(json);
+
+            var formattedDictionary = new Dictionary<int, string>();
+
+            foreach (var kvp in jsonData)
+            {
+                int subNumber = ExtractSubNumber(kvp.Key);
+                if (subNumber != -1)
+                {
+                    formattedDictionary[subNumber] = kvp.Value;
+                }
+            }
+
+            return formattedDictionary;
+        }
+
+        private static int ExtractSubNumber(string key)
+        {
+            var match = Regex.Match(key, @"sub(\d+)");
+            return match.Success && match.Groups.Count > 1
+                ? int.TryParse(match.Groups[1].Value, out int subNumber) ? subNumber : -1
+                : -1;
+        }
+
+
+
+        public static void MergeIntoDictionary(IDictionary<int, string> targetDictionary)
+        {
+            var parsedDictionary = ParseDictionary();
+
+            foreach (var kvp in parsedDictionary)
+            {
+                targetDictionary[kvp.Key] = kvp.Value;
+            }
+        }
+    }
+}

XtractQuery/Parsers/Models/Instruction.cs

@@ -27,6 +27,7 @@ public Instruction(int instructionType, IList<Argument> arguments, int returnPar
         public string GetString(IStringReader stringReader)
         {
             var args = string.Join(", ", Arguments.Select(x => x.GetString(InstructionType, stringReader)));
+            FunctionDictionaryParser.MergeIntoDictionary(RoutineMap);
             var subName = RoutineMap.ContainsKey(InstructionType) ? RoutineMap[InstructionType] : $"sub{InstructionType}";
             var returnParameter = Parameter.Parse(ReturnParameter);
 
@@ -109,14 +110,9 @@ private static IEnumerable<string> GetArguments(string argumentBody)
             }
         }
 
-        private static IDictionary<int, string> RoutineMap = new Dictionary<int, string>
+        public static IDictionary<int, string> RoutineMap = new Dictionary<int, string>
         {
-            [20] = "Call",
-            [30] = "Jump1",
-            [31] = "Jump2",
-            [33] = "JumpParameter",
-            [130] = "Compare",
-            [501] = "printf"
+          
         };
     }
 }

XtractQuery/Program.cs

@@ -6,6 +6,7 @@
 using XtractQuery.Interfaces;
 using XtractQuery.Options;
 using XtractQuery.Parsers;
+using XtractQuery.Parsers.Models;
 
 namespace XtractQuery
 {
@@ -132,6 +133,7 @@ private static void ExtractFile(string type, string file)
 
         private static void CreateFile(string type, string file)
         {
+            FunctionDictionaryParser.MergeIntoDictionary(Instruction.RoutineMap);
             IParser parser;
             switch (type)
             {

XtractQuery/XtractQuery.csproj

@@ -12,6 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.4.20251.6" />
   </ItemGroup>