Skippable saber model pre-init

Auros · May 22, 2023 · 4dc3ee0 · 4dc3ee0
1 parent ca4f5c9
commit 4dc3ee0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/SiraUtil/Interfaces/IPreSaberModelInit.cs b/SiraUtil/Interfaces/IPreSaberModelInit.cs
@@ -12,6 +12,7 @@ public interface IPreSaberModelInit
         /// </summary>
         /// <param name="parent">The parent of the saber model.</param>
         /// <param name="saber">The saber component associated with the current model.</param>
-        void PreInit(Transform parent, Saber saber);
+        /// <returns>Do you want the original Init to run?</returns>
+        bool PreInit(Transform parent, Saber saber);
     }
 }
diff --git a/SiraUtil/Sabers/SaberModelProvider.cs b/SiraUtil/Sabers/SaberModelProvider.cs
@@ -172,13 +172,13 @@ private void DefaultSaberPrefabSwap(ref SaberModelContainer __instance, ref Sabe
 
         [AffinityPrefix]
         [AffinityPatch(typeof(SaberModelController), nameof(SaberModelController.Init))]
-        private void PreInit(ref SaberModelController __instance, Transform parent, Saber saber)
+        private bool PreInit(ref SaberModelController __instance, Transform parent, Saber saber)
         {
             var runner = __instance.GetComponent<IPreSaberModelInit>();
             if (runner == null)
-                return;
+                return true;
 
-            runner.PreInit(parent, saber);
+            return runner.PreInit(parent, saber);
         }
 
 

diff --git a/SiraUtil/manifest.json b/SiraUtil/manifest.json
@@ -3,7 +3,7 @@
   "id": "SiraUtil",
   "name": "SiraUtil",
   "author": "Auros",
-  "version": "3.1.3-dev.2",
+  "version": "3.1.3-dev.3",
   "icon": "SiraUtil.Resources.logo.png",
   "description": "A powerful utility mod which expands the capabilities and provides more tools to Beat Saber modders.",
   "gameVersion": "1.29.4",