Replace GML decompiler with Underanalyzer

.github/workflows/publish_cli.yml

@@ -42,6 +42,7 @@ jobs:
       run: |
         cp ./README.md ./CLI-${{ matrix.os }}/
         cp ./LICENSE.txt ./CLI-${{ matrix.os }}/
+        cp -r ./UndertaleModLib/GameSpecificData/ ./CLI-${{ matrix.os }}/GameSpecificData/
     - name: Upload ${{ matrix.os }} CLI
       uses: actions/upload-artifact@v4
       with:

.github/workflows/publish_gui.yml

@@ -41,6 +41,7 @@ jobs:
         cp ./README.md ./${{ matrix.os }}
         cp ./SCRIPTS.md ./${{ matrix.os }}
         cp ./LICENSE.txt ./${{ matrix.os }}
+        cp -r ./UndertaleModLib/GameSpecificData/ ./${{ matrix.os }}/GameSpecificData/
     - name: Upload ${{ matrix.os }} GUI
       uses: actions/upload-artifact@v4
       with:

.github/workflows/publish_gui_nightly.yml

@@ -45,6 +45,7 @@ jobs:
         cp ./README.md ./${{ matrix.os }}
         cp ./SCRIPTS.md ./${{ matrix.os }}
         cp ./LICENSE.txt ./${{ matrix.os }}
