Some fixes and improvements:

1) The "Find all references" feature also searches game objects in code, but only in single-argument functions (e.g. `instance_exists(id)`). The same for fonts. 2) Font and game objects references search in code also works for GM 2023.8. 3) Refactored the code.
UnderminersTeam · Jan 3, 2024 · da1b697 · da1b697
1 parent edfa370
commit da1b697
Show file tree

Hide file tree

Showing 4 changed files with 247 additions and 119 deletions.
diff --git a/UndertaleModLib/Decompiler/Decompiler.cs b/UndertaleModLib/Decompiler/Decompiler.cs
@@ -616,9 +616,7 @@ public ExpressionAssetRef(int encodedResourceIndex)
             {
                 Type = UndertaleInstruction.DataType.Variable;
 
-                // Break down index - first 24 bits are the ID, the rest is the ref type
-                AssetIndex = encodedResourceIndex & 0xffffff;
-                AssetRefType = (RefType)(encodedResourceIndex >> 24);
+                (AssetIndex, AssetRefType) = DecodeResourceIndexAndType(encodedResourceIndex);
             }
 
             public ExpressionAssetRef(int resourceIndex, RefType resourceType)
@@ -641,46 +639,7 @@ public override string ToString(DecompileContext context)
             {
                 if (context.GlobalContext.Data != null)
                 {
-                    IList assetList = null;
-                    switch (AssetRefType)
-                    {
-                        case RefType.Sprite:
-                            assetList = (IList)context.GlobalContext.Data.Sprites;
-                            break;
-                        case RefType.Background:
-                            assetList = (IList)context.GlobalContext.Data.Backgrounds;
-                            break;
-                        case RefType.Sound:
-                            assetList = (IList)context.GlobalContext.Data.Sounds;
-                            break;
-                        case RefType.Font:
-                            assetList = (IList)context.GlobalContext.Data.Fonts;
-                            break;
-                        case RefType.Path:
-                            assetList = (IList)context.GlobalContext.Data.Paths;
-                            break;
-                        case RefType.Timeline:
-                            assetList = (IList)context.GlobalContext.Data.Timelines;
-                            break;
-                        case RefType.Room:
-                            assetList = (IList)context.GlobalContext.Data.Rooms;
-                            break;
-                        case RefType.Object:
-                            assetList = (IList)context.GlobalContext.Data.GameObjects;
-                            break;
-                        case RefType.Shader:
-                            assetList = (IList)context.GlobalContext.Data.Shaders;
-                            break;
-                        case RefType.AnimCurve:
-                            assetList = (IList)context.GlobalContext.Data.AnimationCurves;
-                            break;
-                        case RefType.Sequence:
-                            assetList = (IList)context.GlobalContext.Data.Sequences;
-                            break;
-                        case RefType.ParticleSystem:
-                            assetList = (IList)context.GlobalContext.Data.ParticleSystems;
-                            break;
-                    }
+                    IList assetList = GetAssetListFromType(context.GlobalContext.Data, AssetRefType);
 
                     if (assetList != null && AssetIndex >= 0 && AssetIndex < assetList.Count)
                         return ((UndertaleNamedResource)assetList[AssetIndex]).Name.Content;
@@ -707,6 +666,42 @@ internal override AssetIDType DoTypePropagation(DecompileContext context, AssetI
                     _ => throw new NotImplementedException($"Missing ref type {AssetRefType}")
                 };
             }
+
+            public static (int resourceIndex, RefType resourceType) DecodeResourceIndexAndType(int encodedResourceIndex)
+            {
+                // Break down index - first 24 bits are the ID, the rest is the ref type
+                return (encodedResourceIndex & 0xffffff, (RefType)(encodedResourceIndex >> 24));
+            }
+            public static int DecodeResourceIndex(int encodedResourceIndex)
+            {
+                return encodedResourceIndex & 0xffffff;
+            }
+            public static RefType DecodeResourceType(int encodedResourceIndex)
+            {
+                return (RefType)(encodedResourceIndex >> 24);
+            }
+
+            public static IList GetAssetListFromType(UndertaleData data, RefType type)
+            {
+                object list = type switch
+                {
+                    RefType.Sprite => data.Sprites,
+                    RefType.Background => data.Backgrounds,
+                    RefType.Sound => data.Sounds,
+                    RefType.Font => data.Fonts,
+                    RefType.Path => data.Paths,
+                    RefType.Timeline => data.Timelines,
+                    RefType.Room => data.Rooms,
+                    RefType.Object => data.GameObjects,
+                    RefType.Shader => data.Shaders,
+                    RefType.AnimCurve => data.AnimationCurves,
+                    RefType.Sequence => data.Sequences,
+                    RefType.ParticleSystem => data.ParticleSystems,
+                    _ => null
+                };
+
+                return list as IList;
+            }
         }
 
         // Represents an expression converted to one of another data type - makes no difference on high-level code.

diff --git a/UndertaleModTool/MainWindow.xaml.cs b/UndertaleModTool/MainWindow.xaml.cs
@@ -925,7 +925,7 @@ private void DisposeGameData()
                 UpdateLayout();
                 Dispatcher.Invoke(() => { }, DispatcherPriority.ApplicationIdle);
 
-                UndertaleResourceReferenceMethodsMap.ClearFontFunctionList();
+                UndertaleResourceReferenceMethodsMap.ClearFunctionLists();
 
                 Data.Dispose();
                 Data = null;

diff --git a/UndertaleModTool/Windows/FindReferencesTypesDialog/UndertaleResourceReferenceMap.cs b/UndertaleModTool/Windows/FindReferencesTypesDialog/UndertaleResourceReferenceMap.cs
@@ -280,6 +280,7 @@ public static class UndertaleResourceReferenceMap
                         Version = (1, 0, 0),
                         Types = new[]
                         {
+                            (typeof(UndertaleCode), "Code"),
                             (typeof(UndertaleRoom.GameObject), "Room object instance")
                         }
                     },