Attempted fixes from 29 January 2026

Author: lexisother

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "vendor/undertalemodtool-src"]
 	path = vendor/undertalemodtool-src
-	url = https://github.com/Dobby233Liu/UndertaleModTool
-	branch = 2024_11-null-entries-in-chunk-lists-hack
+	url = https://github.com/UnderminersTeam/UndertaleModTool
+	branch = master

global.json

@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "10.0.0",
+    "rollForward": "latestMajor",
+    "allowPrerelease": true
+  }
+}

gmsl-modapi/gmsl-modapi.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
+    <LangVersion>11</LangVersion>
     <RootNamespace>GMSL</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

gmsl-modapi/src/Hooker/GmlSafeExtensions.cs

@@ -1,27 +1,35 @@
-
+using Underanalyzer.Compiler;
 using UndertaleModLib;
+using UndertaleModLib.Compiler;
 using UndertaleModLib.Models;
 
 namespace GMSL.Hooker;
 
 public static class GmlSafeExtensions {
-    public static void ReplaceGmlSafe(this UndertaleCode code, string gmlCode, UndertaleData data) {
-        try { code.ReplaceGML(gmlCode, data); }
-        // UndertaleModLib is trying to write profile cache but fails, we don't care
-        catch(Exception ex) {
-            if(ex.Message.StartsWith("Error during writing of GML code to profile", StringComparison.InvariantCulture))
-                return;
-            throw;
-        }
+    public static void ReplaceGmlSafe(this UndertaleCode code, string gmlCode, UndertaleData data)
+    {
+        // CompileResult result = new();
+        
+        var group = new CompileGroup(data);
+        group.QueueCodeReplace(code, gmlCode);
+        group.Compile();
+        
+        // try { code.ReplaceGML(gmlCode, data); }
+        // // UndertaleModLib is trying to write profile cache but fails, we don't care
+        // catch(Exception ex) {
+        //     if(ex.Message.StartsWith("Error during writing of GML code to profile", StringComparison.InvariantCulture))
+        //         return;
+        //     throw;
+        // }
     }
 
-    public static void AppendGmlSafe(this UndertaleCode code, string gmlCode, UndertaleData data) {
-        try { code.AppendGML(gmlCode, data); }
-        // UndertaleModLib is trying to write profile cache but fails, we don't care
-        catch(Exception ex) {
-            if(ex.Message.StartsWith("Error during writing of GML code to profile", StringComparison.InvariantCulture))
-                return;
-            throw;
-        }
-    }
+    // public static void AppendGmlSafe(this UndertaleCode code, string gmlCode, UndertaleData data) {
+    //     try { code.AppendGML(gmlCode, data); }
+    //     // UndertaleModLib is trying to write profile cache but fails, we don't care
+    //     catch(Exception ex) {
+    //         if(ex.Message.StartsWith("Error during writing of GML code to profile", StringComparison.InvariantCulture))
+    //             return;
+    //         throw;
+    //     }
+    // }
 }

gmsl-modapi/src/Hooker/UndertaleInstructionExtensions.cs

@@ -6,6 +6,7 @@ namespace GMSL.Hooker;
 
 public static class UndertaleInstructionExtensions {
     public static bool Match(this UndertaleInstruction left, UndertaleInstruction right) {
+        left.
         return left.Kind == right.Kind && UndertaleInstruction.GetInstructionType(left.Kind) switch {
             UndertaleInstruction.InstructionType.SingleTypeInstruction => left.MatchType(right),
             UndertaleInstruction.InstructionType.DoubleTypeInstruction => left.MatchType(right),
@@ -31,18 +32,16 @@ private static bool MatchPop(this UndertaleInstruction left, UndertaleInstructio
         left.Type1 == right.Type1 &&
         (left.Type1 == UndertaleInstruction.DataType.Int16 && left.SwapExtra == right.SwapExtra ||
             left.Type1 != UndertaleInstruction.DataType.Int16 && left.TypeInst == right.TypeInst &&
-            left.Destination.Type == right.Destination.Type && left.Destination.Target == right.Destination.Target);
+            left.ValueVariable.InstanceType == right.ValueVariable.InstanceType && left.ValueInt == right.ValueInt);
 
     private static bool MatchPush(this UndertaleInstruction left, UndertaleInstruction right) =>
         left.Type1 == right.Type1 && left.Type1 switch {
         UndertaleInstruction.DataType.Int32 when
-            left.Value is UndertaleInstruction.Reference<UndertaleFunction> leftRef &&
-            right.Value is UndertaleInstruction.Reference<UndertaleFunction> rightRef => leftRef.Type ==
-            rightRef.Type && leftRef.Target == rightRef.Target,
+            left.ValueFunction is UndertaleFunction leftRef &&
+            right.ValueFunction is UndertaleFunction rightRef => leftRef == rightRef,
         UndertaleInstruction.DataType.Variable when
-            left.Value is UndertaleInstruction.Reference<UndertaleVariable> leftRef &&
-            right.Value is UndertaleInstruction.Reference<UndertaleVariable> rightRef => leftRef.Type ==
-            rightRef.Type && leftRef.Target == rightRef.Target,
+            left.ValueVariable is UndertaleVariable leftRef &&
+            right.ValueVariable is UndertaleVariable rightRef => leftRef == rightRef,
         UndertaleInstruction.DataType.Variable when
             left.Value is UndertaleResourceById<UndertaleString, UndertaleChunkSTRG> leftRef &&
             right.Value is UndertaleResourceById<UndertaleString, UndertaleChunkSTRG> rightRef =>

gmsl-patcher/gmsl-patcher.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>gmsl_patcher</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>