Merge pull request #8 from DerpyNewbie/add-build-preprocessor

Add centralized build preprocessor
DerpyNewbie · Jun 12, 2023 · ab60e5d · ab60e5d
2 parents b2e0b51 + ca8da07
commit ab60e5d
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 43 deletions.
diff --git a/Packages/dev.derpynewbie.common/Editor/NewbieCommonsBuildPreprocessor.cs b/Packages/dev.derpynewbie.common/Editor/NewbieCommonsBuildPreprocessor.cs
@@ -0,0 +1,32 @@
+using UnityEditor;
+using VRC.SDKBase.Editor.BuildPipeline;
+
+namespace DerpyNewbie.Common.Editor
+{
+    [InitializeOnLoad]
+    public class NewbieCommonsBuildPreprocessor : IVRCSDKBuildRequestedCallback
+    {
+        static NewbieCommonsBuildPreprocessor()
+        {
+            EditorApplication.playModeStateChanged += PlayModeStateChanged;
+        }
+
+        private static void PlayModeStateChanged(PlayModeStateChange change)
+        {
+            var isBuilding = BuildPipeline.isBuildingPlayer ||
+                             UnityEngine.Object.FindObjectOfType<PipelineSaver>() != null ||
+                             change != PlayModeStateChange.ExitingEditMode;
+            if (isBuilding)
+                return;
+            NewbieInjectProcessor.DoPrePlayInject(change);
+        }
+
+        public int callbackOrder => 2048;
+
+        public bool OnBuildRequested(VRCSDKRequestedBuildType requestedBuildType)
+        {
+            NewbieInjectProcessor.DoPreBuildInject(requestedBuildType);
+            return true;
+        }
+    }
+}
diff --git a/Packages/dev.derpynewbie.common/Editor/NewbieCommonsBuildPreprocessor.cs.meta b/Packages/dev.derpynewbie.common/Editor/NewbieCommonsBuildPreprocessor.cs.meta
diff --git a/Packages/dev.derpynewbie.common/Editor/NewbieInjectProcessor.cs b/Packages/dev.derpynewbie.common/Editor/NewbieInjectProcessor.cs
@@ -113,6 +113,30 @@ public static string GetHierarchyName(Component component)
 
             return sb.ToString();
         }
+
+        public static void DoPrePlayInject(PlayModeStateChange change)
+        {
+            if (!NewbieInjectConfig.InjectOnPlay)
+                return;
+
+            Log("Pre-Play injection started.");
+            Inject(SceneManager.GetActiveScene());
+            Log("Pre-Play injection ended.");
+        }
+
+        public static bool DoPreBuildInject(VRCSDKRequestedBuildType requestedBuildType)
+        {
+            if (!NewbieInjectConfig.InjectOnBuild)
+                return true;
+
+            if (requestedBuildType == VRCSDKRequestedBuildType.Avatar)
+                return true;
+
+            Log("Pre-Build injection started.");
+            Inject(SceneManager.GetActiveScene());
+            Log("Pre-Build injection ended.");
+            return true;
+        }
     }
 
     public static class NewbieInjectConfig
@@ -147,47 +171,4 @@ private static void SetConfigValue(string name, bool value)
             EditorUserSettings.SetConfigValue(name, value.ToString());
         }
     }
-
-    public class NewbieCommonsBuildInject : IVRCSDKBuildRequestedCallback
-    {
-        public int callbackOrder => 0;
-
-        public bool OnBuildRequested(VRCSDKRequestedBuildType requestedBuildType)
-        {
-            if (!NewbieInjectConfig.InjectOnBuild)
-                return true;
-
-            if (requestedBuildType == VRCSDKRequestedBuildType.Avatar)
-            {
-                LogError("Build Injection not supported with Avatar Build.");
-                return true;
-            }
-
-            Log("Pre-Build injection started.");
-            NewbieInjectProcessor.Inject(SceneManager.GetActiveScene());
-            Log("Pre-Build injection ended.");
-            return true;
-        }
-    }
-
-    [InitializeOnLoad]
-    public static class NewbieCommonsPlayInject
-    {
-        static NewbieCommonsPlayInject()
-        {
-            EditorApplication.playModeStateChanged += PlayModeStateChanged;
-        }
-
-        private static void PlayModeStateChanged(PlayModeStateChange change)
-        {
-            if (!NewbieInjectConfig.InjectOnPlay || BuildPipeline.isBuildingPlayer ||
-                UnityEngine.Object.FindObjectOfType<PipelineSaver>() != null ||
-                change != PlayModeStateChange.ExitingEditMode)
-                return;
-
-            Log("Pre-Play injection started.");
-            NewbieInjectProcessor.Inject(SceneManager.GetActiveScene());
-            Log("Pre-Play injection ended.");
-        }
-    }
 }