Move SetContentTypes into ExportSettings

Fixes a small bug where the editor and exporter had different opinions
on what a mod contained

Author: burnedram

Disunity/Disunity.Editor/Editors/ExportEditor.cs

@@ -67,19 +67,7 @@ private void DrawDetails(ExportSettings settings) {
         }
 
         private void DrawContentWarning(ExportSettings settings) {
-
-            settings.ContentTypes = 0;
-            if (settings.PreloadAssemblies.Length > 0)
-                settings.ContentTypes |= ContentType.PreloadAssemblies;
-            if (settings.RuntimeAssemblies.Length > 0)
-                settings.ContentTypes |= ContentType.RuntimeAssemblies;
-            if (settings.Prefabs.Length > 0)
-                settings.ContentTypes |= ContentType.Prefabs;
-            if (settings.Scenes.Length > 0)
-                settings.ContentTypes |= ContentType.Scenes;
-            if (settings.Artifacts.Length > 0)
-                settings.ContentTypes |= ContentType.Artifacts;
-
+            settings.UpdateContentTypes();
             if (settings.ContentTypes == 0) {
                 throw new ExportValidationError("You must include some content in your mod.");
             }

Disunity/Disunity.Editor/Export.cs

@@ -79,22 +79,6 @@ private List<string> ExportAssemblies(UnityEngine.Object[] assemblies, string fo
             return destinations;
         }
 
-        private void SetContentTypes() {
-            _settings.ContentTypes = 0;
-            if (_settings.PreloadAssemblies.Length > 0) {
-                _settings.ContentTypes |= ContentType.PreloadAssemblies;
-            }
-            if (_settings.RuntimeAssemblies.Length > 0) {
-                _settings.ContentTypes |= ContentType.RuntimeAssemblies;
-            }
-            if (_settings.Prefabs.Length > 0) {
-                _settings.ContentTypes |= ContentType.Prefabs;
-            }
-            if (_settings.Scenes.Length > 0) {
-                _settings.ContentTypes |= ContentType.Scenes;
-            }
-        }
-
         private List<string> ExportRuntimeAssemblies() {
             return ExportAssemblies(_settings.RuntimeAssemblies, "runtime");
         }
@@ -162,7 +146,7 @@ public void Run() {
             var runtimeAssemblies = ExportRuntimeAssemblies();
             ExportCopyAssets();
             ExportModAssets();
-            SetContentTypes();
+            _settings.UpdateContentTypes();
             SaveMetadata(preloadAssemblies, runtimeAssemblies);
             CopyToOutput();
         }

Disunity/Disunity.Editor/ExportSettings.cs

@@ -49,6 +49,25 @@ public class ExportSettings : ScriptableObject {
 
         [field: SerializeField] public string PreloadAssembly { get; set; }
 
+        public void UpdateContentTypes() {
+            ContentTypes = 0;
+            if (PreloadAssemblies.Length > 0) {
+                ContentTypes |= ContentType.PreloadAssemblies;
+            }
+            if (RuntimeAssemblies.Length > 0) {
+                ContentTypes |= ContentType.RuntimeAssemblies;
+            }
+            if (Prefabs.Length > 0) {
+                ContentTypes |= ContentType.Prefabs;
+            }
+            if (Scenes.Length > 0) {
+                ContentTypes |= ContentType.Scenes;
+            }
+            if (Artifacts.Length > 0) {
+                ContentTypes |= ContentType.Artifacts;
+            }
+        }
+
     }
 
 }