+        cp -r ./UndertaleModLib/GameSpecificData/ ./${{ matrix.os }}/GameSpecificData/
     - name: Create zip for nightly release Windows GUI
       run: |
         7z a -tzip GUI-${{ matrix.os }}-${{ matrix.configuration }}-isBundled-${{ matrix.bundled }}-isSingleFile-${{ matrix.singlefile }}.zip ./${{ matrix.os }}/* -mx0 
@@ -90,6 +91,7 @@ jobs:
       run: |
         cp ./README.md ./CLI-${{ matrix.os }}/
         cp ./LICENSE.txt ./CLI-${{ matrix.os }}/
+        cp -r ./UndertaleModLib/GameSpecificData/ ./CLI-${{ matrix.os }}/GameSpecificData/
     - name: Create zip for nightly release CLI
       run: |
         7z a -tzip CLI-${{ matrix.os }}-${{ matrix.configuration }}-isBundled-${{ matrix.bundled }}.zip ./CLI-${{ matrix.os }}/* -mx0 

.github/workflows/publish_gui_release.yml

@@ -41,6 +41,7 @@ jobs:
         cp ./README.md ./${{ matrix.os }}
         cp ./SCRIPTS.md ./${{ matrix.os }}
         cp ./LICENSE.txt ./${{ matrix.os }}
+        cp -r ./UndertaleModLib/GameSpecificData/ ./${{ matrix.os }}/GameSpecificData/
     - name: Create zip for stable release Windows GUI
       run: |
         7z a -tzip GUI-${{ matrix.os }}-${{ matrix.configuration }}-isBundled-${{ matrix.bundled }}-isSingleFile-${{ matrix.singlefile }}.zip ./${{ matrix.os }}/* -mx0 

.github/workflows/publish_pr.yml

@@ -43,6 +43,7 @@ jobs:
         cp ./README.md ./${{ matrix.os }}
         cp ./SCRIPTS.md ./${{ matrix.os }}
         cp ./LICENSE.txt ./${{ matrix.os }}
+        cp -r ./UndertaleModLib/GameSpecificData/ ./${{ matrix.os }}/GameSpecificData/
     - name: Upload ${{ matrix.os }} GUI
       uses: actions/upload-artifact@v4
       with:
@@ -85,6 +86,7 @@ jobs:
       run: |
         cp ./README.md ./CLI-${{ matrix.os }}/
         cp ./LICENSE.txt ./CLI-${{ matrix.os }}/
+        cp -r ./UndertaleModLib/GameSpecificData/ ./CLI-${{ matrix.os }}/GameSpecificData/
     - name: Upload ${{ matrix.os }} CLI
       uses: actions/upload-artifact@v4
       with:

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Underanalyzer"]
+	path = Underanalyzer
+	url = https://github.com/UnderminersTeam/Underanalyzer.git

UndertaleModCli/Program.UMTLibInherited.cs

@@ -10,6 +10,7 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp.Scripting;
 using Microsoft.CodeAnalysis.Scripting;
+using Underanalyzer.Decompiler;
 using UndertaleModLib;
 using UndertaleModLib.Decompiler;
 using UndertaleModLib.Models;
@@ -293,7 +294,7 @@ public void ReapplyProfileCode()
     }
 
     /// <inheritdoc/>
-    public async Task<bool> GenerateGMLCache(ThreadLocal<GlobalDecompileContext> decompileContext = null, object dialog = null, bool isSaving = false)
+    public async Task<bool> GenerateGMLCache(GlobalDecompileContext decompileContext = null, object dialog = null, bool isSaving = false)
     {
         await Task.Delay(1); //dummy await
 
@@ -410,21 +411,23 @@ public string PromptLoadFile(string defaultExt, string filter)
     }
 
     /// <inheritdoc/>
-    public string GetDecompiledText(string codeName, GlobalDecompileContext context = null)
+    public string GetDecompiledText(string codeName, GlobalDecompileContext context = null, IDecompileSettings settings = null)
     {
-        return GetDecompiledText(Data.Code.ByName(codeName), context);
+        return GetDecompiledText(Data.Code.ByName(codeName), context, settings);
     }
 
     /// <inheritdoc/>
-    public string GetDecompiledText(UndertaleCode code, GlobalDecompileContext context = null)
+    public string GetDecompiledText(UndertaleCode code, GlobalDecompileContext context = null, IDecompileSettings settings = null)
     {
         if (code.ParentEntry is not null)
             return $"// This code entry is a reference to an anonymous function within \"{code.ParentEntry.Name.Content}\", decompile that instead.";
 
-        GlobalDecompileContext decompileContext = context is null ? new(Data, false) : context;
+        GlobalDecompileContext decompileContext = context is null ? new(Data) : context;
         try
         {
-            return code != null ? Decompiler.Decompile(code, decompileContext) : "";
+            return code != null 
+                ? new Underanalyzer.Decompiler.DecompileContext(decompileContext, code, settings ?? Data.ToolInfo.DecompilerSettings).DecompileToString() 
+                : "";
         }
         catch (Exception e)
         {
@@ -633,17 +636,17 @@ public void ImportASMFile(string fileName, bool doParse = true, bool destroyASM
     }
 
     /// <inheritdoc/>
-    public void ReplaceTextInGML(string codeName, string keyword, string replacement, bool caseSensitive = false, bool isRegex = false, GlobalDecompileContext context = null)
+    public void ReplaceTextInGML(string codeName, string keyword, string replacement, bool caseSensitive = false, bool isRegex = false, GlobalDecompileContext context = null, IDecompileSettings settings = null)
     {
         UndertaleCode code = Data.Code.ByName(codeName);
         if (code is null)
             throw new ScriptException($"No code named \"{codeName}\" was found!");
 
-        ReplaceTextInGML(code, keyword, replacement, caseSensitive, isRegex, context);
+        ReplaceTextInGML(code, keyword, replacement, caseSensitive, isRegex, context, settings);
     }
 
     /// <inheritdoc/>
-    public void ReplaceTextInGML(UndertaleCode code, string keyword, string replacement, bool caseSensitive = false, bool isRegex = false, GlobalDecompileContext context = null)
+    public void ReplaceTextInGML(UndertaleCode code, string keyword, string replacement, bool caseSensitive = false, bool isRegex = false, GlobalDecompileContext context = null, IDecompileSettings settings = null)
     {
         if (code == null) throw new ArgumentNullException(nameof(code));
         if (code.ParentEntry is not null)
@@ -652,7 +655,7 @@ public void ReplaceTextInGML(UndertaleCode code, string keyword, string replacem
         EnsureDataLoaded();
 
         string passBack = "";
-        GlobalDecompileContext decompileContext = context is null ? new(Data, false) : context;
+        GlobalDecompileContext decompileContext = context is null ? new(Data) : context;
 
         if (!Data.ToolInfo.ProfileMode)
         {
@@ -661,7 +664,7 @@ public void ReplaceTextInGML(UndertaleCode code, string keyword, string replacem
                 // It would just be recompiling an empty string and messing with null entries seems bad
                 if (code is null)
                     return;
-                string originalCode = Decompiler.Decompile(code, decompileContext);
+                string originalCode = new Underanalyzer.Decompiler.DecompileContext(decompileContext, code, settings ?? Data.ToolInfo.DecompilerSettings).DecompileToString();
                 passBack = GetPassBack(originalCode, keyword, replacement, caseSensitive, isRegex);
                 // No need to compile something unchanged
                 if (passBack == originalCode)

UndertaleModCli/Program.cs

@@ -195,7 +195,8 @@
                 typeof(JsonConvert).GetTypeInfo().Assembly,
                 typeof(System.Text.RegularExpressions.Regex).GetTypeInfo().Assembly,
                 typeof(TextureWorker).GetTypeInfo().Assembly,
-                typeof(ImageMagick.MagickImage).GetTypeInfo().Assembly)
+                typeof(ImageMagick.MagickImage).GetTypeInfo().Assembly,
+                typeof(Underanalyzer.Decompiler.DecompileContext).Assembly)
             // "WithEmitDebugInformation(true)" not only lets us to see a script line number which threw an exception,
             // but also provides other useful debug info when we run UMT in "Debug".
             .WithEmitDebugInformation(true);
@@ -732,7 +733,7 @@
     /// Evaluates and executes given C# code.
     /// </summary>
     /// <param name="code">The C# string to execute</param>
     /// <param name="scriptFile">The path to the script file where <see cref="code"/> was executed from.
     /// Leave as null, if it wasn't executed from a script file</param>
     private void RunCSharpCode(string code, string scriptFile = null)
     {
@@ -871,4 +872,4 @@
             Thread.Sleep(100); //10 times per second
         }
     }
-}
+}

UndertaleModCli/UndertaleModCli.csproj

@@ -22,6 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Underanalyzer\Underanalyzer\Underanalyzer.csproj" />
     <ProjectReference Include="..\UndertaleModLib\UndertaleModLib.csproj" />
   </ItemGroup>