Merge pull request #864 from Rain1950/templatePath

Fix templatePath (CreateNewNetworkBehaviour.cs)

Author: FirstGearGames

Assets/FishNet/Runtime/Editor/Configuring/ConfigurationData.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using System.Xml.Serialization;
 using UnityEditor;
+using UnityEngine;
 
 
 namespace FishNet.Configuring
@@ -21,6 +22,12 @@ public enum SearchScopeType : int
         SpecificFolders = 1,
     }
 
+    public class CreateNewNetworkBehaviourConfigurations
+    {
+        public string templateDirectoryPath = "Assets";
+
+    }
+
     public class PrefabGeneratorConfigurations
     {
         public bool Enabled = true;
@@ -53,6 +60,7 @@ public class ConfigurationData
 
         public PrefabGeneratorConfigurations PrefabGenerator = new();
         public CodeStrippingConfigurations CodeStripping = new();
+        public CreateNewNetworkBehaviourConfigurations CreateNewNetworkBehaviour = new();
     }
 
     public static class ConfigurationDataExtension

Assets/FishNet/Runtime/Editor/NewNetworkBehaviour/CreateNewNetworkBehaviour.cs

@@ -1,4 +1,5 @@
 
+using FishNet.Configuring;
 using System;
 using System.IO;
 using UnityEditor;
@@ -12,20 +13,14 @@ internal sealed class CreateNewNetworkBehaviour : MonoBehaviour
     {
 
         private const string DEFAULT_TEMPLATE_NAME = "1-Scripting__MonoBehaviour Script-NewMonoBehaviourScript.cs.txt";
+       
+
 
         [MenuItem("Assets/Create/NetworkBehaviour Script", false, -220)]
         private static void CreateNewAsset()
         {
-            string templatePath;
-            if (Directory.Exists(Application.dataPath + "/FishNet"))
-            {
-                templatePath = Application.dataPath + "/FishNet/Assets/FishNet/Runtime/Editor/NewNetworkBehaviour/template.txt";
-            }
-            else
-            {
-                templatePath = "Packages/com.firstgeargames.fishnet/Runtime/Editor/NewNetworkBehaviour/template.txt";
-            }
 
+            string templatePath = Path.Combine(Configuration.Configurations.CreateNewNetworkBehaviour.templateDirectoryPath,"FishnetNBTemplate.txt");
             if (!File.Exists(templatePath))
             {
 
@@ -41,7 +36,8 @@ private static void CreateNewAsset()
 
         public static void CopyExistingTemplate(string templatePath)
         {
-            File.Copy(EditorApplication.applicationContentsPath + "/Resources/ScriptTemplates/" + DEFAULT_TEMPLATE_NAME, templatePath);
+         
+            File.Copy(EditorApplication.applicationContentsPath + "/Resources/ScriptTemplates/" + DEFAULT_TEMPLATE_NAME,templatePath);
             string fileContent = File.ReadAllText(templatePath);
             fileContent = fileContent.ReplaceFirstOccurence("MonoBehaviour", "NetworkBehaviour");
             fileContent = fileContent.Replace("using UnityEngine;", "using UnityEngine;\nusing FishNet.Object;");

Assets/FishNet/Runtime/Editor/NewNetworkBehaviour/SettingsProvider.cs

@@ -7,6 +7,8 @@
 using UnitySettingsProvider = UnityEditor.SettingsProvider;
 using FishNet.Configuring;
 using System.IO;
+using System;
+using System.Text.RegularExpressions;
 
 
 namespace FishNet.Editing.NewNetworkBehaviourScript
@@ -15,9 +17,10 @@ internal static class SettingsProvider
     {
 
 
-        private static PrefabGeneratorConfigurations _settings;
-        static string templatePath = Application.dataPath + "/FishNet/Assets/FishNet/Runtime/Editor/NewNetworkBehaviour/template.txt";
-
+        private static CreateNewNetworkBehaviourConfigurations _settings;
+        static string templatePath;
+        private static GUIContent _folderIcon;
+        private static readonly Regex SlashRegex = new(@"[\\//]");
         [UnitySettingsProvider]
         private static UnitySettingsProvider Create()
         {
@@ -39,20 +42,70 @@ private static UnitySettingsProvider Create()
 
         private static void OnGUI(string searchContext)
         {
-          if(GUILayout.Button("Edit template"))
+            if (_settings == null)
+                _settings = Configuration.Configurations.CreateNewNetworkBehaviour;
+
+            if (_folderIcon == null)
+                _folderIcon = EditorGUIUtility.IconContent("d_FolderOpened Icon");
+
+            EditorGUI.BeginChangeCheck();
+
+            GUILayoutOption iconWidthConstraint = GUILayout.MaxWidth(32.0f);
+            GUILayoutOption iconHeightConstraint = GUILayout.MaxHeight(EditorGUIUtility.singleLineHeight);
+
+            if (GUILayout.Button("Edit template"))
             {
+                templatePath = Path.Combine(_settings.templateDirectoryPath, "FishnetNBTemplate.txt");
+
                 if (!File.Exists(templatePath))
                 {
                     CreateNewNetworkBehaviour.CopyExistingTemplate(templatePath);
                 }
                 System.Diagnostics.Process.Start(templatePath);
             }
-        }
+            GUILayout.Space(20);
+            EditorGUILayout.BeginHorizontal();
+            GUILayout.Label("Template directory: ", GUILayout.MaxWidth(150));
+            string newDirectoryPath;
+
+            newDirectoryPath = EditorGUILayout.DelayedTextField(_settings.templateDirectoryPath, GUILayout.MaxWidth(600));
+            if (newDirectoryPath.StartsWith("Assets") && Directory.Exists(newDirectoryPath))
+            {
+                _settings.templateDirectoryPath = newDirectoryPath;
+            }
+            else
+            {
+                EditorWindow.focusedWindow.ShowNotification(new($"Directory must be inside the Assets folder."), 2);
+            }
 
-       
 
-      
+            if (GUILayout.Button(_folderIcon, iconHeightConstraint, iconWidthConstraint))
+            {
+                newDirectoryPath = EditorUtility.OpenFolderPanel("Select template directory", _settings.templateDirectoryPath, "");
+            }
+            if (newDirectoryPath.StartsWith(Application.dataPath, StringComparison.OrdinalIgnoreCase))
+            {
+                newDirectoryPath = SlashRegex.Replace(newDirectoryPath.Remove(0, Path.GetDirectoryName(Application.dataPath).Length + 1), Path.DirectorySeparatorChar.ToString());
+                _settings.templateDirectoryPath = newDirectoryPath;
+            }
+            else if (!newDirectoryPath.StartsWith(Application.dataPath, StringComparison.OrdinalIgnoreCase) && !newDirectoryPath.StartsWith("Assets"))
+            {
+                EditorWindow.focusedWindow.ShowNotification(new($"Directory must be inside the Assets folder."), 2);
+            }
+
+            EditorGUILayout.EndHorizontal();
+
+            EditorGUILayout.HelpBox("By default MonoBehaviour script template will be copied", MessageType.Info);
+            if (EditorGUI.EndChangeCheck())
+                Configuration.Configurations.Write(true);
+
+
+
+
+
+
+        }
     }
-}
 
+}
 #endif