Patch AddressablesUtility.InstantiateAsync for mod prefabs

SubnauticaModding · Dec 21, 2022 · aee54c2 · aee54c2
1 parent 68deae3
commit aee54c2
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 0 deletions.
diff --git a/Dependencies/Subnautica.stable/Unity.Addressables.dll b/Dependencies/Subnautica.stable/Unity.Addressables.dll
diff --git a/Dependencies/Subnautica.stable/Unity.ResourceManager.dll b/Dependencies/Subnautica.stable/Unity.ResourceManager.dll
diff --git a/SMLHelper/Patchers/PrefabDatabasePatcher.cs b/SMLHelper/Patchers/PrefabDatabasePatcher.cs
@@ -14,6 +14,9 @@ namespace SMLHelper.V2.Patchers
     using UWE;
     using InternalLogger = InternalLogger;
     using SMLHelper.V2.Utility;
+    using static SMLHelper.V2.PatchUtils;
+    using static TechStringCache;
+    using UnityEngine.ResourceManagement.AsyncOperations;
 
     internal static class PrefabDatabasePatcher
     {
@@ -99,6 +102,29 @@ internal static bool GetPrefabAsync_Prefix(ref IPrefabRequest __result, string c
             return __result == null;
         }
 
+        [PatchUtils.Prefix]
+        [HarmonyPatch(typeof(AddressablesUtility), nameof(AddressablesUtility.InstantiateAsync), new Type[] 
+        { 
+            typeof(string), typeof(IOut<GameObject>), typeof(Transform), typeof(Vector3), typeof(Quaternion), typeof(bool)
+        })]
+        internal static bool InstantiateAsync_Prefix(ref IEnumerator __result,string key, IOut<GameObject> result, Transform parent, Vector3 position, Quaternion rotation, bool awake)
+        {
+            if(!ModPrefab.TryGetFromFileName(key, out var prefab))
+                return true;
+
+            __result = InstantiateAsync(prefab, result, parent, position, rotation, awake);
+            return false;
+        }
+
+        internal static IEnumerator InstantiateAsync(ModPrefab modPrefab, IOut<GameObject> result, Transform parent, Vector3 position, Quaternion rotation, bool awake)
+        {
+            TaskResult<GameObject> task = new TaskResult<GameObject>();
+            yield return modPrefab.GetGameObjectAsync(task);
+
+            var prefab = task.Get();
+            result.Set(GameObject.Instantiate(prefab, parent, position, rotation, awake));
+            yield break;
+        }
 
         // transpiler for ProtobufSerializer.DeserializeObjectsAsync
         private static IEnumerable<CodeInstruction> DeserializeObjectsAsync_Transpiler(IEnumerable<CodeInstruction> cins)

diff --git a/SMLHelper/SMLHelper.csproj b/SMLHelper/SMLHelper.csproj
@@ -57,6 +57,14 @@
       <HintPath>$(Dependencies)\Newtonsoft.Json.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="Unity.Addressables">
+      <HintPath>..\Dependencies\Subnautica.stable\Unity.Addressables.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Unity.ResourceManager">
+      <HintPath>..\Dependencies\Subnautica.stable\Unity.ResourceManager.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="UnityEngine">
       <HintPath>$(Dependencies)\UnityEngine.dll</HintPath>
       <Private>False</Private>